Candace Sheremeta has uploaded a new change for review.
Change subject: vdsm: added functionality to teardownImage when disk has been deleted ......................................................................
vdsm: added functionality to teardownImage when disk has been deleted
added code to teardownImage in hsm.py so that teardownImage reports "Volume does not exist" for a previously deleted disk, where it previously simply reported "OK" - teardownImage now checks to see if volume exists before attempting to delete it
Bug-Url: https://bugzilla.redhat.com/show_bug.cgi?id=1184718 Change-Id: Ia929dfdc78ccaa736033e41a77bce861d5a27769 Signed-off-by: Candace Sheremeta cshereme@redhat.com --- M vdsm/storage/hsm.py 1 file changed, 7 insertions(+), 0 deletions(-)
git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/41/38241/1
diff --git a/vdsm/storage/hsm.py b/vdsm/storage/hsm.py index 8c75277..45e6634 100644 --- a/vdsm/storage/hsm.py +++ b/vdsm/storage/hsm.py @@ -3271,6 +3271,13 @@ vars.task.getSharedLock(STORAGE, sdUUID)
dom = sdCache.produce(sdUUID) + allVols = dom.getAllVolumes() + # Filter volumes related to this image + imgVolumes = sd.getVolsOfImage(allVols, imgUUID).keys() + + if volUUID not in imgVolumes: + raise se.VolumeDoesNotExist(volUUID) + dom.deactivateImage(imgUUID)
@public