[patch] Adds ability to kill frozen domains after timeout

xend.initd-kill.frozen.domUs.patch (text/plain), 1.28 KB, created by Joe Barker on 2010-08-17 21:58:59 UTC

--- old/xend	2010-08-17 16:39:54.000000000 -0500
+++ new/xend	2010-08-17 16:41:28.000000000 -0500
@@ -36,10 +36,45 @@
 }
 
 stop() {
-	if [ "$(xm list | wc -l)" -gt 2 ]; then
-		ebegin "  Stopping all domains"
-		/usr/sbin/xm shutdown --all --wait >/dev/null
-		eend $?
+	if [ "$(xm list 2>/dev/null | wc -l)" -gt 2 ]; then
+		ebegin "Stopping all Xen domains"
+		/usr/sbin/xm shutdown --all >/dev/null
+
+		#Poll for shutdown
+		WAIT=30
+		while [ "$(xm list 2>/dev/null | wc -l)" -gt 2 -a $WAIT -gt 0 ]; do
+			sleep 1
+			WAIT=$((WAIT-1))
+		done
+
+		if [ $WAIT -gt 0 ]; then
+			eend 0
+		else
+			#Kill remaining stragglers, otherwise whole machine (dom0) has to be killed
+			eend 1
+			eindent
+			ewarn "Some domains refuse to shutdown, killing the stragglers"
+			xm list -l | grep '\(name [^\)]*\)' | while read D ; do
+				D=${D#*(name }
+				D=${D%)*}
+				if [ "$D" != "Domain-0" ]; then
+					#Attempt to force linux domU's to remount readonly
+					xm sysrq $D s
+					xm sysrq $D u
+				fi
+			done
+			sleep 10
+			xm list -l | grep '\(name [^\)]*\)' | while read D ; do
+				D=${D#*(name }
+				D=${D%)*}
+				if [ "$D" != "Domain-0" ]; then
+					ebegin "Killing domain $D"
+					xm destroy $D
+					eend $?
+				fi
+			done
+			eoutdent
+		fi
 	fi
 
 	ebegin "Stopping Xen control daemon"