Federico Simoncelli has uploaded a new change for review.
Change subject: hsm: fix sloppy rebase of one shot prepare
......................................................................
hsm: fix sloppy rebase of one shot prepare
A sloppy rebase of c072945 "One shot prepare" removed the changes
introduced by cef2d5b "vm: extend shared property to support locking".
Change-Id: I8f0de78bb9865c93dc40f51c1fcc9b6b29cef516
Signed-off-by: Federico Simoncelli <fsimonce(a)redhat.com>
---
M vdsm/storage/hsm.py
1 file changed, 6 insertions(+), 7 deletions(-)
git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/49/19049/1
diff --git a/vdsm/storage/hsm.py b/vdsm/storage/hsm.py
index f6ba303..8adfda9 100644
--- a/vdsm/storage/hsm.py
+++ b/vdsm/storage/hsm.py
@@ -3242,14 +3242,13 @@
'volumeID': volUUID, 'path': path,
'volType': "path"}
- if config.getboolean('irs', 'use_volume_leases'):
- leasePath, leaseOffset = dom.getVolumeLease(imgUUID, volUUID)
+ leasePath, leaseOffset = dom.getVolumeLease(imgUUID, volUUID)
- if leasePath and leaseOffset is not None:
- volInfo.update({
- 'leasePath': leasePath,
- 'leaseOffset': leaseOffset,
- })
+ if leasePath and type(leaseOffset) in (int, long):
+ volInfo.update({
+ 'leasePath': leasePath,
+ 'leaseOffset': leaseOffset,
+ })
imgVolumesInfo.append(volInfo)
if volUUID == leafUUID:
--
To view, visit
http://gerrit.ovirt.org/19049
To unsubscribe, visit
http://gerrit.ovirt.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I8f0de78bb9865c93dc40f51c1fcc9b6b29cef516
Gerrit-PatchSet: 1
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Federico Simoncelli <fsimonce(a)redhat.com>