Change in vdsm[master]: blockSD: rename mapMetaOffset to getVolumeMetadataSlot

Federico Simoncelli fsimonce at redhat.com
Mon Mar 31 15:52:52 UTC 2014


Federico Simoncelli has uploaded a new change for review.

Change subject: blockSD: rename mapMetaOffset to getVolumeMetadataSlot
......................................................................

blockSD: rename mapMetaOffset to getVolumeMetadataSlot

The name of the BlockStorageDomain method mapMetaOffset was not
descriptive enough. The purpose of the method was to return the
metadata slot of a volume, therefore it has been renamed.

Change-Id: I37acb5475eeb8d7b80e8202ec53b5303d63722ae
Signed-off-by: Federico Simoncelli <fsimonce at redhat.com>
---
M vdsm/storage/blockSD.py
M vdsm/storage/blockVolume.py
M vdsm/storage/imageRepository/formatConverter.py
3 files changed, 8 insertions(+), 8 deletions(-)


  git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/65/26265/1

diff --git a/vdsm/storage/blockSD.py b/vdsm/storage/blockSD.py
index cac59fa..6c4e438 100644
--- a/vdsm/storage/blockSD.py
+++ b/vdsm/storage/blockSD.py
@@ -732,7 +732,7 @@
             newsize = self.metaSize(self.sdUUID)
             lvm.extendLV(self.sdUUID, sd.METADATA, newsize)
 
-    def mapMetaOffset(self, vol_name, slotSize):
+    def getVolumeMetadataSlot(self, vol_name, slotSize):
         if self.getVersion() in VERS_METADATA_LV:
             return self.getVolumeMetadataOffsetFromPvMapping(vol_name)
         else:
diff --git a/vdsm/storage/blockVolume.py b/vdsm/storage/blockVolume.py
index 36bfa1f..ac03797 100644
--- a/vdsm/storage/blockVolume.py
+++ b/vdsm/storage/blockVolume.py
@@ -170,7 +170,7 @@
             volParent.clone(imgPath, volUUID, volFormat, preallocate)
 
         with cls._tagCreateLock:
-            mdSlot = dom.mapMetaOffset(volUUID, VOLUME_MDNUMBLKS)
+            mdSlot = dom.getVolumeMetadataSlot(volUUID, VOLUME_MDNUMBLKS)
             mdTags = ["%s%s" % (TAG_PREFIX_MD, mdSlot),
                       "%s%s" % (TAG_PREFIX_PARENT, srcVolUUID),
                       "%s%s" % (TAG_PREFIX_IMAGE, imgUUID)]
diff --git a/vdsm/storage/imageRepository/formatConverter.py b/vdsm/storage/imageRepository/formatConverter.py
index c701163..78aaa2e 100644
--- a/vdsm/storage/imageRepository/formatConverter.py
+++ b/vdsm/storage/imageRepository/formatConverter.py
@@ -181,19 +181,19 @@
             metaContent = vol.getMetadata()
 
             with vol._tagCreateLock:
-                newMetaOffset = domain.mapMetaOffset(
+                newMetaSlot = domain.getVolumeMetadataSlot(
                     vol.volUUID, blockVolume.VOLUME_MDNUMBLKS)
-                if newMetaOffset > metaMaxSlot:
+                if newMetaSlot > metaMaxSlot:
                     raise se.NoSpaceLeftOnDomain(domain.sdUUID)
 
                 log.debug("Copying metadata for volume %s to the new slot %s",
-                          vol.volUUID, newMetaOffset)
-                vol.createMetadata((domain.sdUUID, newMetaOffset), metaContent)
+                          vol.volUUID, newMetaSlot)
+                vol.createMetadata((domain.sdUUID, newMetaSlot), metaContent)
 
                 log.debug("Switching the metadata slot for volume %s to %s",
-                          vol.volUUID, newMetaOffset)
+                          vol.volUUID, newMetaSlot)
                 vol.changeVolumeTag(blockVolume.TAG_PREFIX_MD,
-                                    str(newMetaOffset))
+                                    str(newMetaSlot))
 
     try:
         if isMsd:


-- 
To view, visit http://gerrit.ovirt.org/26265
To unsubscribe, visit http://gerrit.ovirt.org/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I37acb5475eeb8d7b80e8202ec53b5303d63722ae
Gerrit-PatchSet: 1
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Federico Simoncelli <fsimonce at redhat.com>


More information about the vdsm-patches mailing list