Change in vdsm[master]: Fix stale call to deactivateVolumes().

ewarszaw at redhat.com ewarszaw at redhat.com
Wed Aug 7 02:51:32 UTC 2013


Eduardo has uploaded a new change for review.

Change subject: Fix stale call to deactivateVolumes().
......................................................................

Fix stale call to deactivateVolumes().

Calling deactivateImage() is correct due to the one volume (no
template limitation of Image._activateVolumeForImportExport().

This calls were introduced by a conflict in changes:
Ib208bb20d88633167b5c66b42febe912439a022d
I4b6a4e99cf3a657affb4f5e96aa1ac1978a297da

Change-Id: I79fa91ddb3f3c41052461ee768157e86442f6660
Signed-off-by: Eduardo <ewarszaw at redhat.com>
---
M vdsm/storage/image.py
1 file changed, 2 insertions(+), 2 deletions(-)


  git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/34/17734/1

diff --git a/vdsm/storage/image.py b/vdsm/storage/image.py
index e3414b4..097896a 100644
--- a/vdsm/storage/image.py
+++ b/vdsm/storage/image.py
@@ -1170,7 +1170,7 @@
         try:
             imageSharing.upload(vol.getVolumePath(), methodArgs)
         finally:
-            domain.deactivateVolumes(imgUUID, volUUIDs=[vol.volUUID])
+            domain.deactivateImage(imgUUID)
 
     def download(self, methodArgs, sdUUID, imgUUID, volUUID=None):
         domain = sdCache.produce(sdUUID)
@@ -1181,4 +1181,4 @@
             vol.extend(imageSharing.getSize(methodArgs) / volume.BLOCK_SIZE)
             imageSharing.download(vol.getVolumePath(), methodArgs)
         finally:
-            domain.deactivateVolumes(imgUUID, volUUIDs=[vol.volUUID])
+            domain.deactivateImage(imgUUID)


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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I79fa91ddb3f3c41052461ee768157e86442f6660
Gerrit-PatchSet: 1
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Eduardo <ewarszaw at redhat.com>


More information about the vdsm-patches mailing list