Yeela Kaplan has uploaded a new change for review. Change subject: [WIP] Create storage domain using command type 1 ......................................................................
[WIP] Create storage domain using command type 1 All bootstrap operaions are executed using command type 1. Change-Id: I127af299086ec5572d29686451d4892c9ff0330d Signed-off-by: Yeela Kaplan <[email protected]> --- M vdsm/storage/blockSD.py M vdsm/storage/lvm.py 2 files changed, 15 insertions(+), 14 deletions(-) git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/46/23646/1 diff --git a/vdsm/storage/blockSD.py b/vdsm/storage/blockSD.py index 55bd796..7980c80 100644 --- a/vdsm/storage/blockSD.py +++ b/vdsm/storage/blockSD.py @@ -517,7 +517,7 @@ # Create metadata service volume metasize = cls.metaSize(vgName) - lvm.createLV(vgName, sd.METADATA, "%s" % (metasize)) + lvm.createLV(vgName, sd.METADATA, "%s" % (metasize), safe=False) # 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 @@ -526,11 +526,11 @@ 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) + lvm.createLV(vgName, sd.LEASES, sd.LEASES_SIZE, safe=False) + lvm.createLV(vgName, sd.IDS, sd.IDS_SIZE, safe=False) + lvm.createLV(vgName, sd.INBOX, sd.INBOX_SIZE, safe=False) + lvm.createLV(vgName, sd.OUTBOX, sd.OUTBOX_SIZE, safe=False) + lvm.createLV(vgName, MASTERLV, MASTERLV_SIZE, safe=False) # Create VMS file system _createVMSfs(os.path.join("/dev", vgName, MASTERLV)) @@ -591,7 +591,7 @@ # Mark VG with Storage Domain Tag try: lvm.replaceVGTag(vgName, STORAGE_UNREADY_DOMAIN_TAG, - STORAGE_DOMAIN_TAG) + STORAGE_DOMAIN_TAG, safe=False) except se.StorageException: raise se.VolumeGroupUninitialized(vgName) diff --git a/vdsm/storage/lvm.py b/vdsm/storage/lvm.py index 932d69e..0f96df6 100644 --- a/vdsm/storage/lvm.py +++ b/vdsm/storage/lvm.py @@ -257,7 +257,7 @@ return self._extraCfg - def _addExtraCfg(self, cmd, devices=tuple(), safe): + def _addExtraCfg(self, cmd, devices=tuple(), safe=True): newcmd = [constants.EXT_LVM, cmd[0]] if devices: conf = _buildConfig(devices) @@ -656,6 +656,7 @@ globals()["_current_lvmconf"] = _current_lvmconf.replace("locking_type=4", "locking_type=1") log.debug("### _current_lvmconf %s", globals()["_current_lvmconf"]) + def bootstrap(refreshlvs=()): """ @@ -1061,7 +1062,7 @@ def createLV(vgName, lvName, size, activate=True, contiguous=False, - initialTag=None): + initialTag=None, safe=True): """ Size units: MB (1024 ** 2 = 2 ** 20)B. """ @@ -1078,7 +1079,7 @@ if initialTag is not None: cmd.extend(("--addtag", initialTag)) cmd.extend(("--name", lvName, vgName)) - rc, out, err = _lvminfo.cmd(cmd, _lvminfo._getVGDevs((vgName, ))) + rc, out, err = _lvminfo.cmd(cmd, _lvminfo._getVGDevs((vgName, )), safe) if rc == 0: _lvminfo._invalidatevgs(vgName) @@ -1280,7 +1281,7 @@ return os.path.exists(lvPath(vgName, lvName)) -def changeVGTags(vgName, delTags=(), addTags=()): +def changeVGTags(vgName, delTags=(), addTags=(), safe=True): delTags = set(delTags) addTags = set(addTags) if delTags.intersection(addTags): @@ -1296,7 +1297,7 @@ cmd.extend(("--addtag", tag)) cmd.append(vgName) - rc, out, err = _lvminfo.cmd(cmd, _lvminfo._getVGDevs((vgName, ))) + rc, out, err = _lvminfo.cmd(cmd, _lvminfo._getVGDevs((vgName, )), safe) _lvminfo._invalidatevgs(vgName) if rc != 0: raise se.VolumeGroupReplaceTagError( @@ -1321,8 +1322,8 @@ raise se.VolumeGroupRemoveTagError(vgName) -def replaceVGTag(vg, oldTag, newTag): - changeVGTags(vg, [oldTag], [newTag]) +def replaceVGTag(vg, oldTag, newTag, safe=True): + changeVGTags(vg, [oldTag], [newTag], safe) def addVGTags(vgName, tags): -- To view, visit http://gerrit.ovirt.org/23646 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I127af299086ec5572d29686451d4892c9ff0330d Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Yeela Kaplan <[email protected]> _______________________________________________ vdsm-patches mailing list [email protected] https://lists.fedorahosted.org/mailman/listinfo/vdsm-patches
