September 2011 - vdsm-patches - Fedora Mailing-Lists

Change in vdsm[master]: Related to BZ#732416 - Remove Irs throttling during copy.

by Dan Kenigsberg

Dan Kenigsberg has submitted this change and it was merged. Change subject: Related to BZ#732416 - Remove Irs throttling during copy. ...................................................................... Related to BZ#732416 - Remove Irs throttling during copy. Change-Id: Ic0a6f200cd9e4917933bc1375b1ae2b09701e021 --- M vdsm/config.py M vdsm/storage/image.py 2 files changed, 0 insertions(+), 5 deletions(-) -- Gerrit-MessageType: merged Gerrit-Change-Id: Ic0a6f200cd9e4917933bc1375b1ae2b09701e021 Gerrit-PatchSet: 4 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Eduardo Warszawski <ewarszaw(a)redhat.com> Gerrit-Reviewer: Ayal Baron Gerrit-Reviewer: Dan Kenigsberg <danken(a)redhat.com> Gerrit-Reviewer: Eduardo Warszawski <ewarszaw(a)redhat.com> Gerrit-Reviewer: Igor Lvovsky <ilvovsky(a)redhat.com> Gerrit-Reviewer: Saggi Mizrahi <smizrahi(a)redhat.com>

12 years, 8 months

1
0
0 / 0

Change in vdsm[master]: BZ#732416 Introduce deleteMultipleVolumes

by Dan Kenigsberg

Dan Kenigsberg has submitted this change and it was merged. Change subject: BZ#732416 Introduce deleteMultipleVolumes ...................................................................... BZ#732416 Introduce deleteMultipleVolumes Change-Id: I0d8bbff8d364ef85d62237dd13caede1e60f3449 --- M vdsm/storage/blockVolume.py M vdsm/storage/fileVolume.py M vdsm/storage/image.py M vdsm/storage/spm.py 4 files changed, 57 insertions(+), 6 deletions(-) -- Gerrit-MessageType: merged Gerrit-Change-Id: I0d8bbff8d364ef85d62237dd13caede1e60f3449 Gerrit-PatchSet: 4 Gerrit-Project: vdsm Gerrit-Branch: master Gerrit-Owner: Eduardo Warszawski <ewarszaw(a)redhat.com> Gerrit-Reviewer: Ayal Baron Gerrit-Reviewer: Dan Kenigsberg <danken(a)redhat.com> Gerrit-Reviewer: Eduardo Warszawski <ewarszaw(a)redhat.com> Gerrit-Reviewer: Igor Lvovsky <ilvovsky(a)redhat.com> Gerrit-Reviewer: Saggi Mizrahi <smizrahi(a)redhat.com>

12 years, 8 months

1
0
0 / 0

by ewarszaw＠redhat.com

New patch submitted by Eduardo Warszawski (ewarszaw(a)redhat.com) You can review this change at: http://gerrit.usersys.redhat.com/876 commit e29a55196a0c12b046e6c845a8034443d9fca9b9 Author: Eduardo Warszawski <ewarszaw(a)redhat.com> Date: Mon Aug 29 18:57:28 2011 +0300 Related to BZ#732416 - Fixes to misc.ddWatchCopy() Change-Id: I76d1a73442092769615c7236a2464cbc57bc3b2b diff --git a/vdsm/storage/blockVolume.py b/vdsm/storage/blockVolume.py index a4c61f1..9d2e0d7 100644 --- a/vdsm/storage/blockVolume.py +++ b/vdsm/storage/blockVolume.py @@ -268,16 +268,13 @@ class BlockVolume(volume.Volume): if postZero: self.prepare(justme=True, rw=True, chainrw=force, setrw=True, force=True) try: - # wipe out the whole volume - idle = config.getfloat('irs', 'idle') - try: - misc.ddWatchCopy("/dev/zero", vol_path, vars.task.aborting, idle, int(size), - recoveryCallback=volume.baseAsyncTasksRollback) - except se.ActionStopped, e: - raise e - except Exception, e: - self.log.error("Unexpected error", exc_info=True) - raise se.VolumesZeroingError(vol_path) + misc.ddWatchCopy("/dev/zero", vol_path, vars.task.aborting, int(size), + recoveryCallback=volume.baseAsyncTasksRollback) + except se.ActionStopped, e: + raise e + except Exception, e: + self.log.error("Unexpected error", exc_info=True) + raise se.VolumesZeroingError(vol_path) finally: self.teardown(self.sdUUID, self.volUUID, justme=True) diff --git a/vdsm/storage/fileVolume.py b/vdsm/storage/fileVolume.py index f8f5e98..f6aae79 100644 --- a/vdsm/storage/fileVolume.py +++ b/vdsm/storage/fileVolume.py @@ -20,7 +20,6 @@ import os import uuid -from config import config import storage_exception as se from sdf import StorageDomainFactory as SDF @@ -128,10 +127,9 @@ class FileVolume(volume.Volume): vars.task.pushRecovery(task.Recovery("halfbaked volume rollback", "fileVolume", "FileVolume", "halfbakedVolumeRollback", [vol_path])) if preallocate == volume.PREALLOCATED_VOL: - idle = config.getfloat('irs', 'idle') try: # ddWatchCopy expects size to be in bytes - misc.ddWatchCopy("/dev/zero", vol_path, vars.task.aborting, idle, (int(size) * 512)) + misc.ddWatchCopy("/dev/zero", vol_path, vars.task.aborting, (int(size) * 512)) except se.ActionStopped, e: raise e except Exception, e: diff --git a/vdsm/storage/image.py b/vdsm/storage/image.py index 09c655c..8e86fdc 100644 --- a/vdsm/storage/image.py +++ b/vdsm/storage/image.py @@ -571,7 +571,7 @@ class Image: try: dstVol = destDom.produceVolume(imgUUID=imgUUID, volUUID=srcVol.volUUID) srcSize = srcVol.getVolumeSize(bs=1) - misc.ddWatchCopy(srcVol.getVolumePath(), dstVol.getVolumePath(), vars.task.aborting, self.idle, size=srcSize) + misc.ddWatchCopy(srcVol.getVolumePath(), dstVol.getVolumePath(), vars.task.aborting, size=srcSize) except se.ActionStopped: raise except se.StorageException: diff --git a/vdsm/storage/misc.py b/vdsm/storage/misc.py index 07e40bc..ad95975 100644 --- a/vdsm/storage/misc.py +++ b/vdsm/storage/misc.py @@ -359,18 +359,19 @@ def _alignData(length, offset): def randomStr(strLen): return "".join(random.sample(string.letters, strLen)) -def ddWatchCopy(src, dst, stop, idle, size, offset=0, recoveryCallback=None): +def ddWatchCopy(src, dst, stop, size, offset=0, recoveryCallback=None): """ Copy src to dst using dd command with stop abilities """ + try: + size = int(size) + offset = int(offset) + except ValueError: + raise se.InvalidParameterException("size = %s, offset = %s" % (size, offset)) + left = size baseoffset = offset - try: - int(size) - except: - raise se.InvalidParameterException("size", size) - while left > 0: (iounit, count, iooffset) = _alignData(left, offset) oflag = None @@ -406,11 +407,11 @@ def ddWatchCopy(src, dst, stop, idle, size, offset=0, recoveryCallback=None): return (rc, out, err) -def ddCopy(src, dst, size=None): +def ddCopy(src, dst, size): """ Copy src to dst using dd command """ - return ddWatchCopy(src, dst, None, None, size=size) + return ddWatchCopy(src, dst, None, size=size) def parseBool(var): diff --git a/vdsm/storage/volume.py b/vdsm/storage/volume.py index a5e0a1f..aa3f4ae 100644 --- a/vdsm/storage/volume.py +++ b/vdsm/storage/volume.py @@ -930,7 +930,7 @@ def qemuConvert(src, dst, src_fmt, dst_fmt, idle, stop, size, dstvolType): log.debug('(qemuConvert): COPY %s (%s) to %s (%s) START' % (src, src_fmt, dst, dst_fmt)) if src_fmt == "raw" and dst_fmt == "raw" and dstvolType == PREALLOCATED_VOL: - (rc, out, err) = misc.ddWatchCopy(src=src, dst=dst, stop=stop, idle=idle, size=size, + (rc, out, err) = misc.ddWatchCopy(src=src, dst=dst, stop=stop, size=size, recoveryCallback=baseAsyncTasksRollback) else: cmd = constants.CMD_LOWPRIO + [constants.EXT_QEMUIMG, "convert",

12 years, 8 months

4
6
0 / 0

by ewarszaw＠redhat.com

New patch submitted by Eduardo Warszawski (ewarszaw(a)redhat.com) You can review this change at: http://gerrit.usersys.redhat.com/875 commit 86b61918ad4def9d04ad7d11f67e4d1e497dcd66 Author: Eduardo Warszawski <ewarszaw(a)redhat.com> Date: Mon Aug 29 11:55:30 2011 +0300 Related to BZ#732416 - Remove unused idle parameter from misc.watchCmd() Change-Id: I123a41dce220f2433e4391cefd4489973756bb2f diff --git a/vdsm/storage/misc.py b/vdsm/storage/misc.py index 4dced68..07e40bc 100644 --- a/vdsm/storage/misc.py +++ b/vdsm/storage/misc.py @@ -224,7 +224,7 @@ def getProcCtime(pid): return str(ctime) -def watchCmd(command, stop, idle, sudo=True, cwd=None, infile=None, outfile=None, +def watchCmd(command, stop, sudo=True, cwd=None, infile=None, outfile=None, shell=False, data=None, recoveryCallback=None): """ Executes an external command, optionally via sudo with stop abilities. @@ -391,7 +391,7 @@ def ddWatchCopy(src, dst, stop, idle, size, offset=0, recoveryCallback=None): if not stop: (rc, out, err) = execCmd(cmd, sudo=False) else: - (rc, out, err) = watchCmd(cmd, stop=stop, idle=idle, sudo=False, + (rc, out, err) = watchCmd(cmd, stop=stop, sudo=False, recoveryCallback=recoveryCallback) if rc: diff --git a/vdsm/storage/volume.py b/vdsm/storage/volume.py index a27b913..a5e0a1f 100644 --- a/vdsm/storage/volume.py +++ b/vdsm/storage/volume.py @@ -889,7 +889,7 @@ def qemuCommit(src, fmt, idle, stop): cwd = os.path.dirname(src) cmd = constants.CMD_LOWPRIO + [constants.EXT_QEMUIMG, "commit", "-t", "none", "-f", fmt2str(fmt), src] - (rc, out, err) = misc.watchCmd(cmd, stop=stop, idle=idle, sudo=False, cwd=cwd, + (rc, out, err) = misc.watchCmd(cmd, stop=stop, sudo=False, cwd=cwd, recoveryCallback=baseAsyncTasksRollback) log.debug('(qemuCommit): MERGE %s DONE' % (src)) @@ -914,7 +914,7 @@ def qemuRebase(src, srcFormat, backingFile, backingFormat, unsafe, idle, stop, r recoveryCallback = None if rollback: recoveryCallback = baseAsyncTasksRollback - (rc, out, err) = misc.watchCmd(cmd, stop=stop, idle=idle, sudo=False, cwd=cwd, + (rc, out, err) = misc.watchCmd(cmd, stop=stop, sudo=False, cwd=cwd, recoveryCallback=recoveryCallback) log.debug('(qemuRebase): REBASE %s DONE' % (src)) @@ -936,7 +936,7 @@ def qemuConvert(src, dst, src_fmt, dst_fmt, idle, stop, size, dstvolType): cmd = constants.CMD_LOWPRIO + [constants.EXT_QEMUIMG, "convert", "-t", "none", "-f", src_fmt, src, "-O",dst_fmt, dst] - (rc, out, err) = misc.watchCmd(cmd, stop=stop, idle=idle, sudo=False, + (rc, out, err) = misc.watchCmd(cmd, stop=stop, sudo=False, recoveryCallback=baseAsyncTasksRollback) log.debug('(qemuConvert): COPY %s to %s DONE' % (src, dst))

12 years, 8 months

4
6
0 / 0

[NEW PATCH] BZ#732416 - Pluralise lvm remove LV(s) verb. (via gerrit-bot)

by ewarszaw＠redhat.com

New patch submitted by Eduardo Warszawski (ewarszaw(a)redhat.com) You can review this change at: http://gerrit.usersys.redhat.com/874 commit 3dce6a11fb181de12a242e92b6b7b74edbb79d78 Author: Eduardo Warszawski <ewarszaw(a)redhat.com> Date: Wed Aug 24 22:06:43 2011 +0300 BZ#732416 - Pluralise lvm remove LV(s) verb. Change-Id: Idbf76445d98dc5b80790f1a54c02f7029f476f65 diff --git a/vdsm/storage/blockSD.py b/vdsm/storage/blockSD.py index 0b8bc5a..26a5a12 100644 --- a/vdsm/storage/blockSD.py +++ b/vdsm/storage/blockSD.py @@ -714,7 +714,7 @@ class BlockStorageDomain(sd.StorageDomain): for lv in lvs: #Fix me: Should raise and get resource lock. try: - lvm.removeLV(sdUUID, lv.name) + lvm.removeLVs(sdUUID, lv.name) except se.CannotRemoveLogicalVolume, e: cls.log.warning("Remove logical volume failed %s/%s %s", sdUUID, lv.name, str(e)) diff --git a/vdsm/storage/blockVolume.py b/vdsm/storage/blockVolume.py index 25ec92c..a4c61f1 100644 --- a/vdsm/storage/blockVolume.py +++ b/vdsm/storage/blockVolume.py @@ -86,7 +86,7 @@ class BlockVolume(volume.Volume): try: #Fix me: assert resource lock. lvm.getLV(sdUUID, volUUID) - lvm.removeLV(sdUUID, volUUID) + lvm.removeLVs(sdUUID, volUUID) except se.LogicalVolumeDoesNotExistError, e: pass #It's OK: inexistent LV, don't try to remove. except se.CannotRemoveLogicalVolume, e: @@ -298,7 +298,7 @@ class BlockVolume(volume.Volume): try: try: - lvm.removeLV(self.sdUUID, self.volUUID) + lvm.removeLVs(self.sdUUID, self.volUUID) except se.CannotRemoveLogicalVolume: # At this point LV is already marked as illegal, we will try to cleanup whatever we can... pass diff --git a/vdsm/storage/lvm.py b/vdsm/storage/lvm.py index ca90329..1760408 100644 --- a/vdsm/storage/lvm.py +++ b/vdsm/storage/lvm.py @@ -979,29 +979,35 @@ def createLV(vgName, lvName, size, activate=True, contiguous=False, initialTag=N _setLVAvailability(vgName, lvName, "n") -def removeLV(vgName, lvName): - #Assert that the LV is inactive before remove. - if os.path.exists(lvPath(vgName, lvName)): - #Fix me - #Should not remove active LVs - #raise se.CannotRemoveLogicalVolume(vgName, lvName) - log.warning("Removing active volume %s/%s" % (vgName, lvName)) +def removeLVs(vgName, lvNames): + lvNames = _normalizeargs(lvNames) + #Assert that the LVs are inactive before remove. + for lvName in lvNames: + if os.path.exists(lvPath(vgName, lvName)): + #Fix me + #Should not remove active LVs + #raise se.CannotRemoveLogicalVolume(vgName, lvName) + log.warning("Removing active volume %s/%s" % (vgName, lvName)) #LV exists or not in cache, attempting to remove it. #Removing Stubs also. Active Stubs should raise. # Destroy LV #Fix me:removes active LVs too. "-f" should be removed. - cmd = ("lvremove", "-f") + LVM_NOBACKUP + ("%s/%s" % (vgName, lvName),) + cmd = ["lvremove", "-f"] + cmd.extend(LVM_NOBACKUP) + for lvName in lvNames: + cmd.append("%s/%s" % (vgName, lvName)) rc, out, err = _lvminfo.cmd(cmd) if rc == 0: - # Remove the LV from the cache - _lvminfo._lvs.pop((vgName, lvName), None) - # If lvremove succeeded it affected VG as well - _lvminfo._invalidatevgs(vgName) + for lvName in lvNames: + # Remove the LV from the cache + _lvminfo._lvs.pop((vgName, lvName), None) + # If lvremove succeeded it affected VG as well + _lvminfo._invalidatevgs(vgName) else: # Otherwise LV info needs to be refreshed _lvminfo._invalidatelvs(vgName, lvName) - raise se.CannotRemoveLogicalVolume(vgName, lvName) + raise se.CannotRemoveLogicalVolume(vgName, str(lvNames)) def extendLV(vgName, lvName, size):

12 years, 8 months

4
9
0 / 0

by ewarszaw＠redhat.com

New patch submitted by Eduardo Warszawski (ewarszaw(a)redhat.com) You can review this change at: http://gerrit.usersys.redhat.com/873 commit a9eeef14fb9f786336d3d04bdf6f367af0e6147e Author: Eduardo Warszawski <ewarszaw(a)redhat.com> Date: Wed Aug 24 21:38:39 2011 +0300 Related to BZ#732416 - Unify criteria for active LV in lvm cache. Change-Id: I91506ed397512e51ba5560fbb617e853668ebc0e diff --git a/vdsm/storage/lvm.py b/vdsm/storage/lvm.py index 921cf3b..ca90329 100644 --- a/vdsm/storage/lvm.py +++ b/vdsm/storage/lvm.py @@ -981,11 +981,10 @@ def createLV(vgName, lvName, size, activate=True, contiguous=False, initialTag=N def removeLV(vgName, lvName): #Assert that the LV is inactive before remove. - lv = _lvminfo._lvs.get((vgName, lvName), None) - if lv and not isinstance(lv, Stub) and lv.active: + if os.path.exists(lvPath(vgName, lvName)): #Fix me #Should not remove active LVs - #raise se.CannotRemoveLogicalVolume(vg, lv) + #raise se.CannotRemoveLogicalVolume(vgName, lvName) log.warning("Removing active volume %s/%s" % (vgName, lvName)) #LV exists or not in cache, attempting to remove it.

12 years, 8 months

4
9
0 / 0

by ewarszaw＠redhat.com

New patch submitted by Eduardo Warszawski (ewarszaw(a)redhat.com) You can review this change at: http://gerrit.usersys.redhat.com/880 commit 85e6275274ee0c21658dee0a88ad7b7984c14668 Author: Eduardo Warszawski <ewarszaw(a)redhat.com> Date: Mon Aug 29 19:34:42 2011 +0300 Related to BZ#732416 - Remove Irs throttling during copy. Change-Id: Ic0a6f200cd9e4917933bc1375b1ae2b09701e021 diff --git a/vdsm/config.py b/vdsm/config.py index b76f7af..921db2f 100644 --- a/vdsm/config.py +++ b/vdsm/config.py @@ -107,9 +107,6 @@ config.add_section('irs') ##################################################################### config.set('irs', 'irs_enable', 'true') -#Irs throttling during copy. Set the active time vs idle time -config.set('irs', 'active', '1.0') -config.set('irs', 'idle', '1.0') #Image repository config.set('irs', 'repository', '/rhev/data-center') diff --git a/vdsm/storage/image.py b/vdsm/storage/image.py index 5c6b114..b97c69f 100644 --- a/vdsm/storage/image.py +++ b/vdsm/storage/image.py @@ -82,8 +82,6 @@ class Image: def __init__(self, repoPath): self.repoPath = repoPath self.storage_repository = config.get('irs', 'repository') - self.active = config.getfloat('irs', 'active') - self.idle = config.getfloat('irs', 'idle') def create(self, sdUUID, imgUUID): """Create placeholder for image's volumes

12 years, 8 months

4
5
0 / 0

by ewarszaw＠redhat.com

New patch submitted by Eduardo Warszawski (ewarszaw(a)redhat.com) You can review this change at: http://gerrit.usersys.redhat.com/879 commit c0fcb397a75d4632505a3118cca86ec9e3e2aa33 Author: Eduardo Warszawski <ewarszaw(a)redhat.com> Date: Tue Aug 30 19:31:07 2011 +0300 Related to BZ#732416 - Remove volume.qemuCommit() Change-Id: Iba5bae9efa9aa13efe4f9598c2f93c61dc55e0a6 diff --git a/vdsm/storage/volume.py b/vdsm/storage/volume.py index 50850fa..d50204b 100644 --- a/vdsm/storage/volume.py +++ b/vdsm/storage/volume.py @@ -18,7 +18,6 @@ # Refer to the README and COPYING files for full details of the license # -from config import config import os.path import logging import time @@ -103,7 +102,6 @@ def name2type(name): class Volume: - idle = config.getfloat('irs', 'idle') log = logging.getLogger('Storage.Volume') def __init__(self, repoPath, sdUUID, imgUUID, volUUID): @@ -880,21 +878,6 @@ def baseAsyncTasksRollback(proc): vars.task.pushRecovery(task.Recovery(name, "volume", "Volume", "killProcRollback", [str(proc.pid), str(misc.getProcCtime(proc.pid))])) -def qemuCommit(src, fmt, idle, stop): - """ - Merge single snapshot from 'successor (snapshot)' to its backing file. - """ - log.debug('(qemuCommit): MERGE %s START' % (src)) - - cwd = os.path.dirname(src) - cmd = constants.CMD_LOWPRIO + [constants.EXT_QEMUIMG, "commit", - "-t", "none", "-f", fmt2str(fmt), src] - (rc, out, err) = misc.watchCmd(cmd, stop=stop, sudo=False, cwd=cwd, - recoveryCallback=baseAsyncTasksRollback) - - log.debug('(qemuCommit): MERGE %s DONE' % (src)) - return (rc, out, err) - def qemuRebase(src, srcFormat, backingFile, backingFormat, unsafe, stop, rollback): """ Rebase the 'src' volume on top of the new 'backingFile' with new 'backingFormat'

12 years, 8 months

4
5
0 / 0

by ewarszaw＠redhat.com

New patch submitted by Eduardo Warszawski (ewarszaw(a)redhat.com) You can review this change at: http://gerrit.usersys.redhat.com/878 commit 8a3545355270e33e81bae4e0bdbafefb4e992734 Author: Eduardo Warszawski <ewarszaw(a)redhat.com> Date: Mon Aug 29 19:30:41 2011 +0300 Related to BZ#732416 - Remove idle param in volume.qemuRebase() Change-Id: I54f1f6c86250b1723093a43252baefd4308cfbfa diff --git a/vdsm/storage/volume.py b/vdsm/storage/volume.py index 7dce885..50850fa 100644 --- a/vdsm/storage/volume.py +++ b/vdsm/storage/volume.py @@ -173,9 +173,9 @@ class Volume: try: (rc, out, err) = qemuRebase(vol.getVolumePath(), vol.getFormat(), - os.path.join('..', srcImg, srcParent), - int(dstFormat), misc.parseBool(unsafe), - vol.idle, vars.task.aborting, False) + os.path.join('..', srcImg, srcParent), + int(dstFormat), misc.parseBool(unsafe), + vars.task.aborting, False) if rc: raise se.MergeVolumeRollbackError(srcVol) @@ -205,7 +205,7 @@ class Volume: str(pvol.getFormat()), pvol.volUUID, str(True)])) (rc, out, err) = qemuRebase(self.getVolumePath(), self.getFormat(), backingVolPath, - backingFormat, unsafe, self.idle, vars.task.aborting, rollback) + backingFormat, unsafe, vars.task.aborting, rollback) if rc: raise se.MergeSnapshotsError(self.volUUID) self.setParent(backingVol) @@ -895,7 +895,7 @@ def qemuCommit(src, fmt, idle, stop): log.debug('(qemuCommit): MERGE %s DONE' % (src)) return (rc, out, err) -def qemuRebase(src, srcFormat, backingFile, backingFormat, unsafe, idle, stop, rollback): +def qemuRebase(src, srcFormat, backingFile, backingFormat, unsafe, stop, rollback): """ Rebase the 'src' volume on top of the new 'backingFile' with new 'backingFormat' """

12 years, 8 months

4
5
0 / 0

by ewarszaw＠redhat.com

New patch submitted by Eduardo Warszawski (ewarszaw(a)redhat.com) You can review this change at: http://gerrit.usersys.redhat.com/877 commit a547ab95725ebfe9f2f9365eeae3e1543b366d2f Author: Eduardo Warszawski <ewarszaw(a)redhat.com> Date: Mon Aug 29 19:20:44 2011 +0300 Related to BZ#732416 - Remove unused idle param in volume.qemuConvert() Change-Id: Ib11545298238d40795f098d60bc14e3d10ac7677 diff --git a/vdsm/storage/image.py b/vdsm/storage/image.py index 8e86fdc..5c6b114 100644 --- a/vdsm/storage/image.py +++ b/vdsm/storage/image.py @@ -803,7 +803,7 @@ class Image: try: (rc, out, err) = volume.qemuConvert(volParams['path'], dstPath, - volParams['volFormat'], dstVolFormat, self.idle, vars.task.aborting, + volParams['volFormat'], dstVolFormat, vars.task.aborting, size=srcVol.getVolumeSize(bs=1), dstvolType=dstVol.getType()) if rc: raise se.StorageException("rc: %s, err: %s" % (rc, err)) @@ -1053,7 +1053,7 @@ class Image: # Step 2: Convert successor to new volume # qemu-img convert -f qcow2 successor -O raw newUUID (rc, out, err) = volume.qemuConvert(srcVolParams['path'], newVol.getVolumePath(), - srcVolParams['volFormat'], volParams['volFormat'], self.idle, vars.task.aborting, + srcVolParams['volFormat'], volParams['volFormat'], vars.task.aborting, size=volParams['apparentsize'], dstvolType=newVol.getType()) if rc: raise se.MergeSnapshotsError(newUUID) diff --git a/vdsm/storage/volume.py b/vdsm/storage/volume.py index aa3f4ae..7dce885 100644 --- a/vdsm/storage/volume.py +++ b/vdsm/storage/volume.py @@ -921,7 +921,7 @@ def qemuRebase(src, srcFormat, backingFile, backingFormat, unsafe, idle, stop, r return (rc, out, err) -def qemuConvert(src, dst, src_fmt, dst_fmt, idle, stop, size, dstvolType): +def qemuConvert(src, dst, src_fmt, dst_fmt, stop, size, dstvolType): """ Convert the 'src' image (or chain of images) into a new single 'dst' """

12 years, 8 months

4
5
0 / 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

vdsm-patches September 2011