Change in vdsm[ovirt-3.3]: gluster prepareImage: return gluster-specific information
Hello Sandro Bonazzola, Ewoud Kohl van Wijngaarden, Eduardo,
I'd like you to do a code review. Please visit
http://gerrit.ovirt.org/21151
to review the following change.
Change subject: gluster prepareImage: return gluster-specific information
..
gluster prepareImage: return gluster-specific information
Since the introduction of gLuster storage domains (1d90895cdda8,
committed 9 months ago), prepareImage returns an additional element
beyond the path to the leaf: a dictionary keyed by "info", carrying
gluster-specific information.
This dictionary has been dropped by a recent refactoring of prepareImage
since the computation of its contents assumes that the leaf volume is
part of a storage pool, and this is harmful to the "Hosted Engine"
effort.
This patch re-introduces the lost functionality, in the price of a
redundant production of a volume. To make this a little less expensive
and harmful to HE, we limit the production to gluster volumes.
This patch is not the child we've prayed for, but it works.
Special thanks to Samuli Heinonen for reporting
the bug and testing this patch.
Bug-Url: https://bugzilla.redhat.com/1022961
Change-Id: If9a8fbf2baafa1f9bfc3677b1301c7934ca74651
Signed-off-by: Dan Kenigsberg
Signed-off-by: Eduardo Warszawski
Reviewed-on: http://gerrit.ovirt.org/21059
Reviewed-by: Ewoud Kohl van Wijngaarden
Reviewed-by: Sandro Bonazzola
---
M vdsm/storage/hsm.py
1 file changed, 7 insertions(+), 4 deletions(-)
git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/51/21151/1
diff --git a/vdsm/storage/hsm.py b/vdsm/storage/hsm.py
index 1307699..7d3a5d4 100644
--- a/vdsm/storage/hsm.py
+++ b/vdsm/storage/hsm.py
@@ -3246,7 +3246,7 @@
volUUID)
volInfo = {'domainID': sdUUID, 'imageID': imgUUID,
'volumeID': volUUID, 'path': path,
- 'volType': "path"}
+ }
leasePath, leaseOffset = dom.getVolumeLease(imgUUID, volUUID)
@@ -3257,10 +3257,13 @@
})
imgVolumesInfo.append(volInfo)
-if volUUID == leafUUID:
-leafInfo = volInfo
-return {'path': leafPath, 'info': leafInfo,
+if isinstance(dom.getRealDomain(), glusterSD.GlusterStorageDomain):
+ginfo = dom.produceVolume(imgUUID, volUUID).getVmVolumeInfo()
+else:
+ginfo = {'volType': 'path'}
+
+return {'path': leafPath, 'info': ginfo,
'imgVolumesInfo': imgVolumesInfo}
@public
--
To view, visit http://gerrit.ovirt.org/21151
To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: If9a8fbf2baafa1f9bfc3677b1301c7934ca74651
Gerrit-PatchSet: 1
Gerrit-Project: vdsm
Gerrit-Branch: ovirt-3.3
Gerrit-Owner: Dan Kenigsberg
Gerrit-Reviewer: Eduardo
Gerrit-Reviewer: Ewoud Kohl van Wijngaarden
Gerrit-Reviewer: Sandro Bonazzola
___
vdsm-patches mailing list
vdsm-patches@lists.fedorahosted.org
https://lists.fedorahosted.org/mailman/listinfo/vdsm-patches
Change in vdsm[ovirt-3.3]: gluster prepareImage: return gluster-specific information
Dan Kenigsberg has posted comments on this change. Change subject: gluster prepareImage: return gluster-specific information .. Patch Set 1: Verified+1 verified by Samuli Heinonen. This patch fixes an ovirt-3.3.1 blocker. -- To view, visit http://gerrit.ovirt.org/21151 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: If9a8fbf2baafa1f9bfc3677b1301c7934ca74651 Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: ovirt-3.3 Gerrit-Owner: Dan Kenigsberg Gerrit-Reviewer: Dan Kenigsberg Gerrit-Reviewer: Eduardo Gerrit-Reviewer: Ewoud Kohl van Wijngaarden Gerrit-Reviewer: Sandro Bonazzola Gerrit-Reviewer: automat...@ovirt.org Gerrit-HasComments: No ___ vdsm-patches mailing list vdsm-patches@lists.fedorahosted.org https://lists.fedorahosted.org/mailman/listinfo/vdsm-patches
Change in vdsm[ovirt-3.3]: gluster prepareImage: return gluster-specific information
Sandro Bonazzola has posted comments on this change. Change subject: gluster prepareImage: return gluster-specific information .. Patch Set 1: Code-Review+1 -- To view, visit http://gerrit.ovirt.org/21151 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: If9a8fbf2baafa1f9bfc3677b1301c7934ca74651 Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: ovirt-3.3 Gerrit-Owner: Dan Kenigsberg Gerrit-Reviewer: Dan Kenigsberg Gerrit-Reviewer: Eduardo Gerrit-Reviewer: Ewoud Kohl van Wijngaarden Gerrit-Reviewer: Sandro Bonazzola Gerrit-Reviewer: Yaniv Bronhaim Gerrit-Reviewer: automat...@ovirt.org Gerrit-HasComments: No ___ vdsm-patches mailing list vdsm-patches@lists.fedorahosted.org https://lists.fedorahosted.org/mailman/listinfo/vdsm-patches
Change in vdsm[ovirt-3.3]: gluster prepareImage: return gluster-specific information
Ayal Baron has posted comments on this change. Change subject: gluster prepareImage: return gluster-specific information .. Patch Set 1: Code-Review-1 1. this breaks encapsulation 2. introducing this will mean that we would not be able to run VMs with snapshots on gluster due to the following bug http://bugzilla.redhat.com/1017289, so in fact it is currently a good thing that libgfapi is not working. -- To view, visit http://gerrit.ovirt.org/21151 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: If9a8fbf2baafa1f9bfc3677b1301c7934ca74651 Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: ovirt-3.3 Gerrit-Owner: Dan Kenigsberg Gerrit-Reviewer: Ayal Baron Gerrit-Reviewer: Dan Kenigsberg Gerrit-Reviewer: Eduardo Gerrit-Reviewer: Ewoud Kohl van Wijngaarden Gerrit-Reviewer: Sandro Bonazzola Gerrit-Reviewer: Yaniv Bronhaim Gerrit-Reviewer: automat...@ovirt.org Gerrit-HasComments: No ___ vdsm-patches mailing list vdsm-patches@lists.fedorahosted.org https://lists.fedorahosted.org/mailman/listinfo/vdsm-patches
Change in vdsm[ovirt-3.3]: gluster prepareImage: return gluster-specific information
Dan Kenigsberg has posted comments on this change. Change subject: gluster prepareImage: return gluster-specific information .. Patch Set 1: True, making hsm be aware of gluster extra volume info is ugly. I have slightly less ugly, more complex and untested patches on master solving this. We've had glusterfs in ovirt-3.3.0, albeit with a flaw with snapshots. If the bug is kept in ovirt-3.3.1, whomever upgrades to ovirt-3.3.1 is going to be silently dropped to posixfs. That's impolite. Whomever needed snapshot in ovirt-3.3.0 should have used fuse-based gluster then, and could continue to do so in ovirt-3.3.1, regardless of this patch. -- To view, visit http://gerrit.ovirt.org/21151 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: If9a8fbf2baafa1f9bfc3677b1301c7934ca74651 Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: ovirt-3.3 Gerrit-Owner: Dan Kenigsberg Gerrit-Reviewer: Ayal Baron Gerrit-Reviewer: Dan Kenigsberg Gerrit-Reviewer: Eduardo Gerrit-Reviewer: Ewoud Kohl van Wijngaarden Gerrit-Reviewer: Sandro Bonazzola Gerrit-Reviewer: Yaniv Bronhaim Gerrit-Reviewer: automat...@ovirt.org Gerrit-HasComments: No ___ vdsm-patches mailing list vdsm-patches@lists.fedorahosted.org https://lists.fedorahosted.org/mailman/listinfo/vdsm-patches
Change in vdsm[ovirt-3.3]: gluster prepareImage: return gluster-specific information
Ayal Baron has posted comments on this change. Change subject: gluster prepareImage: return gluster-specific information .. Patch Set 1: same -- To view, visit http://gerrit.ovirt.org/21151 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: If9a8fbf2baafa1f9bfc3677b1301c7934ca74651 Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: ovirt-3.3 Gerrit-Owner: Dan Kenigsberg Gerrit-Reviewer: Ayal Baron Gerrit-Reviewer: Dan Kenigsberg Gerrit-Reviewer: Eduardo Gerrit-Reviewer: Ewoud Kohl van Wijngaarden Gerrit-Reviewer: Sandro Bonazzola Gerrit-Reviewer: Yaniv Bronhaim Gerrit-Reviewer: automat...@ovirt.org Gerrit-HasComments: No ___ vdsm-patches mailing list vdsm-patches@lists.fedorahosted.org https://lists.fedorahosted.org/mailman/listinfo/vdsm-patches
Change in vdsm[ovirt-3.3]: gluster prepareImage: return gluster-specific information
Ewoud Kohl van Wijngaarden has posted comments on this change. Change subject: gluster prepareImage: return gluster-specific information .. Patch Set 1: Code-Review+1 -- To view, visit http://gerrit.ovirt.org/21151 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: If9a8fbf2baafa1f9bfc3677b1301c7934ca74651 Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: ovirt-3.3 Gerrit-Owner: Dan Kenigsberg Gerrit-Reviewer: Ayal Baron Gerrit-Reviewer: Dan Kenigsberg Gerrit-Reviewer: Eduardo Gerrit-Reviewer: Ewoud Kohl van Wijngaarden Gerrit-Reviewer: Sandro Bonazzola Gerrit-Reviewer: Yaniv Bronhaim Gerrit-Reviewer: automat...@ovirt.org Gerrit-HasComments: No ___ vdsm-patches mailing list vdsm-patches@lists.fedorahosted.org https://lists.fedorahosted.org/mailman/listinfo/vdsm-patches
Change in vdsm[ovirt-3.3]: gluster prepareImage: return gluster-specific information
Yaniv Bronhaim has posted comments on this change. Change subject: gluster prepareImage: return gluster-specific information .. Patch Set 1: Code-Review-2 we just reverted this change from master. any reason why to backport it? -- To view, visit http://gerrit.ovirt.org/21151 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: If9a8fbf2baafa1f9bfc3677b1301c7934ca74651 Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: ovirt-3.3 Gerrit-Owner: Dan Kenigsberg Gerrit-Reviewer: Ayal Baron Gerrit-Reviewer: Dan Kenigsberg Gerrit-Reviewer: Eduardo Gerrit-Reviewer: Ewoud Kohl van Wijngaarden Gerrit-Reviewer: Sandro Bonazzola Gerrit-Reviewer: Yaniv Bronhaim Gerrit-Reviewer: automat...@ovirt.org Gerrit-HasComments: No ___ vdsm-patches mailing list vdsm-patches@lists.fedorahosted.org https://lists.fedorahosted.org/mailman/listinfo/vdsm-patches
Change in vdsm[ovirt-3.3]: gluster prepareImage: return gluster-specific information
Dan Kenigsberg has abandoned this change. Change subject: gluster prepareImage: return gluster-specific information .. Abandoned -- To view, visit http://gerrit.ovirt.org/21151 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: abandon Gerrit-Change-Id: If9a8fbf2baafa1f9bfc3677b1301c7934ca74651 Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: ovirt-3.3 Gerrit-Owner: Dan Kenigsberg Gerrit-Reviewer: Ayal Baron Gerrit-Reviewer: Dan Kenigsberg Gerrit-Reviewer: Eduardo Gerrit-Reviewer: Ewoud Kohl van Wijngaarden Gerrit-Reviewer: Sandro Bonazzola Gerrit-Reviewer: Yaniv Bronhaim Gerrit-Reviewer: automat...@ovirt.org ___ vdsm-patches mailing list vdsm-patches@lists.fedorahosted.org https://lists.fedorahosted.org/mailman/listinfo/vdsm-patches
