Change in vdsm[master]: Ensure teardownVolumePath is called with a valid dict.
lyarwood at redhat.com
lyarwood at redhat.com
Thu May 16 15:07:52 UTC 2013
Lee Yarwood has uploaded a new change for review.
Change subject: Ensure teardownVolumePath is called with a valid dict.
......................................................................
Ensure teardownVolumePath is called with a valid dict.
If teardownVolumePath is not called with a valid dict of format
{'domainID':,'poolID':,'imageID':} we do not inturn call teardownImage
and do not deactivate the volume.
Change-Id: I259ee0edd02afe179057b54fc8d1e0843db5be8e
Bug-Url: https://bugzilla.redhat.com/962549
Signed-off-by: Lee Yarwood <lyarwood at redhat.com>
---
M vdsm/storage/hsm.py
M vdsm/vm.py
2 files changed, 2 insertions(+), 2 deletions(-)
git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/11/14811/1
diff --git a/vdsm/storage/hsm.py b/vdsm/storage/hsm.py
index 15b8331..d5d56a0 100644
--- a/vdsm/storage/hsm.py
+++ b/vdsm/storage/hsm.py
@@ -3152,7 +3152,7 @@
for vol in imgVolumes:
volInfo = {'domainID': sdUUID, 'imageID': imgUUID,
'volumeID': vol.volUUID, 'path': vol.getVolumePath(),
- 'vmVolInfo': vol.getVmVolumeInfo()}
+ 'vmVolInfo': vol.getVmVolumeInfo(), 'poolID': spUUID}
if config.getboolean('irs', 'use_volume_leases'):
leasePath, leaseOffset = dom.getVolumeLease(vol.imgUUID,
diff --git a/vdsm/vm.py b/vdsm/vm.py
index 2b76662..5802fc4 100644
--- a/vdsm/vm.py
+++ b/vdsm/vm.py
@@ -1070,7 +1070,7 @@
with self._volPrepareLock:
for drive in drives:
try:
- self.cif.teardownVolumePath(drive)
+ self.cif.teardownVolumePath(drive.volumeChain[0])
except:
self.log.error("Drive teardown failure for %s",
drive, exc_info=True)
--
To view, visit http://gerrit.ovirt.org/14811
To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I259ee0edd02afe179057b54fc8d1e0843db5be8e
Gerrit-PatchSet: 1
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Lee Yarwood <lyarwood at redhat.com>
More information about the vdsm-patches
mailing list