Adam Litke has uploaded a new change for review. Change subject: StorageDomainManifest: move getLeasesFilePath ......................................................................
StorageDomainManifest: move getLeasesFilePath getLeasesFilePath is needed by VolumeMetadata to implement the newVolumeLease function on block storage. Move it into the Manifest class which can be safely instantiated. Change-Id: I2bb49591357e0ae77268789da78e8504864a8057 Signed-off-by: Adam Litke <[email protected]> --- M vdsm/storage/blockSD.py M vdsm/storage/sd.py 2 files changed, 14 insertions(+), 8 deletions(-) git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/95/41995/1 diff --git a/vdsm/storage/blockSD.py b/vdsm/storage/blockSD.py index 362ee28..7ccb7e5 100644 --- a/vdsm/storage/blockSD.py +++ b/vdsm/storage/blockSD.py @@ -419,6 +419,10 @@ return int(size) + def getLeasesFilePath(self): + lvm.activateLVs(self.sdUUID, [sd.LEASES]) + return lvm.lvPath(self.sdUUID, sd.LEASES) + class BlockStorageDomain(sd.StorageDomain): ManifestClass = BlockStorageDomainManifest @@ -817,10 +821,6 @@ def getIdsFilePath(self): lvm.activateLVs(self.sdUUID, [sd.IDS]) return lvm.lvPath(self.sdUUID, sd.IDS) - - def getLeasesFilePath(self): - lvm.activateLVs(self.sdUUID, [sd.LEASES]) - return lvm.lvPath(self.sdUUID, sd.LEASES) def getLeasesFileSize(self): lv = lvm.getLV(self.sdUUID, sd.LEASES) diff --git a/vdsm/storage/sd.py b/vdsm/storage/sd.py index ab86987..fd4cecf 100644 --- a/vdsm/storage/sd.py +++ b/vdsm/storage/sd.py @@ -299,6 +299,14 @@ self.domaindir = domaindir self._metadata = metadata + def getMDPath(self): + if self.domaindir: + return os.path.join(self.domaindir, DOMAIN_META_DATA) + return None + + def getLeasesFilePath(self): + return os.path.join(self.getMDPath(), LEASES) + class StorageDomain(object): log = logging.getLogger("Storage.StorageDomain") @@ -459,9 +467,7 @@ preallocate, diskType, volUUID, desc, srcImgUUID, srcVolUUID) def getMDPath(self): - if self.domaindir: - return os.path.join(self.domaindir, DOMAIN_META_DATA) - return None + return self.manifest.getMDPath() def initSPMlease(self): """ @@ -497,7 +503,7 @@ return os.path.join(self.getMDPath(), IDS) def getLeasesFilePath(self): - return os.path.join(self.getMDPath(), LEASES) + return self.manifest.getLeasesFilePath() def getReservedId(self): return self._clusterLock.getReservedId() -- To view, visit https://gerrit.ovirt.org/41995 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I2bb49591357e0ae77268789da78e8504864a8057 Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Adam Litke <[email protected]> _______________________________________________ vdsm-patches mailing list [email protected] https://lists.fedorahosted.org/mailman/listinfo/vdsm-patches
