vdsm-patches October 2016

vdsm-patches@lists.fedorahosted.org

33 participants
468 discussions

Change in vdsm[master]: sp: Remove vol_extend_policy option
by Nir Soffer 10 Oct '16

10 Oct '16

Nir Soffer has uploaded a new change for review. Change subject: sp: Remove vol_extend_policy option ...................................................................... sp: Remove vol_extend_policy option We had a vol_extend_policy option disabling the mailbox. This option is not useful for anything but causing vms using thin block disks to pause without a way to recover. This option was added in commit 73adfc489e6e (Add spmProtect, release lock and toggle lock functionality. Add toggle lvextend functionality) in 2009. I did not find why this option was added. Change-Id: Ib067c09a985a633a452c476e21d8c2c073e6ca50 Signed-off-by: Nir Soffer <nsoffer(a)redhat.com> --- M lib/vdsm/config.py.in M vdsm/storage/sp.py 2 files changed, 2 insertions(+), 8 deletions(-) git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/53/65053/1 diff --git a/lib/vdsm/config.py.in b/lib/vdsm/config.py.in index 94640b2..55ce6f3 100644 --- a/lib/vdsm/config.py.in +++ b/lib/vdsm/config.py.in @@ -329,8 +329,6 @@ 'NFS mount options, comma-separated list (NB: no white space ' 'allowed!)'), - ('vol_extend_policy', 'ON', None), - ('lock_util_path', '@LIBEXECDIR@', None), ('lock_cmd', 'spmprotect.sh', None), diff --git a/vdsm/storage/sp.py b/vdsm/storage/sp.py index 8f98205..febd444 100644 --- a/vdsm/storage/sp.py +++ b/vdsm/storage/sp.py @@ -68,7 +68,6 @@ log = logging.getLogger('storage.StoragePool') storage_repository = config.get('irs', 'repository') - lvExtendPolicy = config.get('irs', 'vol_extend_policy') def __init__(self, spUUID, domainMonitor, taskManager): self._secured = threading.Event() @@ -315,9 +314,7 @@ # commands are allowed to run to prevent a race between the # mailbox and the "self._setSecure() call" - # FIXME : Use a system wide grouping mechanism - if (self.lvExtendPolicy == "ON" and - self.masterDomain.supportsMailbox): + if self.masterDomain.supportsMailbox: self.masterDomain.prepareMailbox() self.spmMailer = storage_mailbox.SPM_MailMonitor(self, maxHostID) @@ -450,8 +447,7 @@ if self.hsmMailer: return - if (self.lvExtendPolicy == "ON" and - self.masterDomain.supportsMailbox): + if self.masterDomain.supportsMailbox: self.hsmMailer = storage_mailbox.HSM_Mailbox(self.id, self.spUUID) self.log.debug("HSM mailbox ready for pool %s on master " "domain %s", self.spUUID, self.masterDomain.sdUUID) -- To view, visit https://gerrit.ovirt.org/65053 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ib067c09a985a633a452c476e21d8c2c073e6ca50 Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Nir Soffer <nsoffer(a)redhat.com>

4 17

Change in vdsm[master]: sp: Sort dict literal by key
by Nir Soffer 10 Oct '16

10 Oct '16

Nir Soffer has uploaded a new change for review. Change subject: sp: Sort dict literal by key ...................................................................... sp: Sort dict literal by key With more then few items, it is easier to work with sorted items, and people are less likely to add duplicate keys at the end, as see in commit f9cf58b7bced. Change-Id: I128ed804fcdbdf7b6b562f5cef662ae2ba2c9014 Signed-off-by: Nir Soffer <nsoffer(a)redhat.com> --- M vdsm/storage/sp.py 1 file changed, 6 insertions(+), 6 deletions(-) git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/52/65052/1 diff --git a/vdsm/storage/sp.py b/vdsm/storage/sp.py index dbc89c9..8f98205 100644 --- a/vdsm/storage/sp.py +++ b/vdsm/storage/sp.py @@ -1360,16 +1360,16 @@ self.masterDomain.sdUUID) poolInfo = { - 'type': msdInfo['type'], - 'name': '', 'domains': '', + 'isoprefix': '', + 'lver': LVER_INVALID, 'master_uuid': self.masterDomain.sdUUID, 'master_ver': self._backend.getMasterVersion(), - 'lver': LVER_INVALID, - 'spm_id': SPM_ID_FREE, - 'version': str(msdInfo['version']), - 'isoprefix': '', + 'name': '', 'pool_status': 'connected', + 'spm_id': SPM_ID_FREE, + 'type': msdInfo['type'], + 'version': str(msdInfo['version']), } poolInfo.update(self._backend.getInfo()) -- To view, visit https://gerrit.ovirt.org/65052 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I128ed804fcdbdf7b6b562f5cef662ae2ba2c9014 Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Nir Soffer <nsoffer(a)redhat.com>

5 17

Change in vdsm[master]: sp: Remove double dict key
by Nir Soffer 10 Oct '16

10 Oct '16

Nir Soffer has uploaded a new change for review. Change subject: sp: Remove double dict key ...................................................................... sp: Remove double dict key Commit f9cf58b7bced (Make getRepoStats() a hsm method) added a second "pool_status" key in the same dictionary. Turns out that this is well defined, and the second key overrides the first one. Remove the old unused key. For more info see: https://docs.python.org/2/reference/expressions.html#dictionary-displays Change-Id: I05f6aeda1858e85b8660d972593e82bcb7e3bff3 Signed-off-by: Nir Soffer <nsoffer(a)redhat.com> --- M vdsm/storage/sp.py 1 file changed, 0 insertions(+), 1 deletion(-) git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/51/65051/1 diff --git a/vdsm/storage/sp.py b/vdsm/storage/sp.py index dabe892..dbc89c9 100644 --- a/vdsm/storage/sp.py +++ b/vdsm/storage/sp.py @@ -1367,7 +1367,6 @@ 'master_ver': self._backend.getMasterVersion(), 'lver': LVER_INVALID, 'spm_id': SPM_ID_FREE, - 'pool_status': 'uninitialized', 'version': str(msdInfo['version']), 'isoprefix': '', 'pool_status': 'connected', -- To view, visit https://gerrit.ovirt.org/65051 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I05f6aeda1858e85b8660d972593e82bcb7e3bff3 Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Nir Soffer <nsoffer(a)redhat.com>

5 17

Change in vdsm[master]: sp: pep8 1.6.2 fix
by Nir Soffer 10 Oct '16

10 Oct '16

Nir Soffer has uploaded a new change for review. Change subject: sp: pep8 1.6.2 fix ...................................................................... sp: pep8 1.6.2 fix Both pep8 tool and me do not like line breaks before binary operators. Change-Id: Ic8e561da219c31aa26d32dcb615eacf223050f5c Signed-off-by: Nir Soffer <nsoffer(a)redhat.com> --- M vdsm/storage/sp.py 1 file changed, 2 insertions(+), 2 deletions(-) git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/50/65050/1 diff --git a/vdsm/storage/sp.py b/vdsm/storage/sp.py index b4b1731..dabe892 100644 --- a/vdsm/storage/sp.py +++ b/vdsm/storage/sp.py @@ -316,8 +316,8 @@ # mailbox and the "self._setSecure() call" # FIXME : Use a system wide grouping mechanism - if (self.lvExtendPolicy == "ON" - and self.masterDomain.supportsMailbox): + if (self.lvExtendPolicy == "ON" and + self.masterDomain.supportsMailbox): self.masterDomain.prepareMailbox() self.spmMailer = storage_mailbox.SPM_MailMonitor(self, maxHostID) -- To view, visit https://gerrit.ovirt.org/65050 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ic8e561da219c31aa26d32dcb615eacf223050f5c Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Nir Soffer <nsoffer(a)redhat.com>

4 14

Change in vdsm[master]: sp: Streamline usage of image.Image class
by Nir Soffer 10 Oct '16

10 Oct '16

Nir Soffer has uploaded a new change for review. Change subject: sp: Streamline usage of image.Image class ...................................................................... sp: Streamline usage of image.Image class We used to create an image.Image an call a method in one line, making the code hard to read for no benefit. Separate creation of the image from the call. Change-Id: Icc9de180542cd81a6d563d52b4b30b9520046469 Signed-off-by: Nir Soffer <nsoffer(a)redhat.com> --- M vdsm/storage/sp.py 1 file changed, 16 insertions(+), 14 deletions(-) git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/49/65049/1 diff --git a/vdsm/storage/sp.py b/vdsm/storage/sp.py index 3297588..b317e7f 100644 --- a/vdsm/storage/sp.py +++ b/vdsm/storage/sp.py @@ -1528,7 +1528,8 @@ with nested(rm.acquireResource(src_img_ns, srcImgUUID, rm.SHARED), rm.acquireResource(dst_img_ns, dstImgUUID, rm.EXCLUSIVE) ): - dstUUID = image.Image(self.poolPath).copyCollapsed( + img = image.Image(self.poolPath) + dstUUID = img.copyCollapsed( sdUUID, vmUUID, srcImgUUID, srcVolUUID, dstImgUUID, dstVolUUID, descr, dstSdUUID, volType, volFormat, preallocate, postZero, force) @@ -1571,8 +1572,9 @@ with nested(rm.acquireResource(src_img_ns, imgUUID, srcLock), rm.acquireResource(dst_img_ns, imgUUID, rm.EXCLUSIVE)): - image.Image(self.poolPath).move(srcDomUUID, dstDomUUID, imgUUID, - vmUUID, op, postZero, force) + img = image.Image(self.poolPath) + img.move(srcDomUUID, dstDomUUID, imgUUID, vmUUID, op, postZero, + force) def sparsifyImage(self, tmpSdUUID, tmpImgUUID, tmpVolUUID, dstSdUUID, dstImgUUID, dstVolUUID): @@ -1610,9 +1612,9 @@ with nested( rm.acquireResource(srcNamespace, tmpImgUUID, rm.EXCLUSIVE), rm.acquireResource(dstNamespace, dstImgUUID, rm.EXCLUSIVE)): - image.Image(self.poolPath).sparsify( - tmpSdUUID, tmpImgUUID, tmpVolUUID, dstSdUUID, dstImgUUID, - dstVolUUID) + img = image.Image(self.poolPath) + img.sparsify(tmpSdUUID, tmpImgUUID, tmpVolUUID, dstSdUUID, + dstImgUUID, dstVolUUID) def cloneImageStructure(self, sdUUID, imgUUID, dstSdUUID): """ @@ -1638,8 +1640,8 @@ ))) with nested(*resList): - image.Image(self.poolPath).cloneStructure( - sdUUID, imgUUID, dstSdUUID) + img = image.Image(self.poolPath) + img.cloneStructure( sdUUID, imgUUID, dstSdUUID) def syncImageData(self, sdUUID, imgUUID, dstSdUUID, syncType): """ @@ -1666,8 +1668,8 @@ ))) with nested(*resList): - image.Image(self.poolPath).syncData( - sdUUID, imgUUID, dstSdUUID, syncType) + img = image.Image(self.poolPath) + img.syncData(sdUUID, imgUUID, dstSdUUID, syncType) def uploadImage(self, methodArgs, sdUUID, imgUUID, volUUID=None): """ @@ -1752,8 +1754,8 @@ dst_img_ns, imgUUID, rm.EXCLUSIVE)) with nested(*resourceList): - image.Image(self.poolPath).multiMove( - srcDomUUID, dstDomUUID, imgDict, vmUUID, force) + img = image.Image(self.poolPath) + img.multiMove( srcDomUUID, dstDomUUID, imgDict, vmUUID, force) def reconcileVolumeChain(self, sdUUID, imgUUID, leafVolUUID): """ @@ -1798,8 +1800,8 @@ img_ns = sd.getNamespace(sc.IMAGE_NAMESPACE, sdUUID) with rm.acquireResource(img_ns, imgUUID, rm.EXCLUSIVE): - image.Image(self.poolPath).merge( - sdUUID, vmUUID, imgUUID, ancestor, successor, postZero) + img = image.Image(self.poolPath) + img.merge(sdUUID, vmUUID, imgUUID, ancestor, successor, postZero) def createVolume(self, sdUUID, imgUUID, size, volFormat, preallocate, diskType, volUUID=None, desc="", -- To view, visit https://gerrit.ovirt.org/65049 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Icc9de180542cd81a6d563d52b4b30b9520046469 Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Nir Soffer <nsoffer(a)redhat.com>

4 16

Change in vdsm[master]: sp: Fix positinal args calling convention
by Nir Soffer 10 Oct '16

10 Oct '16

Nir Soffer has uploaded a new change for review. Change subject: sp: Fix positinal args calling convention ...................................................................... sp: Fix positinal args calling convention StorageDomain.setDescription and Volume.setLegality accept one positional argument. Using kwarg calling style is pointless. Change-Id: I2d73df3daa59efb512bfdc9f6e400bacb3c08c49 Signed-off-by: Nir Soffer <nsoffer(a)redhat.com> --- M vdsm/storage/sp.py 1 file changed, 3 insertions(+), 3 deletions(-) git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/48/65048/1 diff --git a/vdsm/storage/sp.py b/vdsm/storage/sp.py index 78562c9..3297588 100644 --- a/vdsm/storage/sp.py +++ b/vdsm/storage/sp.py @@ -1942,14 +1942,14 @@ img_ns = sd.getNamespace(sc.IMAGE_NAMESPACE, sdUUID) with rm.acquireResource(img_ns, imgUUID, rm.EXCLUSIVE): vol = sdCache.produce(sdUUID).produceVolume(imgUUID, volUUID) - vol.setDescription(descr=description) + vol.setDescription(description) def setVolumeLegality(self, sdUUID, imgUUID, volUUID, legality): self.validatePoolSD(sdUUID) img_ns = sd.getNamespace(sc.IMAGE_NAMESPACE, sdUUID) with rm.acquireResource(img_ns, imgUUID, rm.EXCLUSIVE): vol = sdCache.produce(sdUUID).produceVolume(imgUUID, volUUID) - vol.setLegality(legality=legality) + vol.setLegality(legality) def getVmsList(self, sdUUID): self.validatePoolSD(sdUUID) @@ -1972,7 +1972,7 @@ def setSDDescription(self, sd, description): self.validatePoolSD(sd.sdUUID) - sd.setDescription(descr=description) + sd.setDescription(description) def getAllTasksStatuses(self): return self.taskMng.getAllTasksStatuses("spm") -- To view, visit https://gerrit.ovirt.org/65048 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I2d73df3daa59efb512bfdc9f6e400bacb3c08c49 Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Nir Soffer <nsoffer(a)redhat.com>

4 16

Change in vdsm[master]: sp: Streamline calls to volume methods
by Nir Soffer 10 Oct '16

10 Oct '16

Nir Soffer has uploaded a new change for review. Change subject: sp: Streamline calls to volume methods ...................................................................... sp: Streamline calls to volume methods When calling volume methods, we typically produce the domain, produce the volume, and calling the method. Adding a temporary variable for the volume makes the code easier to read. Change-Id: I8bbdfbd5cf6a4a7345c350359e76c2156720c683 Signed-off-by: Nir Soffer <nsoffer(a)redhat.com> --- M vdsm/storage/sp.py 1 file changed, 6 insertions(+), 6 deletions(-) git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/47/65047/1 diff --git a/vdsm/storage/sp.py b/vdsm/storage/sp.py index 759ea00..78562c9 100644 --- a/vdsm/storage/sp.py +++ b/vdsm/storage/sp.py @@ -1891,8 +1891,8 @@ with rm.acquireResource(img_ns, imgUUID, rm.EXCLUSIVE): dom = sdCache.produce(sdUUID) for volUUID in volumes: - dom.produceVolume(imgUUID, volUUID).delete( - postZero=postZero, force=force) + vol = dom.produceVolume(imgUUID, volUUID) + vol.delete(postZero=postZero, force=force) def purgeImage(self, sdUUID, imgUUID, volsByImg): """ @@ -1941,15 +1941,15 @@ self.validatePoolSD(sdUUID) img_ns = sd.getNamespace(sc.IMAGE_NAMESPACE, sdUUID) with rm.acquireResource(img_ns, imgUUID, rm.EXCLUSIVE): - sdCache.produce(sdUUID).produceVolume( - imgUUID, volUUID).setDescription(descr=description) + vol = sdCache.produce(sdUUID).produceVolume(imgUUID, volUUID) + vol.setDescription(descr=description) def setVolumeLegality(self, sdUUID, imgUUID, volUUID, legality): self.validatePoolSD(sdUUID) img_ns = sd.getNamespace(sc.IMAGE_NAMESPACE, sdUUID) with rm.acquireResource(img_ns, imgUUID, rm.EXCLUSIVE): - sdCache.produce(sdUUID).produceVolume( - imgUUID, volUUID).setLegality(legality=legality) + vol = sdCache.produce(sdUUID).produceVolume(imgUUID, volUUID) + vol.setLegality(legality=legality) def getVmsList(self, sdUUID): self.validatePoolSD(sdUUID) -- To view, visit https://gerrit.ovirt.org/65047 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I8bbdfbd5cf6a4a7345c350359e76c2156720c683 Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Nir Soffer <nsoffer(a)redhat.com>

4 14

Change in vdsm[master]: sp: Fix domain.produceVolume calling convention
by Nir Soffer 10 Oct '16

10 Oct '16

Nir Soffer has uploaded a new change for review. Change subject: sp: Fix domain.produceVolume calling convention ...................................................................... sp: Fix domain.produceVolume calling convention As a general rule positional args should be called as positional args (arg), and kwargs as kwargs (arg=value). In some cases using kwarg call style for positional argument makes the code more clear, but not in the case of domain.procudeVolume. Change-Id: Id804b4754507f1c6bf4e85f006f6db6fdda2e330 Signed-off-by: Nir Soffer <nsoffer(a)redhat.com> --- M vdsm/storage/sp.py 1 file changed, 3 insertions(+), 6 deletions(-) git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/46/65046/1 diff --git a/vdsm/storage/sp.py b/vdsm/storage/sp.py index 2e50a98..759ea00 100644 --- a/vdsm/storage/sp.py +++ b/vdsm/storage/sp.py @@ -1848,8 +1848,7 @@ if imgUUID != srcImgUUID and srcImgUUID != sc.BLANK_UUID: srcDom = sdCache.produce(sdUUID) - srcVol = srcDom.produceVolume(imgUUID=srcImgUUID, - volUUID=srcVolUUID) + srcVol = srcDom.produceVolume(srcImgUUID, srcVolUUID) if not srcVol.isShared(): if srcVol.getParent() == sc.BLANK_UUID: @@ -1943,16 +1942,14 @@ img_ns = sd.getNamespace(sc.IMAGE_NAMESPACE, sdUUID) with rm.acquireResource(img_ns, imgUUID, rm.EXCLUSIVE): sdCache.produce(sdUUID).produceVolume( - imgUUID=imgUUID, - volUUID=volUUID).setDescription(descr=description) + imgUUID, volUUID).setDescription(descr=description) def setVolumeLegality(self, sdUUID, imgUUID, volUUID, legality): self.validatePoolSD(sdUUID) img_ns = sd.getNamespace(sc.IMAGE_NAMESPACE, sdUUID) with rm.acquireResource(img_ns, imgUUID, rm.EXCLUSIVE): sdCache.produce(sdUUID).produceVolume( - imgUUID=imgUUID, - volUUID=volUUID).setLegality(legality=legality) + imgUUID, volUUID).setLegality(legality=legality) def getVmsList(self, sdUUID): self.validatePoolSD(sdUUID) -- To view, visit https://gerrit.ovirt.org/65046 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Id804b4754507f1c6bf4e85f006f6db6fdda2e330 Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Nir Soffer <nsoffer(a)redhat.com>

4 15

Change in vdsm[master]: sp: Simplify long lines using continuation \
by Nir Soffer 10 Oct '16

10 Oct '16

Nir Soffer has uploaded a new change for review. Change subject: sp: Simplify long lines using continuation \ ...................................................................... sp: Simplify long lines using continuation \ Eliminate fragile and hard to read continuation \ with temporary variable. Change-Id: I51fc21b452f2f1d920ad1353d2b14067d432a837 Signed-off-by: Nir Soffer <nsoffer(a)redhat.com> --- M vdsm/storage/sp.py 1 file changed, 10 insertions(+), 10 deletions(-) git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/45/65045/1 diff --git a/vdsm/storage/sp.py b/vdsm/storage/sp.py index ed32432..2e50a98 100644 --- a/vdsm/storage/sp.py +++ b/vdsm/storage/sp.py @@ -1340,8 +1340,8 @@ def extendVolumeSize(self, sdUUID, imgUUID, volUUID, newSize): img_ns = sd.getNamespace(sc.IMAGE_NAMESPACE, sdUUID) with rm.acquireResource(img_ns, imgUUID, rm.EXCLUSIVE): - return sdCache.produce(sdUUID) \ - .produceVolume(imgUUID, volUUID).extendSize(int(newSize)) + vol = sdCache.produce(sdUUID).produceVolume(imgUUID, volUUID) + return vol.extendSize(int(newSize)) @unsecured def getVersion(self): @@ -1676,8 +1676,8 @@ """ img_ns = sd.getNamespace(sc.IMAGE_NAMESPACE, sdUUID) with rm.acquireResource(img_ns, imgUUID, rm.SHARED): - return image.Image(self.poolPath) \ - .upload(methodArgs, sdUUID, imgUUID, volUUID) + img = image.Image(self.poolPath) + return img.upload(methodArgs, sdUUID, imgUUID, volUUID) def downloadImage(self, methodArgs, sdUUID, imgUUID, volUUID=None): """ @@ -1686,8 +1686,8 @@ """ img_ns = sd.getNamespace(sc.IMAGE_NAMESPACE, sdUUID) with rm.acquireResource(img_ns, imgUUID, rm.EXCLUSIVE): - return image.Image(self.poolPath) \ - .download(methodArgs, sdUUID, imgUUID, volUUID) + img = image.Image(self.poolPath) + return img.download(methodArgs, sdUUID, imgUUID, volUUID) def uploadImageToStream(self, methodArgs, callback, startEvent, sdUUID, imgUUID, volUUID=None): @@ -1701,8 +1701,8 @@ img_ns = sd.getNamespace(sc.IMAGE_NAMESPACE, sdUUID) with rm.acquireResource(img_ns, imgUUID, rm.SHARED): try: - return image.Image(self.poolPath) \ - .copyFromImage(methodArgs, sdUUID, imgUUID, volUUID) + img = image.Image(self.poolPath) + return img.copyFromImage(methodArgs, sdUUID, imgUUID, volUUID) finally: callback() @@ -1714,8 +1714,8 @@ img_ns = sd.getNamespace(sc.IMAGE_NAMESPACE, sdUUID) with rm.acquireResource(img_ns, imgUUID, rm.EXCLUSIVE): try: - return image.Image(self.poolPath) \ - .copyToImage(methodArgs, sdUUID, imgUUID, volUUID) + img = image.Image(self.poolPath) + return img.copyToImage(methodArgs, sdUUID, imgUUID, volUUID) finally: callback() -- To view, visit https://gerrit.ovirt.org/65045 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I51fc21b452f2f1d920ad1353d2b14067d432a837 Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Nir Soffer <nsoffer(a)redhat.com>

4 13

Change in vdsm[master]: sp: Remove useless continuation to a commented line
by Nir Soffer 10 Oct '16

10 Oct '16

Nir Soffer has uploaded a new change for review. Change subject: sp: Remove useless continuation to a commented line ...................................................................... sp: Remove useless continuation to a commented line Change-Id: I7b8a0f989fbd55280163c54481f1748bcfff7b6a Signed-off-by: Nir Soffer <nsoffer(a)redhat.com> --- M vdsm/storage/sp.py 1 file changed, 1 insertion(+), 2 deletions(-) git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/44/65044/1 diff --git a/vdsm/storage/sp.py b/vdsm/storage/sp.py index ef2e9a28..ed32432 100644 --- a/vdsm/storage/sp.py +++ b/vdsm/storage/sp.py @@ -1232,8 +1232,7 @@ fileUtils.createdir(os.path.join(domaindir, sd.DOMAIN_META_DATA)) fileUtils.createdir(os.path.join(domaindir, sd.DOMAIN_IMAGES)) # Add the file domains - for domUUID, domaindir in fileSD.scanDomains(): \ - # [(fileDomUUID, file_domaindir)] + for domUUID, domaindir in fileSD.scanDomains(): if domUUID in domUUIDs: domDirs[domUUID] = domaindir -- To view, visit https://gerrit.ovirt.org/65044 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I7b8a0f989fbd55280163c54481f1748bcfff7b6a Gerrit-PatchSet: 1 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Nir Soffer <nsoffer(a)redhat.com>

4 13

← Newer
1
...
28
29
30
31
32
33
34
...
47
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

vdsm-patches October 2016