From 95939aed212c4e01059ce237e0426ede2aaffd86 Mon Sep 17 00:00:00 2001 From: Yu Watanabe Date: Thu, 22 Aug 2019 23:49:49 +0900 Subject: [PATCH 1/3] core: introduce unit_destroy_runtime_directory() Currently `unit_will_restart()` can return true only when the unit is service. Hence, should not change anything. --- src/core/service.c | 6 ++---- src/core/unit.c | 6 ++++++ src/core/unit.h | 1 + 3 files changed, 9 insertions(+), 4 deletions(-) diff --git a/src/core/service.c b/src/core/service.c index d8cfb40145..d264b9a281 100644 --- a/src/core/service.c +++ b/src/core/service.c @@ -1789,10 +1789,8 @@ static void service_enter_dead(Service *s, ServiceResult f, bool allow_restart) /* We want fresh tmpdirs in case service is started again immediately */ s->exec_runtime = exec_runtime_unref(s->exec_runtime, true); - if (s->exec_context.runtime_directory_preserve_mode == EXEC_PRESERVE_NO || - (s->exec_context.runtime_directory_preserve_mode == EXEC_PRESERVE_RESTART && !service_will_restart(UNIT(s)))) - /* Also, remove the runtime directory */ - exec_context_destroy_runtime_directory(&s->exec_context, UNIT(s)->manager->prefix[EXEC_DIRECTORY_RUNTIME]); + /* Also, remove the runtime directory */ + unit_destroy_runtime_directory(UNIT(s), &s->exec_context); /* Get rid of the IPC bits of the user */ unit_unref_uid_gid(UNIT(s), true); diff --git a/src/core/unit.c b/src/core/unit.c index 31ed473f91..ff979ffdd6 100644 --- a/src/core/unit.c +++ b/src/core/unit.c @@ -5880,6 +5880,12 @@ int unit_test_trigger_loaded(Unit *u) { return 0; } +void unit_destroy_runtime_directory(Unit *u, const ExecContext *context) { + if (context->runtime_directory_preserve_mode == EXEC_PRESERVE_NO || + (context->runtime_directory_preserve_mode == EXEC_PRESERVE_RESTART && !unit_will_restart(u))) + exec_context_destroy_runtime_directory(context, u->manager->prefix[EXEC_DIRECTORY_RUNTIME]); +} + int unit_clean(Unit *u, ExecCleanMask mask) { UnitActiveState state; diff --git a/src/core/unit.h b/src/core/unit.h index 4732d72202..00436dc664 100644 --- a/src/core/unit.h +++ b/src/core/unit.h @@ -860,6 +860,7 @@ int unit_failure_action_exit_status(Unit *u); int unit_test_trigger_loaded(Unit *u); +void unit_destroy_runtime_directory(Unit *u, const ExecContext *context); int unit_clean(Unit *u, ExecCleanMask mask); int unit_can_clean(Unit *u, ExecCleanMask *ret_mask); From 52a12341f9854b9728607c073d2cae44544b5585 Mon Sep 17 00:00:00 2001 From: Yu Watanabe Date: Fri, 23 Aug 2019 00:08:16 +0900 Subject: [PATCH 2/3] core: make RuntimeDirectoryPreserve= works with non-service units --- src/core/mount.c | 4 +++- src/core/service.c | 6 +----- src/core/socket.c | 4 +++- src/core/swap.c | 4 +++- src/core/unit.c | 11 +++++++++++ src/core/unit.h | 1 + 6 files changed, 22 insertions(+), 8 deletions(-) diff --git a/src/core/mount.c b/src/core/mount.c index 4f37d3e9a9..959b8fbed2 100644 --- a/src/core/mount.c +++ b/src/core/mount.c @@ -826,7 +826,7 @@ static void mount_enter_dead(Mount *m, MountResult f) { m->exec_runtime = exec_runtime_unref(m->exec_runtime, true); - exec_context_destroy_runtime_directory(&m->exec_context, UNIT(m)->manager->prefix[EXEC_DIRECTORY_RUNTIME]); + unit_destroy_runtime_directory(UNIT(m), &m->exec_context); unit_unref_uid_gid(UNIT(m), true); @@ -1996,6 +1996,8 @@ const UnitVTable mount_vtable = { .active_state = mount_active_state, .sub_state_to_string = mount_sub_state_to_string, + .will_restart = unit_will_restart_default, + .may_gc = mount_may_gc, .sigchld_event = mount_sigchld_event, diff --git a/src/core/service.c b/src/core/service.c index d264b9a281..61e18de5fb 100644 --- a/src/core/service.c +++ b/src/core/service.c @@ -1721,12 +1721,8 @@ static bool service_will_restart(Unit *u) { return true; if (s->state == SERVICE_AUTO_RESTART) return true; - if (!UNIT(s)->job) - return false; - if (UNIT(s)->job->type == JOB_START) - return true; - return false; + return unit_will_restart_default(u); } static void service_enter_dead(Service *s, ServiceResult f, bool allow_restart) { diff --git a/src/core/socket.c b/src/core/socket.c index 46fe405a17..e94d6feef9 100644 --- a/src/core/socket.c +++ b/src/core/socket.c @@ -2035,7 +2035,7 @@ static void socket_enter_dead(Socket *s, SocketResult f) { s->exec_runtime = exec_runtime_unref(s->exec_runtime, true); - exec_context_destroy_runtime_directory(&s->exec_context, UNIT(s)->manager->prefix[EXEC_DIRECTORY_RUNTIME]); + unit_destroy_runtime_directory(UNIT(s), &s->exec_context); unit_unref_uid_gid(UNIT(s), true); @@ -3353,6 +3353,8 @@ const UnitVTable socket_vtable = { .active_state = socket_active_state, .sub_state_to_string = socket_sub_state_to_string, + .will_restart = unit_will_restart_default, + .may_gc = socket_may_gc, .sigchld_event = socket_sigchld_event, diff --git a/src/core/swap.c b/src/core/swap.c index 74381c0c95..4ce9d06280 100644 --- a/src/core/swap.c +++ b/src/core/swap.c @@ -683,7 +683,7 @@ static void swap_enter_dead(Swap *s, SwapResult f) { s->exec_runtime = exec_runtime_unref(s->exec_runtime, true); - exec_context_destroy_runtime_directory(&s->exec_context, UNIT(s)->manager->prefix[EXEC_DIRECTORY_RUNTIME]); + unit_destroy_runtime_directory(UNIT(s), &s->exec_context); unit_unref_uid_gid(UNIT(s), true); @@ -1529,6 +1529,8 @@ const UnitVTable swap_vtable = { .active_state = swap_active_state, .sub_state_to_string = swap_sub_state_to_string, + .will_restart = unit_will_restart_default, + .may_gc = swap_may_gc, .sigchld_event = swap_sigchld_event, diff --git a/src/core/unit.c b/src/core/unit.c index ff979ffdd6..a2944cbc15 100644 --- a/src/core/unit.c +++ b/src/core/unit.c @@ -4069,6 +4069,17 @@ bool unit_active_or_pending(Unit *u) { return false; } +bool unit_will_restart_default(Unit *u) { + assert(u); + + if (!u->job) + return false; + if (u->job->type == JOB_START) + return true; + + return false; +} + bool unit_will_restart(Unit *u) { assert(u); diff --git a/src/core/unit.h b/src/core/unit.h index 00436dc664..7f1d2f651c 100644 --- a/src/core/unit.h +++ b/src/core/unit.h @@ -752,6 +752,7 @@ const char *unit_slice_name(Unit *u); bool unit_stop_pending(Unit *u) _pure_; bool unit_inactive_or_pending(Unit *u) _pure_; bool unit_active_or_pending(Unit *u); +bool unit_will_restart_default(Unit *u); bool unit_will_restart(Unit *u); int unit_add_default_target_dependency(Unit *u, Unit *target); From 8246bb204c14b0eda0627d00d3201ceaf5f11241 Mon Sep 17 00:00:00 2001 From: Yu Watanabe Date: Fri, 23 Aug 2019 00:22:54 +0900 Subject: [PATCH 3/3] test: add tests for RuntimeDirectoryPreserve=yes --- .../TEST-37-RUNTIMEDIRECTORYPRESERVE/Makefile | 1 + test/TEST-37-RUNTIMEDIRECTORYPRESERVE/test.sh | 44 +++++++++++++++++++ .../testsuite.sh | 19 ++++++++ 3 files changed, 64 insertions(+) create mode 120000 test/TEST-37-RUNTIMEDIRECTORYPRESERVE/Makefile create mode 100755 test/TEST-37-RUNTIMEDIRECTORYPRESERVE/test.sh create mode 100755 test/TEST-37-RUNTIMEDIRECTORYPRESERVE/testsuite.sh diff --git a/test/TEST-37-RUNTIMEDIRECTORYPRESERVE/Makefile b/test/TEST-37-RUNTIMEDIRECTORYPRESERVE/Makefile new file mode 120000 index 0000000000..e9f93b1104 --- /dev/null +++ b/test/TEST-37-RUNTIMEDIRECTORYPRESERVE/Makefile @@ -0,0 +1 @@ +../TEST-01-BASIC/Makefile \ No newline at end of file diff --git a/test/TEST-37-RUNTIMEDIRECTORYPRESERVE/test.sh b/test/TEST-37-RUNTIMEDIRECTORYPRESERVE/test.sh new file mode 100755 index 0000000000..9e87e61dcd --- /dev/null +++ b/test/TEST-37-RUNTIMEDIRECTORYPRESERVE/test.sh @@ -0,0 +1,44 @@ +#!/bin/bash +# -*- mode: shell-script; indent-tabs-mode: nil; sh-basic-offset: 4; -*- +# ex: ts=8 sw=4 sts=4 et filetype=sh +set -e +TEST_DESCRIPTION="test RuntimeDirectoryPreserve=yes" + +. $TEST_BASE_DIR/test-functions + +test_setup() { + create_empty_image_rootdir + + ( + LOG_LEVEL=5 + eval $(udevadm info --export --query=env --name=${LOOPDEV}p2) + + setup_basic_environment + + # mask some services that we do not want to run in these tests + ln -fs /dev/null $initdir/etc/systemd/system/systemd-hwdb-update.service + ln -fs /dev/null $initdir/etc/systemd/system/systemd-journal-catalog-update.service + ln -fs /dev/null $initdir/etc/systemd/system/systemd-networkd.service + ln -fs /dev/null $initdir/etc/systemd/system/systemd-networkd.socket + ln -fs /dev/null $initdir/etc/systemd/system/systemd-resolved.service + ln -fs /dev/null $initdir/etc/systemd/system/systemd-machined.service + + # setup the testsuite service + cat >$initdir/etc/systemd/system/testsuite.service < /testok + +exit 0