shaba/systemd
1
0
Fork 0
mirror of https://github.com/systemd/systemd.git synced 2024-11-01 09:21:26 +03:00
Code

watchdog: make watchdog_ping() a NOP when the watchdog is disabled or closed

Browse Source 
This patch allows watchdog_ping() to be used unconditionally regardless of
whether watchdog_set_timeout() or watchdog_close() has been previously called
or not and in both cases watchdog_ping() does nothing.

shutdown.c has been updated to cope with this change.
This commit is contained in:
Franck Bui 2021-09-06 08:47:08 +02:00
parent 12663295ca
commit 5bbf2db1e4
2 changed files with 22 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/shared/watchdog.c
View File

@ -136,6 +136,9 @@ int watchdog_ping(void) {
usec_t ntime;
int r;
if (!timestamp_is_set(watchdog_timeout))
return 0;
ntime = now(clock_boottime_or_monotonic());
/* Never ping earlier than watchdog_timeout/4 and try to ping
@ -186,4 +189,8 @@ void watchdog_close(bool disarm) {
}
watchdog_fd = safe_close(watchdog_fd);
/* Once closed, pinging the device becomes a NOP and we request a new
* call to watchdog_set_timeout() to open the device again. */
watchdog_timeout = USEC_INFINITY;
}

20
src/shutdown/shutdown.c
View File

@ -308,9 +308,9 @@ static void bump_sysctl_printk_log_level(int min_level) {
}
int main(int argc, char *argv[]) {
bool need_umount, need_swapoff, need_loop_detach, need_dm_detach, need_md_detach, in_container, use_watchdog = false, can_initrd;
bool need_umount, need_swapoff, need_loop_detach, need_dm_detach, need_md_detach, in_container, can_initrd;
_cleanup_free_ char *cgroup = NULL;
char *arguments[3], *watchdog_device;
char *arguments[3], *watchdog_device, *watchdog_usec;
int cmd, r, umount_log_level = LOG_INFO;
static const char* const dirs[] = {SYSTEM_SHUTDOWN_PATH, NULL};
@ -370,7 +370,6 @@ int main(int argc, char *argv[]) {
LOG_TARGET_KMSG))
bump_sysctl_printk_log_level(LOG_WARNING);
use_watchdog = getenv("WATCHDOG_USEC");
watchdog_device = getenv("WATCHDOG_DEVICE");
if (watchdog_device) {
r = watchdog_set_device(watchdog_device);
@ -379,6 +378,18 @@ int main(int argc, char *argv[]) {
watchdog_device);
}
watchdog_usec = getenv("WATCHDOG_USEC");
if (watchdog_usec) {
usec_t usec;
r = safe_atou64(watchdog_usec, &usec);
if (r < 0)
log_warning_errno(r, "Failed to parse watchdog timeout '%s', ignoring: %m",
watchdog_usec);
else
(void) watchdog_set_timeout(&usec);
}
/* Lock us into memory */
(void) mlockall(MCL_CURRENT|MCL_FUTURE);
@ -409,8 +420,7 @@ int main(int argc, char *argv[]) {
for (;;) {
bool changed = false;
if (use_watchdog)
(void) watchdog_ping();
(void) watchdog_ping();
/* Let's trim the cgroup tree on each iteration so
that we leave an empty cgroup tree around, so that