Change in vdsm[master]: getAllVolumes returns partially deleted volumes too.

Change in vdsm[master]:...

Change in vdsm[master]: Marking...

ewarszaw＠redhat.com

Thursday, 28 February 2013 Thu, 28 Feb '13

2:04 p.m.

Eduardo has uploaded a new change for review. Change subject: getAllVolumes returns partially deleted volumes too. ...................................................................... getAllVolumes returns partially deleted volumes too. getAllVolumesImages differentiates between legal and remnants. Added getAllRemnants for garbage detection. Related to: BZ#905938, BZ#910013, BZ#875708 Change-Id: Ib8514236a5d4793f66709e9daf546fb46047414f Signed-off-by: Eduardo <ewarszaw(a)redhat.com> --- M vdsm/storage/blockSD.py 1 file changed, 33 insertions(+), 10 deletions(-) git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/46/12546/1 diff --git a/vdsm/storage/blockSD.py b/vdsm/storage/blockSD.py index 35282e5..4a00cec 100644 --- a/vdsm/storage/blockSD.py +++ b/vdsm/storage/blockSD.py @@ -171,11 +171,15 @@ res[volName]['parent'] = parentVol if vImg not in res[volName]['imgs']: res[volName]['imgs'].insert(0, vImg) - if (parentVol != sd.BLANK_UUID and - not volName.startswith( - sd.REMOVED_IMAGE_PREFIX) and - vImg not in res[parentVol]['imgs']): - res[parentVol]['imgs'].append(vImg) + if parentVol != sd.BLANK_UUID: + try: + newImg = vImg not in res[parentVol]['imgs'] + except KeyError: + log.warning("Orphan volume %s/%s: img: %s, parent %s", + sdUUID, volName, vImg, parentVol) + else: + if newImg: + res[parentVol]['imgs'].append(vImg) return dict((k, sd.ImgsPar(tuple(v['imgs']), v['parent'])) for k, v in res.iteritems()) @@ -1003,15 +1007,34 @@ zeroImgVolumes(sdUUID, imgUUID, toZero) self.rmDCImgDir(imgUUID, volsImgs) - def getAllVolumes(self): + def getAllVolumesImages(self): """ Return all the images that depend on a volume. - TODO: rename to getAllVolumeImages. - - Return dict {volUUID: ([imgUUID1, imgUUID2], parentUUID)]}. + Return dicts: + vols = {volUUID: ([imgUUID1, imgUUID2], parentUUID)]} + for complete images. + remnants (same) for broken imgs, orphan volumes, etc. """ - return getAllVolumes(self.sdUUID) + vols = {} # The "legal" volumes: not half deleted/removed volumes. + remnants = {} # vols belongs to a partially deleted imgs + allVols = getAllVolumes(self.sdUUID) + for volName, ip in allVols.iteritems(): + images, parent = ip + if (volName.startswith(sd.REMOVED_IMAGE_PREFIX) or + ip.imgs[0].startswith(sd.REMOVED_IMAGE_PREFIX)): + remnants[volName] = ip + else: + vols[volName] = ip + return vols, remnants + + def getAllVolumes(self): + vols, rems = self.getAllVolumesImages() + return vols + + def getAllRemnants(self): + vols, rems = self.getAllVolumesImages() + return rems def activateVolumes(self, volUUIDs): """ -- To view, visit http://gerrit.ovirt.org/12546 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ib8514236a5d4793f66709e9daf546fb46047414f Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Eduardo <ewarszaw(a)redhat.com>

Show replies by date

ewarszaw＠redhat.com

Thursday, 28 February Thu, 28 Feb

2:10 p.m.

Eduardo has posted comments on this change. Change subject: getAllVolumes returns partially deleted volumes too. ...................................................................... Patch Set 1: Still dubious if we really want this change. -- To view, visit http://gerrit.ovirt.org/12546 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: Ib8514236a5d4793f66709e9daf546fb46047414f Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Eduardo <ewarszaw(a)redhat.com> Gerrit-Reviewer: Eduardo <ewarszaw(a)redhat.com> Gerrit-Reviewer: oVirt Jenkins CI Server

ewarszaw＠redhat.com

Thursday, 14 March Thu, 14 Mar

5:57 a.m.

Eduardo has posted comments on this change. Change subject: getAllVolumes returns partially deleted volumes too. ...................................................................... Patch Set 3: (3 inline comments) .................................................... File vdsm/storage/blockSD.py Line 175: try: Line 176: imgIsUnknown = vImg not in res[parentVol]['imgs'] Line 177: except KeyError: Line 178: log.warning("Found broken img %s, orphan volume %s/%s, " Line 179: "parent %s", vImg, sdUUID, volName, parentVol) My free interpretation of Ayal's previous comment. Please suggest. Line 180: else: Line 181: if imgIsUnknown: Line 182: res[parentVol]['imgs'].append(vImg) Line 183: Line 1006: self.__markForDelVols(sdUUID, imgUUID, toZero, sd.ZEROED_IMAGE_PREFIX) Line 1007: zeroImgVolumes(sdUUID, imgUUID, toZero) Line 1008: self.rmDCImgDir(imgUUID, volsImgs) Line 1009: Line 1010: def getAllVolumesImages(self): You understand absolutely right. Can be private. Since I dislike private methods, in python nothing is really private, I don't want to specify a user policy here and this can easily changed I prefer this way, but should be by consensus. In addition leaving this public is the function that Ayal wants and using the getAllVolumes/remnants interfaces is like the old interface and everybody will be happy. ;) Line 1011: """ Line 1012: Return all the images that depend on a volume. Line 1013: Line 1014: Return dicts: Line 1019: vols = {} # The "legal" volumes: not half deleted/removed volumes. Line 1020: remnants = {} # Volumes which are part of failed image deletes. Line 1021: allVols = getAllVolumes(self.sdUUID) Line 1022: for volName, ip in allVols.iteritems(): Line 1023: images, parent = ip Done Line 1024: if (volName.startswith(sd.REMOVED_IMAGE_PREFIX) or Line 1025: ip.imgs[0].startswith(sd.REMOVED_IMAGE_PREFIX)): Line 1026: remnants[volName] = ip Line 1027: else: -- To view, visit http://gerrit.ovirt.org/12546 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: comment Gerrit-Change-Id: Ib8514236a5d4793f66709e9daf546fb46047414f Gerrit-PatchSet: 3 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Eduardo <ewarszaw(a)redhat.com> Gerrit-Reviewer: Ayal Baron <abaron(a)redhat.com> Gerrit-Reviewer: Daniel Paikov <paikov(a)gmail.com> Gerrit-Reviewer: Eduardo <ewarszaw(a)redhat.com> Gerrit-Reviewer: Gadi Ickowicz <gickowic(a)redhat.com> Gerrit-Reviewer: Haim Ateya <hateya(a)redhat.com> Gerrit-Reviewer: Yeela Kaplan <ykaplan(a)redhat.com> Gerrit-Reviewer: oVirt Jenkins CI Server