picnoir/Systemd
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Merge pull request #6257 from keszybz/unnecessary-job-log

Browse source 
core: do not print color console message about gc-ed jobs
This commit is contained in:
Lennart Poettering 2017-07-03 10:48:28 +02:00 committed by GitHub
parent 323318a496 bd68e99bd0
commit 3dad4f0666
4 changed files with 46 additions and 56 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/basic/cgroup-util.c
View file

@ -840,7 +840,7 @@ int cg_attach(const char *controller, const char *path, pid_t pid) {
if (r > 0 && streq(controller, SYSTEMD_CGROUP_CONTROLLER)) {
r = cg_attach(SYSTEMD_CGROUP_CONTROLLER_LEGACY, path, pid);
if (r < 0)
log_warning_errno(r, "Failed to attach %d to compat systemd cgroup %s: %m", pid, path);
log_warning_errno(r, "Failed to attach "PID_FMT" to compat systemd cgroup %s: %m", pid, path);
}
return 0;

48
src/core/job.c
View file

@ -697,20 +697,20 @@ _pure_ static const char *job_get_status_message_format(Unit *u, JobType t, JobR
return NULL;
}
static void job_print_status_message(Unit *u, JobType t, JobResult result) {
static const struct {
const char *color, *word;
} statuses[_JOB_RESULT_MAX] = {
[JOB_DONE] = { ANSI_GREEN, " OK " },
[JOB_TIMEOUT] = { ANSI_HIGHLIGHT_RED, " TIME " },
[JOB_FAILED] = { ANSI_HIGHLIGHT_RED, "FAILED" },
[JOB_DEPENDENCY] = { ANSI_HIGHLIGHT_YELLOW, "DEPEND" },
[JOB_SKIPPED] = { ANSI_HIGHLIGHT, " INFO " },
[JOB_ASSERT] = { ANSI_HIGHLIGHT_YELLOW, "ASSERT" },
[JOB_UNSUPPORTED] = { ANSI_HIGHLIGHT_YELLOW, "UNSUPP" },
[JOB_COLLECTED] = { ANSI_HIGHLIGHT, " INFO " },
};
static const struct {
const char *color, *word;
} job_print_status_messages [_JOB_RESULT_MAX] = {
[JOB_DONE] = { ANSI_GREEN, " OK " },
[JOB_TIMEOUT] = { ANSI_HIGHLIGHT_RED, " TIME " },
[JOB_FAILED] = { ANSI_HIGHLIGHT_RED, "FAILED" },
[JOB_DEPENDENCY] = { ANSI_HIGHLIGHT_YELLOW, "DEPEND" },
[JOB_SKIPPED] = { ANSI_HIGHLIGHT, " INFO " },
[JOB_ASSERT] = { ANSI_HIGHLIGHT_YELLOW, "ASSERT" },
[JOB_UNSUPPORTED] = { ANSI_HIGHLIGHT_YELLOW, "UNSUPP" },
/* JOB_COLLECTED */
};
static void job_print_status_message(Unit *u, JobType t, JobResult result) {
const char *format;
const char *status;
@ -722,14 +722,19 @@ static void job_print_status_message(Unit *u, JobType t, JobResult result) {
if (t == JOB_RELOAD)
return;
if (!job_print_status_messages[result].word)
return;
format = job_get_status_message_format(u, t, result);
if (!format)
return;
if (log_get_show_color())
status = strjoina(statuses[result].color, statuses[result].word, ANSI_NORMAL);
status = strjoina(job_print_status_messages[result].color,
job_print_status_messages[result].word,
ANSI_NORMAL);
else
status = statuses[result].word;
status = job_print_status_messages[result].word;
if (result != JOB_DONE)
manager_flip_auto_status(u->manager, true);
@ -766,10 +771,9 @@ static void job_log_status_message(Unit *u, JobType t, JobResult result) {
assert(t >= 0);
assert(t < _JOB_TYPE_MAX);
/* Skip this if it goes to the console. since we already print
* to the console anyway... */
if (log_on_console())
/* Skip printing if output goes to the console, and job_print_status_message()
will actually print something to the console. */
if (log_on_console() && job_print_status_messages[result].word)
return;
format = job_get_status_message_format(u, t, result);
@ -1310,9 +1314,8 @@ bool job_check_gc(Job *j) {
return true;
}
/* If we are going down, but something else is orederd After= us, then it needs to wait for us */
if (IN_SET(j->type, JOB_STOP, JOB_RESTART)) {
/* If we are going down, but something else is ordered After= us, then it needs to wait for us */
if (IN_SET(j->type, JOB_STOP, JOB_RESTART))
SET_FOREACH(other, j->unit->dependencies[UNIT_AFTER], i) {
if (!other->job)
continue;
@ -1322,7 +1325,6 @@ bool job_check_gc(Job *j) {
return true;
}
}
/* The logic above is kinda the inverse of the job_is_runnable() logic. Specifically, if the job "we" is
* ordered before the job "other":

50
src/core/loopback-setup.c
View file

@ -31,9 +31,10 @@
struct state {
unsigned n_messages;
int rcode;
const char *title;
};
static int start_loopback_handler(sd_netlink *rtnl, sd_netlink_message *m, void *userdata) {
static int generic_handler(sd_netlink *rtnl, sd_netlink_message *m, void *userdata) {
struct state *s = userdata;
assert(s);
@ -41,7 +42,7 @@ static int start_loopback_handler(sd_netlink *rtnl, sd_netlink_message *m, void
s->n_messages--;
errno = 0;
log_debug_errno(sd_netlink_message_get_errno(m), "Got start error code: %m");
log_debug_errno(sd_netlink_message_get_errno(m), "Failed to %s: %m", s->title);
s->rcode = sd_netlink_message_get_errno(m);
@ -63,7 +64,7 @@ static int start_loopback(sd_netlink *rtnl, struct state *s) {
if (r < 0)
return r;
r = sd_netlink_call_async(rtnl, req, start_loopback_handler, s, LOOPBACK_SETUP_TIMEOUT_USEC, NULL);
r = sd_netlink_call_async(rtnl, req, generic_handler, s, LOOPBACK_SETUP_TIMEOUT_USEC, NULL);
if (r < 0)
return r;
@ -71,20 +72,6 @@ static int start_loopback(sd_netlink *rtnl, struct state *s) {
return 0;
}
static int generic_handler(sd_netlink *rtnl, sd_netlink_message *m, void *userdata) {
struct state *s = userdata;
assert(s);
assert(s->n_messages > 0);
s->n_messages--;
/* Note that we don't really care whether the addresses could be added or not */
errno = 0;
log_debug_errno(sd_netlink_message_get_errno(m), "Got address error code: %m");
return 0;
}
static int add_ipv4_address(sd_netlink *rtnl, struct state *s) {
_cleanup_(sd_netlink_message_unrefp) sd_netlink_message *req = NULL;
int r;
@ -177,7 +164,9 @@ static bool check_loopback(sd_netlink *rtnl) {
int loopback_setup(void) {
_cleanup_(sd_netlink_unrefp) sd_netlink *rtnl = NULL;
struct state state = {};
struct state state_4 = { .title = "add address 127.0.0.1 to loopback interface" },
state_6 = { .title = "add address ::1 to loopback interface"},
state_up = { .title = "bring loopback interface up" };
int r;
r = sd_netlink_open(&rtnl);
@ -190,19 +179,19 @@ int loopback_setup(void) {
*
* https://github.com/systemd/systemd/issues/5641 */
r = add_ipv4_address(rtnl, &state);
r = add_ipv4_address(rtnl, &state_4);
if (r < 0)
return log_error_errno(r, "Failed to enqueue IPv4 loopback address add request: %m");
r = add_ipv6_address(rtnl, &state);
r = add_ipv6_address(rtnl, &state_6);
if (r < 0)
return log_error_errno(r, "Failed to enqueue IPv4 loopback address add request: %m");
return log_error_errno(r, "Failed to enqueue IPv6 loopback address add request: %m");
r = start_loopback(rtnl, &state);
r = start_loopback(rtnl, &state_up);
if (r < 0)
return log_error_errno(r, "Failed to enqueue loopback interface start request: %m");
while (state.n_messages > 0) {
while (state_4.n_messages + state_6.n_messages + state_up.n_messages > 0) {
r = sd_netlink_wait(rtnl, LOOPBACK_SETUP_TIMEOUT_USEC);
if (r < 0)
return log_error_errno(r, "Failed to wait for netlink event: %m");
@ -212,16 +201,15 @@ int loopback_setup(void) {
return log_warning_errno(r, "Failed to process netlink event: %m");
}
if (state.rcode != 0) {
/* If we lack the permissions to configure the
* loopback device, but we find it to be already
* configured, let's exit cleanly, in order to
* supported unprivileged containers. */
if (state.rcode == -EPERM && check_loopback(rtnl))
/* Note that we don't really care whether the addresses could be added or not */
if (state_up.rcode != 0) {
/* If we lack the permissions to configure the loopback device,
* but we find it to be already configured, let's exit cleanly,
* in order to supported unprivileged containers. */
if (state_up.rcode == -EPERM && check_loopback(rtnl))
return 0;
return log_warning_errno(state.rcode, "Failed to configure loopback device: %m");
return log_warning_errno(state_up.rcode, "Failed to configure loopback device: %m");
}
return 0;

2
src/nspawn/nspawn-cgroup.c
View file

@ -49,7 +49,7 @@ static int chown_cgroup_path(const char *path, uid_t uid_shift) {
"cgroup.subtree_control")
if (fchownat(fd, fn, uid_shift, uid_shift, 0) < 0)
log_full_errno(errno == ENOENT ? LOG_DEBUG : LOG_WARNING, errno,
"Failed to chown() cgroup file %s, ignoring: %m", fn);
"Failed to chown \"%s/%s\", ignoring: %m", path, fn);
return 0;
}