system/systemd
system/systemd
1
0
Fork 0
mirror of https://github.com/systemd/systemd synced 2024-07-22 18:55:10 +00:00
Code Issues Actions 8 Packages Projects Releases Wiki Activity

core: ensure init.scope is realized after drop-ins have been loaded

Browse source 
If we add a drop-in for init.scope (e.g.: to set some memory limit),
it will be loaded long after the cgroup has already been realized.
Do it again when creating the special unit.
This commit is contained in:
Luca Boccassi 2023-01-20 23:00:38 +00:00 committed by Zbigniew Jędrzejewski-Szmek
parent 4453ebe4db
commit 020b2e41ea
5 changed files with 15 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/core/cgroup.c
View file

@ -2528,7 +2528,7 @@ static bool unit_has_mask_enables_realized(
((u->cgroup_enabled_mask | enable_mask) & CGROUP_MASK_V2) == (u->cgroup_enabled_mask & CGROUP_MASK_V2);
}
static void unit_add_to_cgroup_realize_queue(Unit *u) {
void unit_add_to_cgroup_realize_queue(Unit *u) {
assert(u);
if (u->in_cgroup_realize_queue)

1
src/core/cgroup.h
View file

@ -264,6 +264,7 @@ int unit_realize_cgroup(Unit *u);
void unit_prune_cgroup(Unit *u);
int unit_watch_cgroup(Unit *u);
int unit_watch_cgroup_memory(Unit *u);
void unit_add_to_cgroup_realize_queue(Unit *u);
void unit_release_cgroup(Unit *u);
/* Releases the cgroup only if it is recursively empty.

4
src/core/scope.c
View file

@ -789,6 +789,10 @@ static void scope_enumerate_perpetual(Manager *m) {
unit_add_to_load_queue(u);
unit_add_to_dbus_queue(u);
/* Enqueue an explicit cgroup realization here. Unlike other cgroups this one already exists and is
* populated (by us, after all!) already, even when we are not in a reload cycle. Hence we cannot
* apply the settings at creation time anymore, but let's at least apply them asynchronously. */
unit_add_to_cgroup_realize_queue(u);
}
static const char* const scope_result_table[_SCOPE_RESULT_MAX] = {

6
test/TEST-55-OOMD/test.sh
View file

@ -16,6 +16,12 @@ test_append_files() {
cat >>"${initdir:?}/etc/fstab" <<EOF
UUID=$(blkid -o value -s UUID "${LOOPDEV}p2") none swap defaults 0 0
EOF
mkdir -p "${initdir:?}/etc/systemd/system/init.scope.d/"
cat >>"${initdir:?}/etc/systemd/system/init.scope.d/test-55-oomd.conf" <<EOF
[Scope]
MemoryHigh=10G
EOF
)
}

3
test/units/testsuite-55.sh
View file

@ -5,6 +5,9 @@ set -o pipefail
systemd-analyze log-level debug
# Ensure that the init.scope.d drop-in is applied on boot
test "$(cat /sys/fs/cgroup/init.scope/memory.high)" != "max"
# Loose checks to ensure the environment has the necessary features for systemd-oomd
[[ -e /proc/pressure ]] || echo "no PSI" >>/skipped
cgroup_type="$(stat -fc %T /sys/fs/cgroup/)"