Change in vdsm[master]: Do not delete the template when zeroing a dependant image.

ewarszaw at redhat.com ewarszaw at redhat.com
Mon Feb 18 17:02:38 UTC 2013


Eduardo has uploaded a new change for review.

Change subject: Do not delete the template when zeroing a dependant image.
......................................................................

Do not delete the template when zeroing a dependant image.

Change-Id: I9e472334efa9dadb5389db70b0953f88b9be858a
Bug-url: https://bugzilla.redhat.com/show_bug.cgi?id=910013
Signed-off-by: Eduardo <ewarszaw at redhat.com>
---
M vdsm/storage/blockSD.py
M vdsm/storage/hsm.py
2 files changed, 4 insertions(+), 2 deletions(-)


  git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/78/12178/1

diff --git a/vdsm/storage/blockSD.py b/vdsm/storage/blockSD.py
index 6c161e2..3ace9fd 100644
--- a/vdsm/storage/blockSD.py
+++ b/vdsm/storage/blockSD.py
@@ -982,7 +982,9 @@
         self.rmDCImgDir(imgUUID, volsImgs)
 
     def zeroImage(self, sdUUID, imgUUID, volsImgs):
-        zeroImgVolumes(sdUUID, imgUUID, volsImgs)
+        toZero = tuple(vName for vName, v in volsImgs.iteritems()
+                       if v.imgs[0] == imgUUID)
+        zeroImgVolumes(sdUUID, imgUUID, toZero)
         self.rmDCImgDir(imgUUID, volsImgs)
 
     def getAllVolumes(self):
diff --git a/vdsm/storage/hsm.py b/vdsm/storage/hsm.py
index ed6e262..23621f9 100644
--- a/vdsm/storage/hsm.py
+++ b/vdsm/storage/hsm.py
@@ -1458,7 +1458,7 @@
             # postZero implies block domain. Backup domains are always NFS
             # hence no need to create fake template if postZero is true.
             self._spmSchedule(spUUID, "zeroImage_%s" % imgUUID, dom.zeroImage,
-                              sdUUID, imgUUID, volsByImg.keys())
+                              sdUUID, imgUUID, volsByImg)
         else:
             dom.deleteImage(sdUUID, imgUUID, volsByImg)
             # This is a hack to keep the interface consistent


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

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


More information about the vdsm-patches mailing list