Merge lp:~clint-fewbar/ubuntu/precise/sysvinit/wait-for-long-shutdown-jobs into lp:ubuntu/precise/sysvinit

[Clint Byrum]

Untested change to cause sysvinit to wait for any upstart jobs that upstart has already started shutting down.

[lp:~clint-fewbar/ubuntu/precise/sysvinit/wait-for-long-shutdown-jobs]

165. By Clint Byrum on 2011-12-12

also omit pids of stop/killed upstart jobs since we know they've
been killed already.

166. By Clint Byrum on 2011-12-12

d/src/initscripts/etc/init.d/umountroot: Check for init.upgraded
file in /var/run before clearing out /var/run. (LP: #886439)

=== modified file 'debian/changelog'
--- debian/changelog	2011-11-15 20:33:01 +0000
+++ debian/changelog	2011-12-12 23:11:25 +0000
@@ -1,3 +1,17 @@
+sysvinit (2.88dsf-13.10ubuntu6) UNRELEASED; urgency=low
+
+  * d/src/initscripts/etc/init.d/sendsigs: wait up to 300 extra
+    seconds for upstart jobs that have been killed. They will be sent
+    SIGKILL by upstart when their 'kill timeout' has been reached, so
+    we should trust the job's author to give the service a reasonable
+    amount of time to shut down. (LP: #688541)
+  * also omit pids of stop/killed upstart jobs since we know they've
+    been killed already.
+  * d/src/initscripts/etc/init.d/umountroot: Check for init.upgraded
+    file in /var/run before clearing out /var/run. (LP: #886439)
+
+ -- Clint Byrum <[e-mail]>  Mon, 12 Dec 2011 15:07:04 -0800
+
 sysvinit (2.88dsf-13.10ubuntu5) precise; urgency=low
 
   * d/service/service: Updated to use 'stop/start' instead of passing

=== modified file 'debian/src/initscripts/etc/init.d/sendsigs'
--- debian/src/initscripts/etc/init.d/sendsigs	2011-07-12 07:41:11 +0000
+++ debian/src/initscripts/etc/init.d/sendsigs	2011-12-12 23:11:25 +0000
@@ -22,8 +22,12 @@
 	/usr/share/apport/unkillable_shutdown $OMITPIDS
 }
 
+upstart_killed_jobs () {
+	initctl list | grep 'stop/killed'
+}
+
 upstart_jobs () {
-	initctl list | grep start/ | sed -n -e "/process [0-9]/s/.*process //p"
+	initctl list | grep -E '(start/|stop/killed)' | sed -n -e "/process [0-9]/s/.*process //p"
 }
 
 do_stop () {
@@ -106,6 +110,24 @@
 
 		sleep 1
 	done
+
+	# Upstart has a method to set a kill timeout and so the job author
+	# may want us to wait longer than 10 seconds (as in the case of 
+	# mysql). (LP: #688541)
+	#
+	# We will wait up to 300 seconds for any jobs in stop/killed state. 
+	# Any kill timeout higher than that will be overridden by the need 
+	# to shutdown. NOTE the re-use of seq from above, since we already 
+	# waited up to 10 seconds for them.
+	while [ -n "$(upstart_killed_jobs)" ] ; do
+		seq=$(($seq+1))
+		if [ $seq -ge 300 ] ; then
+			break
+		fi
+		
+		sleep 1
+	done
+
 	if [ -z "$alldead" ] ; then
 	    #report_unkillable
 	    log_action_begin_msg "Killing all remaining processes"

=== modified file 'debian/src/initscripts/etc/init.d/umountroot'
--- debian/src/initscripts/etc/init.d/umountroot	2011-07-14 05:02:25 +0000
+++ debian/src/initscripts/etc/init.d/umountroot	2011-12-12 23:11:25 +0000
@@ -16,6 +16,34 @@
 
 do_stop () {
 	[ "$VERBOSE" = no ] || log_action_begin_msg "Mounting root filesystem read-only"
+	# Ask init to re-exec itself before we go down if it has been
+	# upgraded this cycle.  It'll lose all its state, but at least
+	# it won't hold open files on the root filesystem (lp:#672177).
+	if [ -f /var/run/init.upgraded ]
+	then
+		old_map=$( cat /proc/1/maps )
+		map=$old_map
+		telinit u || :
+		i=0
+		timeout=5
+		while [ "$map" = "$old_map" ]
+		do
+			sleep 1
+			map=$( cat /proc/1/maps )
+			/usr/bin/logger "waiting for init to respawn"
+			i=$((i+1))
+			if [ $i -eq $timeout ] ; then
+				break
+			fi
+		done
+
+		if [ "$map" = "$old_map" ] ; then
+			/usr/bin/logger "FAIL: init failed to respawn in $timeout seconds - unmounting anyway"
+		else
+			/usr/bin/logger "SUCCESS: init respawned after $i seconds (within $timeout seconds timeout)"
+		fi
+	fi
+
 	# These directories must exist on the root filesystem as they are
 	# targets for system mountpoints.  We've just unmounted all other
 	# filesystems, so either they are mounted now (in which case the
@@ -49,34 +77,6 @@
 	    ln -nsf /run /lib/init/rw
 	fi
 
-	# Ask init to re-exec itself before we go down if it has been
-	# upgraded this cycle.  It'll lose all its state, but at least
-	# it won't hold open files on the root filesystem (lp:#672177).
-	if [ -f /var/run/init.upgraded ]
-	then
-		old_map=$( cat /proc/1/maps )
-		map=$old_map
-		telinit u || :
-		i=0
-		timeout=5
-		while [ "$map" = "$old_map" ]
-		do
-			sleep 1
-			map=$( cat /proc/1/maps )
-			/usr/bin/logger "waiting for init to respawn"
-			i=$((i+1))
-			if [ $i -eq $timeout ] ; then
-				break
-			fi
-		done
-
-		if [ "$map" = "$old_map" ] ; then
-			/usr/bin/logger "FAIL: init failed to respawn in $timeout seconds - unmounting anyway"
-		else
-			/usr/bin/logger "SUCCESS: init respawned after $i seconds (within $timeout seconds timeout)"
-		fi
-	fi
-
 	MOUNT_FORCE_OPT=
 	[ "$(uname -s)" = "GNU/kFreeBSD" ] && MOUNT_FORCE_OPT=-f
 	# This: