system/systemd
system/systemd
1
0
Fork 0
mirror of https://github.com/systemd/systemd synced 2024-10-15 12:34:37 +00:00
Code Issues Packages Projects Releases Wiki Activity

core: move runtime directory removal into release_resource handler

Browse source 
We already clear the various fds we keep from the release_resources()
handler, let's also destroy the runtime dir from there if this
preservation mode is selected.

This makes a minor semantic change: previously we'd keep a runtime
directory around if RuntimeDirectoryPreserve=restart is selected and at
least one JOB_START job was around. With this logic we'll keep it around
a tiny bit longer: as long as any job for the unit is around.
This commit is contained in:
Lennart Poettering 2023-04-04 13:42:08 +02:00
parent 99620f457e
commit 1ba84fef3c
1 changed files with 23 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
src/core/unit.c
View file

@ -396,6 +396,7 @@ static bool unit_success_failure_handler_has_jobs(Unit *unit) {
void unit_release_resources(Unit *u) {
UnitActiveState state;
ExecContext *ec;
assert(u);
@ -412,6 +413,10 @@ void unit_release_resources(Unit *u) {
if (unit_will_restart(u))
return;
ec = unit_get_exec_context(u);
if (ec && ec->runtime_directory_preserve_mode == EXEC_PRESERVE_RESTART)
exec_context_destroy_runtime_directory(ec, u->manager->prefix[EXEC_DIRECTORY_RUNTIME]);
if (UNIT_VTABLE(u)->release_resources)
UNIT_VTABLE(u)->release_resources(u);
}
@ -582,6 +587,21 @@ void unit_submit_to_stop_when_bound_queue(Unit *u) {
u->in_stop_when_bound_queue = true;
}
static bool unit_can_release_resources(Unit *u) {
ExecContext *ec;
assert(u);
if (UNIT_VTABLE(u)->release_resources)
return true;
ec = unit_get_exec_context(u);
if (ec && ec->runtime_directory_preserve_mode == EXEC_PRESERVE_RESTART)
return true;
return false;
}
void unit_submit_to_release_resources_queue(Unit *u) {
assert(u);
@ -594,7 +614,7 @@ void unit_submit_to_release_resources_queue(Unit *u) {
if (u->perpetual)
return;
if (!UNIT_VTABLE(u)->release_resources)
if (!unit_can_release_resources(u))
return;
LIST_PREPEND(release_resources_queue, u->manager->release_resources_queue, u);
@ -5863,8 +5883,8 @@ void unit_destroy_runtime_data(Unit *u, const ExecContext *context) {
assert(u);
assert(context);
if (context->runtime_directory_preserve_mode == EXEC_PRESERVE_NO ||
(context->runtime_directory_preserve_mode == EXEC_PRESERVE_RESTART && !unit_will_restart(u)))
/* EXEC_PRESERVE_RESTART is handled via unit_release_resources()! */
if (context->runtime_directory_preserve_mode == EXEC_PRESERVE_NO)
exec_context_destroy_runtime_directory(context, u->manager->prefix[EXEC_DIRECTORY_RUNTIME]);
exec_context_destroy_credentials(context, u->manager->prefix[EXEC_DIRECTORY_RUNTIME], u->id);