New subject: Change in vdsm[master]: [WIP] createSD() and createStoragePool() explicit cmd_type_1.

Monday, 4 February 2013

Eduardo has uploaded a new change for review.

Change subject: [WIP] createSD() and createStoragePool() explicit cmd_type_1.
......................................................................

[WIP] createSD() and createStoragePool() explicit cmd_type_1.

TODO:
initSanLockLock
remove[StoragePool, SD, VG] should be type 1?

Change-Id: I1b9d533812718d29a01998934e22954cee650265
Signed-off-by: Eduardo <ewarszaw(a)redhat.com&gt;
---
M vdsm/storage/blockSD.py
M vdsm/storage/hsm.py
2 files changed, 88 insertions(+), 26 deletions(-)


  git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/94/11694/1

diff --git a/vdsm/storage/blockSD.py b/vdsm/storage/blockSD.py
index 6a02f5a..c688826 100644
--- a/vdsm/storage/blockSD.py
+++ b/vdsm/storage/blockSD.py
@@ -479,7 +479,65 @@
             'vgUUID' - volume group UUID
             'storageType' - NFS_DOMAIN, LOCALFS_DOMAIN, &etc.
             'version' - DOMAIN_VERSIONS
+
+            This function intentionally bypasses the lvm cache sets since
+            uses a private configuration.
         """
+        def makeCreateCmd(lvSize, lvName):
+            createCmd = [constants.EXT_LVM, "lvcreate"]
+            createCmd.extend(("--config", cmdConf % filter))
+            createCmd.extend(("--contiguous", "y",
"--size", "%sm" % lvSize))
+            createCmd.extend(("--name", lvName, vgName))
+            return createCmd
+
+        def createSpecialLvs():
+            for size, name in ((metaSize(vgName), sd.METADATA),
+                               (sd.LEASES_SIZE, sd.LEASES),
+                               (sd.IDS_SIZE, sd.IDS),
+                               (sd.INBOX_SIZE, sd.INBOX),
+                               (sd.OUTBOX_SIZE, sd.OUTBOX),
+                               (MASTERLV_SIZE, MASTERLV)
+                               ):
+                rc, out, err = misc.execCmd(makeCreateCmd(size, name),
+                                            sudo=True)
+                if rc != 0:
+                    raise se.CannotCreateLogicalVolume(vgName, name)
+
+        def makeChangeCmd(toRemove, toAdd):
+            changeCmd = [constants.EXT_LVM, "vgchange"]
+            changeCmd.extend(lvm.LVM_NOBACKUP)
+            changeCmd.extend(("--config", cmdConf % filter))
+            for tag in toRemove:
+                changeCmd.extend(("--deltag", tag))
+            for tag in toAdd:
+                changeCmd.extend(("--addtag", tag))
+            changeCmd.append(vgName)
+            return changeCmd
+
+        def setInitialTags(toRemove, toAdd):
+            rc, out, err = misc.execCmd(makeChangeCmd(toRemove, toAdd),
+                                        sudo=True)
+            if rc != 0:
+                raise se.VolumeGroupReplaceTagError("vg:%s del:%s add:%s (%s)"
+                                                    % (vgName,
+                                                    ", ".join(toRemove),
+                                                    ", ".join(toAdd),
+                                                    err[-1]))
+
+        def initClusterLock():
+            lockUtilPath = config.get('irs', 'lock_util_path')
+            lockUtil = os.path.join(lockUtilPath, "safelease")
+            initCommand = [lockUtil, "release", "-f",
lvm.lvPath(vgName,
+                           sd.LEASES), "0"]
+            rc, out, err = misc.execCmd(initCommand, sudo=False,
+                                        cwd=lockUtilPath)
+            if rc != 0:
+                raise se.ClusterLockInitError("could not initialise spm lease"
+                                              "(%s): %s" % (rc, out))
+
+        def initSanLockLock():
+            pass
+
         cls.log.info("sdUUID=%s domainName=%s domClass=%s vgUUID=%s "
                      "storageType=%s version=%s", sdUUID, domainName,
domClass,
                      vgUUID, storageType, version)
@@ -510,9 +568,10 @@
             raise se.StorageDomainIsMadeFromTooManyPVs()
         logBlkSize, phyBlkSize = lvm.checkpvsblksize(pvs)
 
-        # Create metadata service volume
-        metasize = metaSize(vgName)
-        lvm.createLV(vgName, sd.METADATA, "%s" % (metasize))
+        filter = 'filter = [ ' + '"a%' + " ".join(pvs) +
'%", ' + '"r%.*%" ]'
+        cmdConf = lvm.LVMCONF_TEMPLATE.replace("locking_type=4",
+                                               "locking_type=1")
+        createSpecialLvs()
         # Create the mapping right now so the index 0 is guaranteed
         # to belong to the metadata volume. Since the metadata is at
         # least SDMETADATA/METASIZE units, we know we can use the first
@@ -520,16 +579,8 @@
         # pass metadata's dev to ensure it is the first mapping
         mapping = cls.getMetaDataMapping(vgName)
 
-        # Create the rest of the BlockSD internal volumes
-        lvm.createLV(vgName, sd.LEASES, sd.LEASES_SIZE)
-        lvm.createLV(vgName, sd.IDS, sd.IDS_SIZE)
-        lvm.createLV(vgName, sd.INBOX, sd.INBOX_SIZE)
-        lvm.createLV(vgName, sd.OUTBOX, sd.OUTBOX_SIZE)
-        lvm.createLV(vgName, MASTERLV, MASTERLV_SIZE)
-
         # Create VMS file system
         _createVMSfs(os.path.join("/dev", vgName, MASTERLV))
-
         lvm.deactivateLVs(vgName, MASTERLV)
 
         path = lvm.lvPath(vgName, sd.METADATA)
@@ -545,11 +596,6 @@
             raise
         except se.StorageException:
             raise se.VolumesZeroingError(path)
-
-        if version in VERS_METADATA_LV:
-            md = LvBasedSDMetadata(vgName, sd.METADATA)
-        elif version in VERS_METADATA_TAG:
-            md = TagBasedSDMetadata(vgName)
 
         # create domain metadata
         # FIXME : This is 99% like the metadata in file SD
@@ -579,20 +625,35 @@
 
         initialMetadata.update(mapping)
 
-        md.update(initialMetadata)
+        if version in VERS_METADATA_LV:
+            md = LvBasedSDMetadata(vgName, sd.METADATA)
+            md.update(initialMetadata)
+            #Replace unready tag
+            toRemove = (STORAGE_UNREADY_DOMAIN_TAG,)
+            toAdd = (STORAGE_DOMAIN_TAG,)
+        elif version in VERS_METADATA_TAG:
+            md = TagBasedSDMetadata(vgName)
+            #Add all tags here and remove the unready
+            toRemove = tuple(VGTagMetadataRW.METADATA_TAG_PREFIX +
+                             lvmTagEncode(item) for item in initialMetadata)
+            toRemove.append(STORAGE_UNREADY_DOMAIN_TAG)
+            toAdd = tuple(VGTagMetadataRW.METADATA_TAG_PREFIX +
+                          lvmTagEncode(item) for item in initialMetadata)
+            toAdd.append(STORAGE_DOMAIN_TAG)
 
-        # Mark VG with Storage Domain Tag
         try:
-            lvm.replaceVGTag(vgName, STORAGE_UNREADY_DOMAIN_TAG,
-                             STORAGE_DOMAIN_TAG)
-        except se.StorageException:
+            setInitialTags(toRemove, toAdd)
+        except se.VolumeGroupReplaceTagError:
             raise se.VolumeGroupUninitialized(vgName)
 
-        bsd = BlockStorageDomain(sdUUID)
+        if version in sd.DOM_SAFELEASE_VERS:
+            initClusterLock()
+        elif sd.DOM_SANLOCK_VERS:
+            initSanLockLock()
+        else:
+            cls.log.warning("Lock method for version %s unknown", version)
 
-        bsd.initSPMlease()
-
-        return bsd
+        return None
 
     def getReadDelay(self):
         t = time.time()
diff --git a/vdsm/storage/hsm.py b/vdsm/storage/hsm.py
index 7b03064..640e7bd 100644
--- a/vdsm/storage/hsm.py
+++ b/vdsm/storage/hsm.py
@@ -2445,7 +2445,8 @@
                 domVersion)
         else:
             raise se.StorageDomainTypeError(storageType)
-        sdCache.manuallyAddDomain(newSD)
+        if newSD:
+            sdCache.manuallyAddDomain(newSD)
 
     @public
     def validateStorageDomain(self, sdUUID, options=None):


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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I1b9d533812718d29a01998934e22954cee650265
Gerrit-PatchSet: 1
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Eduardo <ewarszaw(a)redhat.com&gt;

    

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

Change in vdsm[master]: [WIP] createSD() and createStoragePool() explicit cmd_type_1...