Change in vdsm[master]: StorageDomainManifest: move logBlkSize
alitke at redhat.com
alitke at redhat.com
Fri Jun 5 20:57:11 UTC 2015
Adam Litke has uploaded a new change for review.
Change subject: StorageDomainManifest: move logBlkSize
......................................................................
StorageDomainManifest: move logBlkSize
logBlkSize is also needed by the VolumeMetadata newVolumeLease function.
Move it into the manifest class which is safe for VolumeMetadata to
instantiate.
Change-Id: I1b9b20e9c8c20fa5c151f7c86337bc54ab526e11
Signed-off-by: Adam Litke <alitke at redhat.com>
---
M vdsm/storage/blockSD.py
M vdsm/storage/sd.py
2 files changed, 23 insertions(+), 12 deletions(-)
git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/96/41996/1
diff --git a/vdsm/storage/blockSD.py b/vdsm/storage/blockSD.py
index 7ccb7e5..c67822f 100644
--- a/vdsm/storage/blockSD.py
+++ b/vdsm/storage/blockSD.py
@@ -404,6 +404,17 @@
metadata = selectMetadata(sdUUID)
sd.StorageDomainManifest.__init__(self, sdUUID, domaindir, metadata)
+ try:
+ self.logBlkSize = self.getMetaParam(DMDK_LOGBLKSIZE)
+ self.phyBlkSize = self.getMetaParam(DMDK_PHYBLKSIZE)
+ except KeyError:
+ # 512 by Saggi "Trust me (Smoch Alai (sic))"
+ # *blkSize keys may be missing from metadata only for domains that
+ # existed before the introduction of the keys.
+ # Such domains supported only 512 sizes
+ self.logBlkSize = 512
+ self.phyBlkSize = 512
+
def getVSize(self, imgUUUID, volUUID):
""" Return the block volume size in bytes. """
try:
@@ -433,17 +444,6 @@
lvm.activateLVs(self.sdUUID, SPECIAL_LVS)
self.metavol = lvm.lvPath(self.sdUUID, sd.METADATA)
- try:
- self.logBlkSize = self.getMetaParam(DMDK_LOGBLKSIZE)
- self.phyBlkSize = self.getMetaParam(DMDK_PHYBLKSIZE)
- except KeyError:
- # 512 by Saggi "Trust me (Smoch Alai (sic))"
- # *blkSize keys may be missing from metadata only for domains that
- # existed before the introduction of the keys.
- # Such domains supported only 512 sizes
- self.logBlkSize = 512
- self.phyBlkSize = 512
-
# Check that all devices in the VG have the same logical and physical
# block sizes.
lvm.checkVGBlockSizes(sdUUID, (self.logBlkSize, self.phyBlkSize))
@@ -455,6 +455,14 @@
self._registerResourceNamespaces()
self._lastUncachedSelftest = 0
+ @property
+ def logBlkSize(self):
+ return self.manifest.logBlkSize
+
+ @property
+ def phyBlkSize(self):
+ return self.manifest.phyBlkSize
+
def _registerResourceNamespaces(self):
"""
Register resources namespaces and create
diff --git a/vdsm/storage/sd.py b/vdsm/storage/sd.py
index fd4cecf..da454ef 100644
--- a/vdsm/storage/sd.py
+++ b/vdsm/storage/sd.py
@@ -307,6 +307,9 @@
def getLeasesFilePath(self):
return os.path.join(self.getMDPath(), LEASES)
+ def getMetaParam(self, key):
+ return self._metadata[key]
+
class StorageDomain(object):
log = logging.getLogger("Storage.StorageDomain")
@@ -782,7 +785,7 @@
self._metadata.invalidate()
def getMetaParam(self, key):
- return self._metadata[key]
+ return self.manifest.getMetaParam(key)
def getStorageType(self):
return self.getMetaParam(DMDK_TYPE)
--
To view, visit https://gerrit.ovirt.org/41996
To unsubscribe, visit https://gerrit.ovirt.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I1b9b20e9c8c20fa5c151f7c86337bc54ab526e11
Gerrit-PatchSet: 1
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Adam Litke <alitke at redhat.com>
More information about the vdsm-patches
mailing list