From 96b2a8a3423e2f367221c113e4807b936fdf9c5d Mon Sep 17 00:00:00 2001 From: Javi Fontan Date: Thu, 24 Jan 2013 12:44:29 +0100 Subject: [PATCH] Retry kvm cancel to make sure the VM is destroyed (cherry picked from commit 57ac26590a34aff07f6af927ac128a176c6005f9) --- src/vmm_mad/remotes/kvm/cancel | 18 ++++++++++++++++-- 1 file changed, 16 insertions(+), 2 deletions(-) diff --git a/src/vmm_mad/remotes/kvm/cancel b/src/vmm_mad/remotes/kvm/cancel index add90a3192..ab0f4b7548 100755 --- a/src/vmm_mad/remotes/kvm/cancel +++ b/src/vmm_mad/remotes/kvm/cancel @@ -21,5 +21,19 @@ source $(dirname $0)/../../scripts_common.sh deploy_id=$1 -exec_and_log "virsh --connect $LIBVIRT_URI destroy $deploy_id" \ - "Could not destroy $deploy_id" +TIMEOUT=60 + +function destroy_and_monitor +{ + virsh --connect $LIBVIRT_URI destroy $deploy_id + + virsh --connect $LIBVIRT_URI --readonly dominfo $deploy_id + [ "x$?" != "x0" ] +} + +retry $TIMEOUT destroy_and_monitor + +if [ "x$?" != "x0" ]; then + error_message "Could not destroy $deploy_id" + exit 1 +fi