Change in vdsm[master]: Revert "gluster prepareImage: return gluster-specific inform...

danken at redhat.com danken at redhat.com
Thu Nov 21 13:53:55 UTC 2013


Dan Kenigsberg has uploaded a new change for review.

Change subject: Revert "gluster prepareImage: return gluster-specific information"
......................................................................

Revert "gluster prepareImage: return gluster-specific information"

This reverts commit 51081b81de8cda48e0060e which is universally known to
be quite ugly, and is also unhelpful since we do not support
gluster-based VM with snapshots.

Change-Id: I9b90be682593183434012ddfd5578af38bfa2e0b
Signed-off-by: Dan Kenigsberg <danken at redhat.com>
---
M vdsm/storage/hsm.py
1 file changed, 4 insertions(+), 7 deletions(-)


  git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/08/21508/1

diff --git a/vdsm/storage/hsm.py b/vdsm/storage/hsm.py
index c8af8b1..73f9f43 100644
--- a/vdsm/storage/hsm.py
+++ b/vdsm/storage/hsm.py
@@ -3287,7 +3287,7 @@
                                 volUUID)
             volInfo = {'domainID': sdUUID, 'imageID': imgUUID,
                        'volumeID': volUUID, 'path': path,
-                       }
+                       'volType': "path"}
 
             leasePath, leaseOffset = dom.getVolumeLease(imgUUID, volUUID)
 
@@ -3298,13 +3298,10 @@
                 })
 
             imgVolumesInfo.append(volInfo)
+            if volUUID == leafUUID:
+                leafInfo = volInfo
 
-        if isinstance(dom.getRealDomain(), glusterSD.GlusterStorageDomain):
-            ginfo = dom.produceVolume(imgUUID, volUUID).getVmVolumeInfo()
-        else:
-            ginfo = {'volType': 'path'}
-
-        return {'path': leafPath, 'info': ginfo,
+        return {'path': leafPath, 'info': leafInfo,
                 'imgVolumesInfo': imgVolumesInfo}
 
     @public


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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I9b90be682593183434012ddfd5578af38bfa2e0b
Gerrit-PatchSet: 1
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Dan Kenigsberg <danken at redhat.com>


More information about the vdsm-patches mailing list