[NEW PATCH] Use the correct events to end migration (via gerrit-bot)
Dan Kenigsberg
danken at redhat.com
Thu Sep 15 14:48:33 UTC 2011
New patch submitted by Dan Kenigsberg (danken at redhat.com)
You can review this change at: http://gerrit.usersys.redhat.com/782
commit 1b7a0e6c02d3eecdc72531999d5c54ede1996983
Author: Federico Simoncelli <fsimonce at redhat.com>
Date: Wed Aug 3 10:03:59 2011 +0000
Use the correct events to end migration
Change-Id: I0e3833bee7da8a3fbd77ad72c244f714b929005e
diff --git a/vdsm/libvirtvm.py b/vdsm/libvirtvm.py
index 64ee74a..92be23a 100644
--- a/vdsm/libvirtvm.py
+++ b/vdsm/libvirtvm.py
@@ -1279,10 +1279,6 @@ class LibvirtVm(vm.Vm):
if detail == libvirt.VIR_DOMAIN_EVENT_STOPPED_SHUTDOWN:
self.user_destroy = True
self._onQemuDeath()
- elif event == libvirt.VIR_DOMAIN_EVENT_STARTED:
- if detail == libvirt.VIR_DOMAIN_EVENT_STARTED_MIGRATED and\
- self.lastStatus == 'Migration Destination':
- self._incomingMigrationFinished.set()
elif event == libvirt.VIR_DOMAIN_EVENT_SUSPENDED:
self._guestCpuRunning = False
if detail == libvirt.VIR_DOMAIN_EVENT_SUSPENDED_PAUSED:
@@ -1291,6 +1287,9 @@ class LibvirtVm(vm.Vm):
self._guestCpuRunning = True
if detail == libvirt.VIR_DOMAIN_EVENT_RESUMED_UNPAUSED:
hooks.after_vm_cont(self._dom.XMLDesc(0), self.conf)
+ elif detail == libvirt.VIR_DOMAIN_EVENT_RESUMED_MIGRATED and\
+ self.lastStatus == 'Migration Destination':
+ self._incomingMigrationFinished.set()
def waitForMigrationDestinationPrepare(self):
"""Wait until paths are prepared for migration destination"""
More information about the vdsm-patches
mailing list