Change in vdsm[master]: keep pauseCode when migrating paused VM

Arik Hadas has uploaded a new change for review.

Change subject: keep pauseCode when migrating paused VM
......................................................................

keep pauseCode when migrating paused VM

This patch fix a bug where the pauseCode is cleared on the destination
host when migrating paused VM.

Change-Id: Iead0697bbebba3f261040221b04cd3745d8ef036
Signed-off-by: Arik Hadas <ahadas(a)redhat.com&gt;
---
M vdsm/virt/vm.py
1 file changed, 4 insertions(+), 3 deletions(-)


  git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/01/27801/1

diff --git a/vdsm/virt/vm.py b/vdsm/virt/vm.py
index 1bd9fed..8127402 100644
--- a/vdsm/virt/vm.py
+++ b/vdsm/virt/vm.py
@@ -1952,8 +1952,9 @@
                 self._ongoingCreations.release()
                 self.log.debug("_ongoingCreations released")
 
-            if ('migrationDest' in self.conf or 'restoreState' in
self.conf) \
-                    and self.lastStatus != vmstatus.DOWN:
+            migrating = 'migrationDest' in self.conf or \
+                        'restoreState' in self.conf
+            if migrating and self.lastStatus != vmstatus.DOWN:
                 self._waitForIncomingMigrationFinish()
 
             self.lastStatus = vmstatus.UP
@@ -1961,7 +1962,7 @@
                 self.conf['pauseCode'] = self._initTimePauseCode
                 if self._initTimePauseCode == 'ENOSPC':
                     self.cont()
-            else:
+            elif not migrating:
                 try:
                     with self._confLock:
                         del self.conf['pauseCode']


-- 
To view, visit http://gerrit.ovirt.org/27801
To unsubscribe, visit http://gerrit.ovirt.org/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: Iead0697bbebba3f261040221b04cd3745d8ef036
Gerrit-PatchSet: 1
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Arik Hadas <ahadas(a)redhat.com&gt;