Merge lp:~serge-hallyn/ubuntu/oneiric/libvirt/fix-shutdown into lp:ubuntu/oneiric/libvirt

[Serge Hallyn]

[Clint Byrum (clint-fewbar)]

This looks good, I like the use of pre-stop and the fact that this definitively blocks the shutdown until it is done.

review: Approve

Unmerged revisions

120. By Serge Hallyn on 2011-08-03

libvirt-bin.upstart: add a pre-stop script to shut down running VMs
before the host shuts down. (LP: #350936)

=== modified file 'debian/changelog'
--- debian/changelog	2011-07-19 14:20:20 +0000
+++ debian/changelog	2011-08-03 03:02:29 +0000
@@ -1,3 +1,10 @@
+libvirt (0.9.2-4ubuntu7) oneiric; urgency=low
+
+  * libvirt-bin.upstart: add a pre-stop script to shut down running VMs
+    before the host shuts down.  (LP: #350936)
+
+ -- Serge Hallyn <[e-mail]>  Tue, 02 Aug 2011 19:49:40 -0500
+
 libvirt (0.9.2-4ubuntu6) oneiric; urgency=low
 
   * SECURITY UPDATE: integer overflow in virDomainGetVcpus()
 
=== modified file 'debian/libvirt-bin.upstart'
--- debian/libvirt-bin.upstart	2011-07-19 14:20:20 +0000
+++ debian/libvirt-bin.upstart	2011-08-03 03:02:29 +0000
@@ -2,13 +2,20 @@
 author "Dustin Kirkland <[e-mail]>"
 
 start on (runlevel [2345] and stopped networking RESULT=ok)
-stop on runlevel [!2345]
+stop on starting rc RUNLEVEL=[016]
 
 expect daemon
 respawn
 
+# daemonize
 env libvirtd_opts="-d"
+# whether libvirtd should run at boot/shutdown
 env start_libvirtd="yes"
+# by default wait 30 seconds for vms to shut down
+env libvirtd_shutdown_timeout=30
+# uris for which to shut down vms
+env libvirt_uris='qemu:///system lxc:///'
+
 pre-start script
 	[ -r /etc/default/libvirt-bin ] && . /etc/default/libvirt-bin
 	[ ! "x$start_libvirtd" = "xyes" ] && { stop; exit 0; }
@@ -17,6 +24,61 @@
 	rm -f /var/run/libvirtd.pid
 end script
 
+pre-stop script
+	[ -r /etc/default/libvirt-bin ] && . /etc/default/libvirt-bin
+
+	log_msg()
+	{
+		logf="/var/log/libvirt/shutdownlog.log"
+		logger -p daemon.debug -s -t libvirt -- "$@" >> $logf 2>&1
+	}
+
+	run_virsh()
+	{
+		# We parse the output for things like domain state;
+		# make sure the output is in the language we expect.
+		LANG=C virsh "$@"
+	}
+
+	if [ -z "$RUNLEVEL" ]; then
+		exit 0
+	fi
+
+	if [ "$RUNLEVEL" -ne 0 ] && [ "$RUNLEVEL" -ne 1 ] && [ "$RUNLEVEL" -ne 6 ]; then
+		exit 0
+	fi
+	log_msg "libvirt-bin: entering pre-stop at $(date)"
+
+	for uri in $libvirt_uris; do
+		for domain in $(run_virsh -c "$uri" list | awk '$3 == "running" {print $2}'); do
+			log_msg "libvirt-bin: attempting clean shutdown of $domain at $(date)"
+			run_virsh -c "$uri" shutdown "$domain" >/dev/null
+		done
+	done
+
+	delay=$libvirtd_shutdown_timeout
+	while [ $delay -gt 0 ]; do
+		for uri in $libvirt_uris; do
+			if ! run_virsh -c "$uri" list | awk '$3 == "running" {exit 1}'; then
+				# VMs at this URI are still running. Wait, then
+				# start at the beginning looking for running VMs.
+				sleep 1
+				delay=$(($delay - 1))
+				continue 2
+			fi
+		done
+		break
+	done
+
+	for uri in $libvirt_uris; do
+		for domain in $(run_virsh -c "$uri" list | awk '$3 == "running" {print $2}'); do
+			log_msg "destroying $domain"
+			run_virsh -c "$uri" destroy "$domain" >/dev/null
+		done
+	done
+	log_msg "libvirt-bin: exiting pre-stop at $(date)"
+end script
+
 # If you used to set $libvirtd_opts in /etc/default/libvirt-bin,
 # change the 'exec' line here instead.
 exec /usr/sbin/libvirtd $libvirtd_opts