[NEW PATCH] Related to BZ#732416 - Remove unused idle parameter from misc.watchCmd() (via gerrit-bot)

Dan Kenigsberg danken at redhat.com
Sun Sep 11 09:44:01 UTC 2011


New patch submitted by Dan Kenigsberg (danken at redhat.com)

You can review this change at: http://gerrit.usersys.redhat.com/875

commit 84113b3bc28b613876e5a77b9e2659c9bc4d972f
Author: Eduardo Warszawski <ewarszaw at 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 51d1f0d..8fa8ea2 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,
             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))




More information about the vdsm-patches mailing list