[NEW PATCH] Revert "BZ#717847 - Postpone VM's periodic tasks until all volumes are prepared" (via gerrit-bot)

Federico Simoncelli fsimonce at redhat.com
Mon Sep 12 14:56:29 UTC 2011


New patch submitted by Federico Simoncelli (fsimonce at redhat.com)

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

commit e889173a6aef3eebbb719dec61c6f8db5bd34dac
Author: Federico Simoncelli <fsimonce at redhat.com>
Date:   Mon Sep 12 14:29:38 2011 +0000

    Revert "BZ#717847 - Postpone VM's periodic tasks until all volumes are prepared"
    
    This reverts commit 328f011da1ad70ed820a212062b4b3e375b8218a.
    
    Change-Id: I78be7a2f008a88d400db5c3e218e8c043b222cec

diff --git a/vdsm/libvirtvm.py b/vdsm/libvirtvm.py
index 9ab8c63..e2576e3 100644
--- a/vdsm/libvirtvm.py
+++ b/vdsm/libvirtvm.py
@@ -67,10 +67,6 @@ class VmStatsThread(utils.AdvancedStatsThread):
         if self._vm._incomingMigrationPending():
             return
 
-        if not self._vm._volumesPrepared:
-            # Avoid queries from storage during recovery process
-            return
-
         for vmDrive in self._vm._drives:
             if vmDrive.blockDev and vmDrive.format == 'cow':
                 capacity, alloc, physical = \
@@ -82,7 +78,7 @@ class VmStatsThread(utils.AdvancedStatsThread):
                     self._vm._onHighWrite(vmDrive.name, alloc)
 
     def _updateVolumes(self):
-        if not self._vm._volumesPrepared:
+        if not self._vm.cif.irs.getConnectedStoragePoolsList()['poollist']:
             # Avoid queries from storage during recovery process
             return
 
@@ -98,10 +94,6 @@ class VmStatsThread(utils.AdvancedStatsThread):
         return cpuTime / 1000**3
 
     def _sampleDisk(self):
-        if not self._vm._volumesPrepared:
-            # Avoid queries from storage during recovery process
-            return
-
         diskSamples = {}
         for vmDrive in self._vm._drives:
             diskSamples[vmDrive.name] = self._vm._dom.blockStats(vmDrive.name)
diff --git a/vdsm/vm.py b/vdsm/vm.py
index 8a87db6..5b53efa 100644
--- a/vdsm/vm.py
+++ b/vdsm/vm.py
@@ -312,7 +312,6 @@ class Vm(object):
                                 self.conf.pop('elapsedTimeOffset', 0))
         self._cdromPreparedPath = ''
         self._floppyPreparedPath = ''
-        self._volumesPrepared = False
         self._pathsPreparedEvent = threading.Event()
         self.saveState()
 
@@ -431,8 +430,6 @@ class Vm(object):
     def preparePaths(self):
         for drive in self.conf.get('drives', []):
             drive['path'] = self._prepareVolumePath(drive)
-        # Now we got all needed resources
-        self._volumesPrepared = True
 
         try:
             self._cdromPreparedPath = self._prepareVolumePath(




More information about the vdsm-patches mailing list