Change in vdsm[master]: vm: Refix vm unpausing during recovery

nsoffer at redhat.com nsoffer at redhat.com
Sun Dec 1 13:21:30 UTC 2013


Nir Soffer has uploaded a new change for review.

Change subject: vm: Refix vm unpausing during recovery
......................................................................

vm: Refix vm unpausing during recovery

Commit 45f3037ca1 should have fixed vm unpausing during recovery, but it
did not because of unfortunate cherry-pick.  The original patch was
initializing vm sdIds list when running a vm in recovery mode. This code
path was removed in commit 93d09f6567 which was merged on the same day.

This patch adds back the missing code path and remove leftover comment
about recovery mode.

Change-Id: Ibbfbed22f1787f727884eeed72d2b15835ebe2dc
Relates-To: http://gerrit.ovirt.org/21649/
Bug-Url: https://bugzilla.redhat.com/1036358
Signed-off-by: Nir Soffer <nsoffer at redhat.com>
---
M vdsm/vm.py
1 file changed, 1 insertion(+), 3 deletions(-)


  git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/92/21892/1

diff --git a/vdsm/vm.py b/vdsm/vm.py
index b272ca2..80359f5 100644
--- a/vdsm/vm.py
+++ b/vdsm/vm.py
@@ -2931,8 +2931,6 @@
         self.conf['smp'] = self.conf.get('smp', '1')
         devices = self.buildConfDevices()
 
-        # TODO: In recover should loop over disks running on the VM because
-        # conf may be outdated if something happened during restart.
         if not 'recover' in self.conf:
             self.preparePaths(devices[DISK_DEVICES])
             self._prepareTransientDisks(devices[DISK_DEVICES])
@@ -2951,7 +2949,7 @@
             # So, to get proper device objects during VM recovery flow
             # we must to have updated conf before VM run
             self.saveState()
-
+        else:
             for drive in devices[DISK_DEVICES]:
                 if drive['device'] == 'disk' and isVdsmImage(drive):
                     self.sdIds.append(drive['domainID'])


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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ibbfbed22f1787f727884eeed72d2b15835ebe2dc
Gerrit-PatchSet: 1
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Nir Soffer <nsoffer at redhat.com>


More information about the vdsm-patches mailing list