wt/finit
1
0
Fork 0
mirror of https://github.com/troglobit/finit.git synced 2026-10-01 05:22:48 +07:00
Code Issues Packages Projects Releases Wiki Activity

test: update, pid/B is no longer assert by Finit if notify != pid

Browse Source 
As of Finit v4.6 we no longer assert the PID condition for services
declaring themselves as notify != pid.  We replace D with a forking
service to catch any future regressions in the pidfile plugin.

No need to check reload PID of D, it is enough to check PID of C.

Also, reduce the number of retries at startup.  If we haven't gone
up within 10 sec with this tiny config something is really wrong.

Signed-off-by: Joachim Wiberg <troglobit@gmail.com>
This commit is contained in:
Joachim Wiberg
2023-11-13 06:09:35 +01:00
parent e60211168e
commit 53aa195ad5
1 changed files with 13 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
test/unexpected-restart.sh
+13 -12
View File
@@ -14,10 +14,10 @@ TEST_DIR=$(dirname "$0")
test_setup() test_setup()
{ {
run "cat >> $FINIT_CONF" <<EOF run "cat >> $FINIT_CONF" <<EOF
service log:stdout name:A serv -np -i A service log:stdout notify:pid name:A serv -np -i A -- A (pid)
service log:stdout notify:systemd <pid/A> name:B serv -np -i B -N 0 -- B needs A service log:stdout notify:systemd <pid/A> name:B serv -np -i B -N 0 -- B needs A (systemd)
service log:stdout notify:systemd <service/B/ready> name:C serv -np -i C -N 0 -- C needs B(service) service log:stdout notify:s6 <service/B/ready> name:C serv -np -i C -N 0 -- C needs B (s6)
service log:stdout notify:systemd <pid/B> name:D serv -np -i D -N 0 -- D needs B(pid) service log:stdout notify:none <pid/A> name:D type:forking serv -i D -- D needs A (forking)
task <service/C/ready,service/D/ready> name:allup initctl cond set allup -- Everything is up task <service/C/ready,service/D/ready> name:allup initctl cond set allup -- Everything is up
EOF EOF
say "Test start $(date)" say "Test start $(date)"
@@ -41,17 +41,18 @@ run "cat $FINIT_CONF"
sep sep
run "initctl reload" run "initctl reload"
run "initctl status" run "initctl status"
run "initctl cond dump"
sep sep
run "initctl debug"
say "waiting for primary startup to complete" say "waiting for primary startup to complete"
retry 'assert_status allup "done"' 100 1 retry 'assert_status allup "done"' 10 1
assert_status C "running" assert_status C "running"
oldpid=$(pidof C) oldpid=$(pidof C)
assert_status D "running"
doldpid=$(pidof D)
sep "pre-reload status" sep "pre-reload status"
run "initctl status" run "initctl status"
run "initctl cond dump"
sep sep
say "Reload Finit, who gets restarted?" say "Reload Finit, who gets restarted?"
@@ -59,15 +60,15 @@ say "Reload Finit, who gets restarted?"
run "initctl reload" run "initctl reload"
sleep 2 sleep 2
sep "post-reload status"
run "initctl status"
run "initctl cond dump"
sep
assert_status A "running" assert_status A "running"
assert_status B "running" assert_status B "running"
assert_status C "running" assert_status C "running"
assert_status D "running"
newpid=$(pidof C) newpid=$(pidof C)
# shellcheck disable=SC2086 # shellcheck disable=SC2086
assert "C was not restarted" $oldpid -eq $newpid assert "C was not restarted" $oldpid -eq $newpid
dnewpid=$(pidof D)
# shellcheck disable=SC2086
assert "D was not restarted" $doldpid -eq $dnewpid