Welcome to little lamb

Code » anopa » commit c507fea

stage3: Tweak wait-ing post TERM/KILL

author Olivier Brunel
2017-01-24 17:48:37 UTC
committer Olivier Brunel
2017-06-18 12:26:22 UTC
parent ddc3b312b391acbf661d930c4705940e57e66e48
stage3: Tweak wait-ing post TERM/KILL

- After TERM we give processes ~4s to end instead of immediately trying
  to KILL them;
- After KILL we only wait up to ~2s, then move on (instead of blocking
  should there be a process in uninterruptible sleep)
src/scripts/aa-stage3 +3 -3 
diff --git a/src/scripts/aa-stage3 b/src/scripts/aa-stage3
index 3115da4..f7f1a7a 100755
--- a/src/scripts/aa-stage3
+++ b/src/scripts/aa-stage3
@@ -3,7 +3,7 @@
 # anopa - Copyright (C) 2015-2017 Olivier Brunel
 #
 # aa-stage3
-# Copyright (C) 2015 Olivier Brunel <jjk@jjacky.com>
+# Copyright (C) 2015-2017 Olivier Brunel <jjk@jjacky.com>
 #
 # This file is part of anopa.
 #
@@ -52,7 +52,7 @@ foreground { emptyenv -c s6-setsid aa-stop -D uncaught-logs }
 foreground { aa-echo -DB "Killing remaining processes..." }
 foreground { aa-echo -Dt "Sending SIGTERM to all processes..." }
 foreground { aa-kill -Dst }
-wait -r { } # Reap zombies
+wait -t 4200 { } # Reap zombies
 # logger was killed, and we won't open it back
 fdmove -c 2 1
 foreground { pipeline { aa-echo -Dt "Sending SIGKILL to all processes..." }
@@ -60,7 +60,7 @@ foreground { pipeline { aa-echo -Dt "Sending SIGKILL to all processes..." }
     s6-tai64n
 }
 foreground { aa-kill -sk }
-wait { } # Wait for all children
+wait -t 2300 { } # Wait for all children
 
 foreground { aa-sync }
 foreground { pipeline { aa-echo -DB "Pivoting root..." }