[NEW PATCH] Related to BZ#732416 - Remove volume.qemuCommit() (via gerrit-bot)

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


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

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

commit fd40e7b1faa9db0a2d0809031d424b2e38a0bfa0
Author: Eduardo Warszawski <ewarszaw at 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'




More information about the vdsm-patches mailing list