Eduardo has uploaded a new change for review. Change subject: Too many True sizes for a False Volume class. ......................................................................
Too many True sizes for a False Volume class. Since an (abstract) volume never will be instantiated alone, get the size of the typed object instead. Removes Volume.getVSize(), Volume.getVTrueSize() and Volume.getVolumeTrueSize(). Reduce the number of SD produces. Related to BZ#960952, BZ#769502. Change-Id: I98c82bf2b48c62626b496fe16e4b83f48c189c10 Signed-off-by: Eduardo <[email protected]> --- M vdsm/storage/hsm.py M vdsm/storage/volume.py 2 files changed, 4 insertions(+), 27 deletions(-) git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/09/17509/1 diff --git a/vdsm/storage/hsm.py b/vdsm/storage/hsm.py index 5da6ae6..404ffc2 100644 --- a/vdsm/storage/hsm.py +++ b/vdsm/storage/hsm.py @@ -3049,10 +3049,10 @@ :rtype: dict """ # Return string because xmlrpc's "int" is very limited - apparentsize = str(volume.Volume.getVSize(sdUUID, imgUUID, - volUUID, bs=1)) - truesize = str(volume.Volume.getVTrueSize(sdUUID, imgUUID, - volUUID, bs=1)) + dom = sdCache.produce(sdUUID=sdUUID) + volClass = dom.getVolumeClass() + apparentsize = str(volClass.getVSize(dom, imgUUID, volUUID, bs=1)) + truesize = str(volClass.getVTrueSize(dom, imgUUID, volUUID, bs=1)) return dict(apparentsize=apparentsize, truesize=truesize) @public diff --git a/vdsm/storage/volume.py b/vdsm/storage/volume.py index 0fa70f4..10b3363 100644 --- a/vdsm/storage/volume.py +++ b/vdsm/storage/volume.py @@ -326,22 +326,6 @@ pass @classmethod - def getVSize(cls, sdUUID, imgUUID, volUUID, bs=BLOCK_SIZE): - """ - Return volume size - """ - mysd = sdCache.produce(sdUUID=sdUUID) - return mysd.getVolumeClass().getVSize(mysd, imgUUID, volUUID, bs) - - @classmethod - def getVTrueSize(cls, sdUUID, imgUUID, volUUID, bs=BLOCK_SIZE): - """ - Return allocated volume size - """ - mysd = sdCache.produce(sdUUID=sdUUID) - return mysd.getVolumeClass().getVTrueSize(mysd, imgUUID, volUUID, bs) - - @classmethod def parentVolumeRollback(cls, taskObj, sdUUID, pimgUUID, pvolUUID): cls.log.info("parentVolumeRollback: sdUUID=%s pimgUUID=%s" " pvolUUID=%s" % (sdUUID, pimgUUID, pvolUUID)) @@ -994,13 +978,6 @@ self.log.error("Volume.setMetaParam: %s: %s=%s" % (self.volUUID, key, value)) raise - - def getVolumeTrueSize(self, bs=BLOCK_SIZE): - """ - Return the size of the storage allocated for this volume - on underlying storage - """ - pass def getVolumeParams(self, bs=BLOCK_SIZE): volParams = {} -- To view, visit http://gerrit.ovirt.org/17509 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I98c82bf2b48c62626b496fe16e4b83f48c189c10 Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Eduardo <[email protected]> _______________________________________________ vdsm-patches mailing list [email protected] https://lists.fedorahosted.org/mailman/listinfo/vdsm-patches
