shaba/systemd-stable
1
1
Fork 0
mirror of https://github.com/systemd/systemd-stable.git synced 2025-01-26 10:03:40 +03:00
Code

manager: add few ", ignoring" and adjust level in one message

Browse Source
This commit is contained in:
Zbigniew Jędrzejewski-Szmek 2022-02-15 16:23:04 +01:00
parent 1e3eee8cf0
commit 6b1fa53997
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/core/main.c
View File

@ -1755,7 +1755,7 @@ static void update_cpu_affinity(bool skip_setup) {
log_debug("Setting CPU affinity to %s.", strnull(mask));
if (sched_setaffinity(0, arg_cpu_affinity.allocated, arg_cpu_affinity.set) < 0)
log_warning_errno(errno, "Failed to set CPU affinity: %m");
log_warning_errno(errno, "Failed to set CPU affinity, ignoring: %m");
}
static void update_numa_policy(bool skip_setup) {
@ -1776,7 +1776,7 @@ static void update_numa_policy(bool skip_setup) {
if (r == -EOPNOTSUPP)
log_debug_errno(r, "NUMA support not available, ignoring.");
else if (r < 0)
log_warning_errno(r, "Failed to set NUMA memory policy: %m");
log_warning_errno(r, "Failed to set NUMA memory policy, ignoring: %m");
}
static void filter_args(
@ -1955,7 +1955,7 @@ static int do_reexecute(
(void) execve(args[0], (char* const*) args, saved_env);
return log_error_errno(errno, "Failed to execute /bin/sh, giving up: %m");
} else
return log_warning_errno(r, "Failed to execute /sbin/init, giving up: %m");
return log_error_errno(r, "Failed to execute /sbin/init, giving up: %m");
}
static int invoke_main_loop(
@ -2257,7 +2257,7 @@ static int initialize_runtime(
if (!arg_system)
/* Become reaper of our children */
if (prctl(PR_SET_CHILD_SUBREAPER, 1) < 0)
log_warning_errno(errno, "Failed to make us a subreaper: %m");
log_warning_errno(errno, "Failed to make us a subreaper, ignoring: %m");
/* Bump up RLIMIT_NOFILE for systemd itself */
(void) bump_rlimit_nofile(saved_rlimit_nofile);

6
test/units/testsuite-36.sh
View File

@ -181,7 +181,7 @@ else
echo "PID1 NUMAPolicy support - Bind policy w/o mask"
writePID1NUMAPolicy "bind"
pid1ReloadWithJournal
grep "Failed to set NUMA memory policy: Invalid argument" "$journalLog"
grep "Failed to set NUMA memory policy, ignoring: Invalid argument" "$journalLog"
echo "PID1 NUMAPolicy support - Bind policy w/ mask"
writePID1NUMAPolicy "bind" "0"
@ -191,7 +191,7 @@ else
echo "PID1 NUMAPolicy support - Interleave policy w/o mask"
writePID1NUMAPolicy "interleave"
pid1ReloadWithJournal
grep "Failed to set NUMA memory policy: Invalid argument" "$journalLog"
grep "Failed to set NUMA memory policy, ignoring: Invalid argument" "$journalLog"
echo "PID1 NUMAPolicy support - Interleave policy w/ mask"
writePID1NUMAPolicy "interleave" "0"
@ -202,7 +202,7 @@ else
writePID1NUMAPolicy "preferred"
pid1ReloadWithJournal
# Preferred policy with empty node mask is actually allowed and should reset allocation policy to default
grep "Failed to set NUMA memory policy: Invalid argument" "$journalLog" && { echo >&2 "unexpected pass"; exit 1; }
grep "Failed to set NUMA memory policy, ignoring: Invalid argument" "$journalLog" && { echo >&2 "unexpected pass"; exit 1; }
echo "PID1 NUMAPolicy support - Preferred policy w/ mask"
writePID1NUMAPolicy "preferred" "0"