mirror of
https://github.com/troglobit/finit.git
synced 2026-11-20 19:41:51 +00:00
service: start restart always at two seconds between restarts
A crashing service with restart always waited five seconds before
every restart. It should wait two seconds for the first five, like a
service with the default restart-max:
service foo {
restart = "always"
command = "foo"
}
The back-off starts after half of restart-max attempts. For restart
always restart-max is -1, so half of it was zero and the back-off
began with the first restart. Use the default restart-max instead.
Signed-off-by: Joachim Wiberg <troglobit@gmail.com>
This commit is contained in:
5 files changed
+67
-5
No files matched your search
Executable
+56
@@ -0,0 +1,56 @@
|
||||
#!/bin/sh
|
||||
# Verify the delay between restarts of a crashing service. It logs
|
||||
# the uptime, in centiseconds, of each start and then exits.
|
||||
set -eu
|
||||
|
||||
TEST_DIR=$(dirname "$0")
|
||||
|
||||
STARTS=/tmp/starts
|
||||
|
||||
# Wait for start $2, then check the delay since start $1, in sec
|
||||
assert_delay()
|
||||
{
|
||||
retry "texec sh -c 'test \$(wc -l < $STARTS) -ge $2'" 150 0.1
|
||||
# shellcheck disable=SC2016 # $1 is awk's field reference, not the shell's
|
||||
delay=$(texec awk -v a="$1" -v b="$2" 'NR == a { t = $1 } NR == b { print $1 - t }' $STARTS)
|
||||
assert "Delay between start $1 and $2 is $3-$4 sec" "$delay" -ge "$(($3 * 100))"
|
||||
assert "Delay between start $1 and $2 is $3-$4 sec" "$delay" -le "$(($4 * 100))"
|
||||
}
|
||||
|
||||
# Replace the service, settings in $1, and let it start crashing
|
||||
crash()
|
||||
{
|
||||
run "rm -f $FINIT_CONF"
|
||||
run "initctl reload"
|
||||
run "rm -f $STARTS"
|
||||
run "cat > $FINIT_CONF" <<CONF
|
||||
service crash {
|
||||
$1
|
||||
command = "crash.sh"
|
||||
}
|
||||
CONF
|
||||
run "initctl reload"
|
||||
}
|
||||
|
||||
test_teardown()
|
||||
{
|
||||
say "Running test teardown."
|
||||
run "rm -f $FINIT_CONF $STARTS /bin/crash.sh"
|
||||
}
|
||||
|
||||
# shellcheck source=/dev/null
|
||||
. "$TEST_DIR/lib/setup.sh"
|
||||
|
||||
cat > "$SYSROOT/bin/crash.sh" <<SCRIPT
|
||||
#!/bin/sh
|
||||
tr -d . < /proc/uptime | cut -d' ' -f1 >> $STARTS
|
||||
exit 1
|
||||
SCRIPT
|
||||
chmod +x "$SYSROOT/bin/crash.sh"
|
||||
|
||||
sep
|
||||
say 'restart always, at once the first time, then every other second'
|
||||
crash 'restart = "always"'
|
||||
assert_delay 1 2 0 1
|
||||
assert_delay 2 3 2 3
|
||||
assert_delay 3 4 2 3
|
||||
Reference in new issue
Block a user