New subject: Change in vdsm[master]: Related to BZ#732416 - Remove idle param in volume.qemuRebas...

Wednesday, 31 August 2011

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&gt;
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'
     """



    

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

[NEW PATCH] Related to BZ#732416 - Remove idle param in volume.qemuRebase() (via gerrit-bot)