You can not select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
175 lines
7.3 KiB
175 lines
7.3 KiB
8 months ago
|
From c8e9877d14c8742cc3732d305af2422f8a16f47d Mon Sep 17 00:00:00 2001
|
||
|
|
From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= <zbyszek@in.waw.pl>
|
||
|
|
Date: Wed, 17 Oct 2018 17:27:20 +0200
|
||
|
|
Subject: [PATCH] core: do not "warn" about mundane emergency actions
|
||
|
|
|
||
|
|
For example in a container we'd log:
|
||
|
|
Oct 17 17:01:10 rawhide systemd[1]: Started Power-Off.
|
||
|
|
Oct 17 17:01:10 rawhide systemd[1]: Forcibly powering off: unit succeeded
|
||
|
|
Oct 17 17:01:10 rawhide systemd[1]: Reached target Power-Off.
|
||
|
|
Oct 17 17:01:10 rawhide systemd[1]: Shutting down.
|
||
|
|
and on the console we'd write (in red)
|
||
|
|
[ !! ] Forcibly powering off: unit succeeded
|
||
|
|
|
||
|
|
This is not useful in any way, and the fact that we're calling an "emergency action"
|
||
|
|
is an internal implementation detail. Let's log about c-a-d and the watchdog actions
|
||
|
|
only.
|
||
|
|
|
||
|
|
(cherry picked from commit c7adcb1af9946d0672c16bb4bb7eedf39b3d1fcb)
|
||
|
|
|
||
|
|
Related: #1860899
|
||
|
|
---
|
||
|
|
src/core/emergency-action.c | 29 ++++++++++++++++-------------
|
||
|
|
src/core/emergency-action.h | 1 +
|
||
|
|
src/core/job.c | 3 ++-
|
||
|
|
src/core/manager.c | 2 +-
|
||
|
|
src/core/unit.c | 3 ++-
|
||
|
|
5 files changed, 22 insertions(+), 16 deletions(-)
|
||
|
|
|
||
|
|
diff --git a/src/core/emergency-action.c b/src/core/emergency-action.c
|
||
|
|
index 44b92ae6f8..fea1cb83db 100644
|
||
|
|
--- a/src/core/emergency-action.c
|
||
|
|
+++ b/src/core/emergency-action.c
|
||
|
|
@@ -15,11 +15,12 @@
|
||
|
|
#include "terminal-util.h"
|
||
|
|
#include "virt.h"
|
||
|
|
|
||
|
|
-static void log_and_status(Manager *m, const char *message, const char *reason) {
|
||
|
|
- log_warning("%s: %s", message, reason);
|
||
|
|
- manager_status_printf(m, STATUS_TYPE_EMERGENCY,
|
||
|
|
- ANSI_HIGHLIGHT_RED " !! " ANSI_NORMAL,
|
||
|
|
- "%s: %s", message, reason);
|
||
|
|
+static void log_and_status(Manager *m, bool warn, const char *message, const char *reason) {
|
||
|
|
+ log_full(warn ? LOG_WARNING : LOG_DEBUG, "%s: %s", message, reason);
|
||
|
|
+ if (warn)
|
||
|
|
+ manager_status_printf(m, STATUS_TYPE_EMERGENCY,
|
||
|
|
+ ANSI_HIGHLIGHT_RED " !! " ANSI_NORMAL,
|
||
|
|
+ "%s: %s", message, reason);
|
||
|
|
}
|
||
|
|
|
||
|
|
int emergency_action(
|
||
|
|
@@ -41,17 +42,19 @@ int emergency_action(
|
||
|
|
return -ECANCELED;
|
||
|
|
}
|
||
|
|
|
||
|
|
+ bool warn = FLAGS_SET(options, EMERGENCY_ACTION_WARN);
|
||
|
|
+
|
||
|
|
switch (action) {
|
||
|
|
|
||
|
|
case EMERGENCY_ACTION_REBOOT:
|
||
|
|
- log_and_status(m, "Rebooting", reason);
|
||
|
|
+ log_and_status(m, warn, "Rebooting", reason);
|
||
|
|
|
||
|
|
(void) update_reboot_parameter_and_warn(reboot_arg);
|
||
|
|
(void) manager_add_job_by_name_and_warn(m, JOB_START, SPECIAL_REBOOT_TARGET, JOB_REPLACE_IRREVERSIBLY, NULL, NULL);
|
||
|
|
break;
|
||
|
|
|
||
|
|
case EMERGENCY_ACTION_REBOOT_FORCE:
|
||
|
|
- log_and_status(m, "Forcibly rebooting", reason);
|
||
|
|
+ log_and_status(m, warn, "Forcibly rebooting", reason);
|
||
|
|
|
||
|
|
(void) update_reboot_parameter_and_warn(reboot_arg);
|
||
|
|
m->exit_code = MANAGER_REBOOT;
|
||
|
|
@@ -59,7 +62,7 @@ int emergency_action(
|
||
|
|
break;
|
||
|
|
|
||
|
|
case EMERGENCY_ACTION_REBOOT_IMMEDIATE:
|
||
|
|
- log_and_status(m, "Rebooting immediately", reason);
|
||
|
|
+ log_and_status(m, warn, "Rebooting immediately", reason);
|
||
|
|
|
||
|
|
sync();
|
||
|
|
|
||
|
|
@@ -75,7 +78,7 @@ int emergency_action(
|
||
|
|
|
||
|
|
case EMERGENCY_ACTION_EXIT:
|
||
|
|
if (MANAGER_IS_USER(m) || detect_container() > 0) {
|
||
|
|
- log_and_status(m, "Exiting", reason);
|
||
|
|
+ log_and_status(m, warn, "Exiting", reason);
|
||
|
|
(void) manager_add_job_by_name_and_warn(m, JOB_START, SPECIAL_EXIT_TARGET, JOB_REPLACE_IRREVERSIBLY, NULL, NULL);
|
||
|
|
break;
|
||
|
|
}
|
||
|
|
@@ -84,13 +87,13 @@ int emergency_action(
|
||
|
|
_fallthrough_;
|
||
|
|
|
||
|
|
case EMERGENCY_ACTION_POWEROFF:
|
||
|
|
- log_and_status(m, "Powering off", reason);
|
||
|
|
+ log_and_status(m, warn, "Powering off", reason);
|
||
|
|
(void) manager_add_job_by_name_and_warn(m, JOB_START, SPECIAL_POWEROFF_TARGET, JOB_REPLACE_IRREVERSIBLY, NULL, NULL);
|
||
|
|
break;
|
||
|
|
|
||
|
|
case EMERGENCY_ACTION_EXIT_FORCE:
|
||
|
|
if (MANAGER_IS_USER(m) || detect_container() > 0) {
|
||
|
|
- log_and_status(m, "Exiting immediately", reason);
|
||
|
|
+ log_and_status(m, warn, "Exiting immediately", reason);
|
||
|
|
m->exit_code = MANAGER_EXIT;
|
||
|
|
break;
|
||
|
|
}
|
||
|
|
@@ -99,12 +102,12 @@ int emergency_action(
|
||
|
|
_fallthrough_;
|
||
|
|
|
||
|
|
case EMERGENCY_ACTION_POWEROFF_FORCE:
|
||
|
|
- log_and_status(m, "Forcibly powering off", reason);
|
||
|
|
+ log_and_status(m, warn, "Forcibly powering off", reason);
|
||
|
|
m->exit_code = MANAGER_POWEROFF;
|
||
|
|
break;
|
||
|
|
|
||
|
|
case EMERGENCY_ACTION_POWEROFF_IMMEDIATE:
|
||
|
|
- log_and_status(m, "Powering off immediately", reason);
|
||
|
|
+ log_and_status(m, warn, "Powering off immediately", reason);
|
||
|
|
|
||
|
|
sync();
|
||
|
|
|
||
|
|
diff --git a/src/core/emergency-action.h b/src/core/emergency-action.h
|
||
|
|
index efbfaf6c6a..2aa1497118 100644
|
||
|
|
--- a/src/core/emergency-action.h
|
||
|
|
+++ b/src/core/emergency-action.h
|
||
|
|
@@ -22,6 +22,7 @@ typedef enum EmergencyAction {
|
||
|
|
|
||
|
|
typedef enum EmergencyActionFlags {
|
||
|
|
EMERGENCY_ACTION_IS_WATCHDOG = 1 << 0,
|
||
|
|
+ EMERGENCY_ACTION_WARN = 1 << 1,
|
||
|
|
} EmergencyActionFlags;
|
||
|
|
|
||
|
|
#include "macro.h"
|
||
|
|
diff --git a/src/core/job.c b/src/core/job.c
|
||
|
|
index d647aac42d..43ab55ed18 100644
|
||
|
|
--- a/src/core/job.c
|
||
|
|
+++ b/src/core/job.c
|
||
|
|
@@ -1076,7 +1076,8 @@ static int job_dispatch_timer(sd_event_source *s, uint64_t monotonic, void *user
|
||
|
|
u = j->unit;
|
||
|
|
job_finish_and_invalidate(j, JOB_TIMEOUT, true, false);
|
||
|
|
|
||
|
|
- emergency_action(u->manager, u->job_timeout_action, EMERGENCY_ACTION_IS_WATCHDOG,
|
||
|
|
+ emergency_action(u->manager, u->job_timeout_action,
|
||
|
|
+ EMERGENCY_ACTION_IS_WATCHDOG|EMERGENCY_ACTION_WARN,
|
||
|
|
u->job_timeout_reboot_arg, "job timed out");
|
||
|
|
|
||
|
|
return 0;
|
||
|
|
diff --git a/src/core/manager.c b/src/core/manager.c
|
||
|
|
index ac1b198b21..ee976f70b3 100644
|
||
|
|
--- a/src/core/manager.c
|
||
|
|
+++ b/src/core/manager.c
|
||
|
|
@@ -2528,7 +2528,7 @@ static void manager_handle_ctrl_alt_del(Manager *m) {
|
||
|
|
if (ratelimit_below(&m->ctrl_alt_del_ratelimit) || m->cad_burst_action == EMERGENCY_ACTION_NONE)
|
||
|
|
manager_start_target(m, SPECIAL_CTRL_ALT_DEL_TARGET, JOB_REPLACE_IRREVERSIBLY);
|
||
|
|
else
|
||
|
|
- emergency_action(m, m->cad_burst_action, 0, NULL,
|
||
|
|
+ emergency_action(m, m->cad_burst_action, EMERGENCY_ACTION_WARN, NULL,
|
||
|
|
"Ctrl-Alt-Del was pressed more than 7 times within 2s");
|
||
|
|
}
|
||
|
|
|
||
|
|
diff --git a/src/core/unit.c b/src/core/unit.c
|
||
|
|
index dc5c89c195..23afa24c77 100644
|
||
|
|
--- a/src/core/unit.c
|
||
|
|
+++ b/src/core/unit.c
|
||
|
|
@@ -1669,7 +1669,8 @@ int unit_start_limit_test(Unit *u) {
|
||
|
|
log_unit_warning(u, "Start request repeated too quickly.");
|
||
|
|
u->start_limit_hit = true;
|
||
|
|
|
||
|
|
- return emergency_action(u->manager, u->start_limit_action, EMERGENCY_ACTION_IS_WATCHDOG,
|
||
|
|
+ return emergency_action(u->manager, u->start_limit_action,
|
||
|
|
+ EMERGENCY_ACTION_IS_WATCHDOG|EMERGENCY_ACTION_WARN,
|
||
|
|
u->reboot_arg, "unit failed");
|
||
|
|
}
|
||
|
|
|