mirror of
https://github.com/systemd/systemd
synced 2024-07-22 10:44:58 +00:00
Merge pull request #27144 from enr0n/fix-scope-timer-on-coldplug
scope: do not disable timer event source when state is SCOPE_RUNNING
This commit is contained in:
commit
2cba2fcd25
|
@ -116,7 +116,7 @@ static void scope_set_state(Scope *s, ScopeState state) {
|
|||
old_state = s->state;
|
||||
s->state = state;
|
||||
|
||||
if (!IN_SET(state, SCOPE_STOP_SIGTERM, SCOPE_STOP_SIGKILL, SCOPE_START_CHOWN))
|
||||
if (!IN_SET(state, SCOPE_STOP_SIGTERM, SCOPE_STOP_SIGKILL, SCOPE_START_CHOWN, SCOPE_RUNNING))
|
||||
s->timer_event_source = sd_event_source_disable_unref(s->timer_event_source);
|
||||
|
||||
if (IN_SET(state, SCOPE_DEAD, SCOPE_FAILED)) {
|
||||
|
|
|
@ -23,6 +23,25 @@ function wait_for()
|
|||
fi
|
||||
}
|
||||
|
||||
function wait_for_timeout()
|
||||
{
|
||||
local unit="$1"
|
||||
local time="$2"
|
||||
|
||||
while [[ $time -gt 0 ]]; do
|
||||
if [[ "$(systemctl show --property=Result "$unit")" == "Result=timeout" ]]; then
|
||||
return 0
|
||||
fi
|
||||
|
||||
sleep 1
|
||||
time=$((time - 1))
|
||||
done
|
||||
|
||||
journalctl -u "$unit" >>"$TESTLOG"
|
||||
|
||||
return 1
|
||||
}
|
||||
|
||||
# This checks all stages, start, runtime and stop, can be extended by
|
||||
# EXTEND_TIMEOUT_USEC
|
||||
|
||||
|
@ -44,6 +63,53 @@ wait_for fail_start startfail
|
|||
wait_for fail_stop stopfail
|
||||
wait_for fail_runtime runtimefail
|
||||
|
||||
# These ensure that RuntimeMaxSec is honored for scope and service units
|
||||
# when they are created.
|
||||
runtime_max_sec=5
|
||||
|
||||
systemd-run \
|
||||
--property=RuntimeMaxSec=${runtime_max_sec}s \
|
||||
-u runtime-max-sec-test-1.service \
|
||||
/usr/bin/sh -c "while true; do sleep 1; done"
|
||||
wait_for_timeout runtime-max-sec-test-1.service $((runtime_max_sec + 2))
|
||||
|
||||
systemd-run \
|
||||
--property=RuntimeMaxSec=${runtime_max_sec}s \
|
||||
--scope \
|
||||
-u runtime-max-sec-test-2.scope \
|
||||
/usr/bin/sh -c "while true; do sleep 1; done" &
|
||||
wait_for_timeout runtime-max-sec-test-2.scope $((runtime_max_sec + 2))
|
||||
|
||||
# These ensure that RuntimeMaxSec is honored for scope and service
|
||||
# units if the value is changed and then the manager is reloaded.
|
||||
systemd-run \
|
||||
-u runtime-max-sec-test-3.service \
|
||||
/usr/bin/sh -c "while true; do sleep 1; done"
|
||||
mkdir -p /etc/systemd/system/runtime-max-sec-test-3.service.d/
|
||||
cat > /etc/systemd/system/runtime-max-sec-test-3.service.d/override.conf << EOF
|
||||
[Service]
|
||||
RuntimeMaxSec=${runtime_max_sec}s
|
||||
EOF
|
||||
systemctl daemon-reload
|
||||
wait_for_timeout runtime-max-sec-test-3.service $((runtime_max_sec + 2))
|
||||
|
||||
systemd-run \
|
||||
--scope \
|
||||
-u runtime-max-sec-test-4.scope \
|
||||
/usr/bin/sh -c "while true; do sleep 1; done" &
|
||||
|
||||
# Wait until the unit is running to avoid race with creating the override.
|
||||
until systemctl is-active runtime-max-sec-test-4.scope; do
|
||||
sleep 1
|
||||
done
|
||||
mkdir -p /etc/systemd/system/runtime-max-sec-test-4.scope.d/
|
||||
cat > /etc/systemd/system/runtime-max-sec-test-4.scope.d/override.conf << EOF
|
||||
[Scope]
|
||||
RuntimeMaxSec=${runtime_max_sec}s
|
||||
EOF
|
||||
systemctl daemon-reload
|
||||
wait_for_timeout runtime-max-sec-test-4.scope $((runtime_max_sec + 2))
|
||||
|
||||
if [[ -f "$TESTLOG" ]]; then
|
||||
# no mv
|
||||
cp "$TESTLOG" /test.log
|
||||
|
|
Loading…
Reference in a new issue