Change in vdsm[master]: Fix fix getDomUuidFromVolumePath()
Dan Kenigsberg has posted comments on this change. Change subject: Fix fix getDomUuidFromVolumePath() .. Patch Set 1: Could you tell why 20790 is less robust? Your own patch assumes that the leading path does not have /images in it. -- To view, visit http://gerrit.ovirt.org/20783 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I648e6a3f4e877c8f2471e82d7064c3e5a021d4d1 Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Eduardo ewars...@redhat.com Gerrit-Reviewer: Ayal Baron aba...@redhat.com Gerrit-Reviewer: Dan Kenigsberg dan...@redhat.com Gerrit-Reviewer: Eduardo ewars...@redhat.com Gerrit-Reviewer: Gadi Ickowicz gicko...@redhat.com Gerrit-Reviewer: Saggi Mizrahi smizr...@redhat.com Gerrit-Reviewer: Yeela Kaplan ykap...@redhat.com Gerrit-Reviewer: oVirt Jenkins CI Server Gerrit-HasComments: No ___ vdsm-patches mailing list vdsm-patches@lists.fedorahosted.org https://lists.fedorahosted.org/mailman/listinfo/vdsm-patches
Change in vdsm[master]: Fix fix getDomUuidFromVolumePath()
Dan Kenigsberg has posted comments on this change. Change subject: Fix fix getDomUuidFromVolumePath() .. Patch Set 1: Verified+1 Code-Review+2 -- To view, visit http://gerrit.ovirt.org/20783 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I648e6a3f4e877c8f2471e82d7064c3e5a021d4d1 Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Eduardo ewars...@redhat.com Gerrit-Reviewer: Ayal Baron aba...@redhat.com Gerrit-Reviewer: Dan Kenigsberg dan...@redhat.com Gerrit-Reviewer: Eduardo ewars...@redhat.com Gerrit-Reviewer: Gadi Ickowicz gicko...@redhat.com Gerrit-Reviewer: Saggi Mizrahi smizr...@redhat.com Gerrit-Reviewer: Yeela Kaplan ykap...@redhat.com Gerrit-Reviewer: oVirt Jenkins CI Server Gerrit-HasComments: No ___ vdsm-patches mailing list vdsm-patches@lists.fedorahosted.org https://lists.fedorahosted.org/mailman/listinfo/vdsm-patches
Change in vdsm[master]: Fix fix getDomUuidFromVolumePath()
Dan Kenigsberg has submitted this change and it was merged. Change subject: Fix fix getDomUuidFromVolumePath() .. Fix fix getDomUuidFromVolumePath() Change-Id: I648e6a3f4e877c8f2471e82d7064c3e5a021d4d1 Bug-Url: http://bugzilla.redhat.com/1017735 Signed-off-by: Eduardo ewars...@redhat.com Reviewed-on: http://gerrit.ovirt.org/20783 Reviewed-by: Dan Kenigsberg dan...@redhat.com Tested-by: Dan Kenigsberg dan...@redhat.com --- M vdsm/storage/fileVolume.py 1 file changed, 5 insertions(+), 12 deletions(-) Approvals: Dan Kenigsberg: Verified; Looks good to me, approved -- To view, visit http://gerrit.ovirt.org/20783 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: I648e6a3f4e877c8f2471e82d7064c3e5a021d4d1 Gerrit-PatchSet: 2 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Eduardo ewars...@redhat.com Gerrit-Reviewer: Ayal Baron aba...@redhat.com Gerrit-Reviewer: Dan Kenigsberg dan...@redhat.com Gerrit-Reviewer: Eduardo ewars...@redhat.com Gerrit-Reviewer: Gadi Ickowicz gicko...@redhat.com Gerrit-Reviewer: Saggi Mizrahi smizr...@redhat.com Gerrit-Reviewer: Yeela Kaplan ykap...@redhat.com Gerrit-Reviewer: oVirt Jenkins CI Server ___ vdsm-patches mailing list vdsm-patches@lists.fedorahosted.org https://lists.fedorahosted.org/mailman/listinfo/vdsm-patches
Change in vdsm[master]: Fix fix getDomUuidFromVolumePath()
Eduardo has uploaded a new change for review.
Change subject: Fix fix getDomUuidFromVolumePath()
..
Fix fix getDomUuidFromVolumePath()
Change-Id: I648e6a3f4e877c8f2471e82d7064c3e5a021d4d1
Bug-Url: http://bugzilla.redhat.com/1017735
Signed-off-by: Eduardo ewars...@redhat.com
---
M vdsm/storage/fileVolume.py
1 file changed, 5 insertions(+), 12 deletions(-)
git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/83/20783/1
diff --git a/vdsm/storage/fileVolume.py b/vdsm/storage/fileVolume.py
index cf26197..c6f1702 100644
--- a/vdsm/storage/fileVolume.py
+++ b/vdsm/storage/fileVolume.py
@@ -18,13 +18,11 @@
# Refer to the README and COPYING files for full details of the license
#
-from os.path import normpath
import errno
import os
import sanlock
import storage_exception as se
-from vdsm.config import config
from vdsm.utils import ActionStopped, grepCmd
from sdc import sdCache
import outOfProcess as oop
@@ -44,16 +42,11 @@
def getDomUuidFromVolumePath(volPath):
-# Volume path has pattern:
-# /rhev/data-center/spUUID/sdUUID/images/imgUUID/volUUID
-
-# sdUUID position after data-center
-sdUUIDOffset = 1
-
-volList = volPath.split('/')
-sdUUIDPos = len(normpath(config.get('irs', 'repository')).split('/')) + \
-sdUUIDOffset
-return volList[sdUUIDPos]
+# fileVolume path has pattern:
+# */sdUUID/images/imgUUID/volUUID
+sdPath = os.path.normpath(volPath).split('/images')[0]
+target, sdUUID = os.path.split(sdPath)
+return sdUUID
class FileVolume(volume.Volume):
--
To view, visit http://gerrit.ovirt.org/20783
To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I648e6a3f4e877c8f2471e82d7064c3e5a021d4d1
Gerrit-PatchSet: 1
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Eduardo ewars...@redhat.com
___
vdsm-patches mailing list
vdsm-patches@lists.fedorahosted.org
https://lists.fedorahosted.org/mailman/listinfo/vdsm-patches
Change in vdsm[master]: Fix fix getDomUuidFromVolumePath()
oVirt Jenkins CI Server has posted comments on this change. Change subject: Fix fix getDomUuidFromVolumePath() .. Patch Set 1: Build Successful http://jenkins.ovirt.org/job/vdsm_unit_tests_gerrit_el/4368/ : SUCCESS http://jenkins.ovirt.org/job/vdsm_pep8_gerrit/5172/ : SUCCESS http://jenkins.ovirt.org/job/vdsm_unit_tests_gerrit/5248/ : SUCCESS -- To view, visit http://gerrit.ovirt.org/20783 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I648e6a3f4e877c8f2471e82d7064c3e5a021d4d1 Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Eduardo ewars...@redhat.com Gerrit-Reviewer: Ayal Baron aba...@redhat.com Gerrit-Reviewer: Dan Kenigsberg dan...@redhat.com Gerrit-Reviewer: Gadi Ickowicz gicko...@redhat.com Gerrit-Reviewer: Yeela Kaplan ykap...@redhat.com Gerrit-Reviewer: oVirt Jenkins CI Server Gerrit-HasComments: No ___ vdsm-patches mailing list vdsm-patches@lists.fedorahosted.org https://lists.fedorahosted.org/mailman/listinfo/vdsm-patches
Change in vdsm[master]: Fix fix getDomUuidFromVolumePath()
Dan Kenigsberg has posted comments on this change. Change subject: Fix fix getDomUuidFromVolumePath() .. Patch Set 1: What do you think of http://gerrit.ovirt.org/20790 ? -- To view, visit http://gerrit.ovirt.org/20783 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I648e6a3f4e877c8f2471e82d7064c3e5a021d4d1 Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Eduardo ewars...@redhat.com Gerrit-Reviewer: Ayal Baron aba...@redhat.com Gerrit-Reviewer: Dan Kenigsberg dan...@redhat.com Gerrit-Reviewer: Gadi Ickowicz gicko...@redhat.com Gerrit-Reviewer: Saggi Mizrahi smizr...@redhat.com Gerrit-Reviewer: Yeela Kaplan ykap...@redhat.com Gerrit-Reviewer: oVirt Jenkins CI Server Gerrit-HasComments: No ___ vdsm-patches mailing list vdsm-patches@lists.fedorahosted.org https://lists.fedorahosted.org/mailman/listinfo/vdsm-patches
Change in vdsm[master]: Fix fix getDomUuidFromVolumePath()
Eduardo has posted comments on this change. Change subject: Fix fix getDomUuidFromVolumePath() .. Patch Set 1: 20790 was considered and discarded before send this. This is a broken function, for broken by design callers, but this way is more robust, far as we can say robust for this wreck. -- To view, visit http://gerrit.ovirt.org/20783 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I648e6a3f4e877c8f2471e82d7064c3e5a021d4d1 Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Eduardo ewars...@redhat.com Gerrit-Reviewer: Ayal Baron aba...@redhat.com Gerrit-Reviewer: Dan Kenigsberg dan...@redhat.com Gerrit-Reviewer: Eduardo ewars...@redhat.com Gerrit-Reviewer: Gadi Ickowicz gicko...@redhat.com Gerrit-Reviewer: Saggi Mizrahi smizr...@redhat.com Gerrit-Reviewer: Yeela Kaplan ykap...@redhat.com Gerrit-Reviewer: oVirt Jenkins CI Server Gerrit-HasComments: No ___ vdsm-patches mailing list vdsm-patches@lists.fedorahosted.org https://lists.fedorahosted.org/mailman/listinfo/vdsm-patches
Change in vdsm[master]: Fix fix getDomUuidFromVolumePath()
Eduardo has posted comments on this change. Change subject: Fix fix getDomUuidFromVolumePath() .. Patch Set 1: As we already discussed this function and it's callers should be removed, since if you are reaching the volume you already know the SD. -- To view, visit http://gerrit.ovirt.org/20783 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: I648e6a3f4e877c8f2471e82d7064c3e5a021d4d1 Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Eduardo ewars...@redhat.com Gerrit-Reviewer: Ayal Baron aba...@redhat.com Gerrit-Reviewer: Dan Kenigsberg dan...@redhat.com Gerrit-Reviewer: Eduardo ewars...@redhat.com Gerrit-Reviewer: Gadi Ickowicz gicko...@redhat.com Gerrit-Reviewer: Saggi Mizrahi smizr...@redhat.com Gerrit-Reviewer: Yeela Kaplan ykap...@redhat.com Gerrit-Reviewer: oVirt Jenkins CI Server Gerrit-HasComments: No ___ vdsm-patches mailing list vdsm-patches@lists.fedorahosted.org https://lists.fedorahosted.org/mailman/listinfo/vdsm-patches
