儲存庫 vbox 的更動 63008

時間撮記:

2016-8-4 下午08:31:09 (8 年 以前)

作者:

vboxsync

訊息:

ValidationKit/tests/storage: Add a method to cleanup leftover volumes and pools from a failed previous run (only implemented on Solaris so far)

位置:

trunk/src/VBox/ValidationKit/tests/storage

檔案:

• storagecfg.py (修改) (4 筆差異)
• tdStorageBenchmark1.py (修改) (1 筆差異)

trunk/src/VBox/ValidationKit/tests/storage/storagecfg.py

@@ -95 +95 @@
         StorageConfigOs.__init__(self);
 
+    def _getActivePoolsStartingWith(self, oExec, sPoolIdStart):
+        """
+        Returns a list of pools starting with the given ID or None on failure.
+        """
+        lstPools = None;
+        fRc, sOutput = oExec.execBinary('zpool', ('list', '-H'));
+        if fRc:
+            lstPools = [];
+            asPools = sOutput.splitlines();
+            for sPool in asPools:
+                if sPool.startswith(sPoolIdStart):
+                    # Extract the whole name and add it to the list.
+                    asItems = sPool.split(' ');
+                    lstPools.append(asItems[0]);
+        return lstPools;
+
+    def _getActiveVolumesInPoolStartingWith(self, oExec, sPool, sVolumeIdStart):
+        """
+        Returns a list of active volumes for the given pool starting with the given
+        identifier or None on failure.
+        """
+        lstVolumes = None;
+        fRc, sOutput = oExec.execBinary('zfs', ('list', '-H'));
+        if fRc:
+            lstVolumes = [];
+            asVolumes = sOutput.splitlines();
+            for sVolume in asVolumes:
+                if sVolume.startswith(sPool + '/' + sVolumeIdStart):
+                    # Extract the whole name and add it to the list.
+                    asItems = sVolume.split(' ');
+                    lstVolumes.append(asItems[0]);
+        return lstVolumes;
+
     def getDisksMatchingRegExp(self, sRegExp):
         """
@@ -148 +181 @@
         """
         fRc, _ = oExec.execBinary('zpool', ('destroy', sPool));
+        return fRc;
+
+    def cleanupPoolsAndVolumes(self, oExec, sPoolIdStart, sVolIdStart):
+        """
+        Cleans up any pools and volumes starting with the name in the given
+        parameters.
+        """
+        fRc = True;
+        lstPools = self._getActivePoolsStartingWith(oExec, sPoolIdStart);
+        if lstPools is not None:
+            for sPool in lstPools:
+                lstVolumes = self._getActiveVolumesInPoolStartingWith(oExec, sPool, sVolIdStart);
+                if lstVolumes is not None:
+                    # Destroy all the volumes first
+                    for sVolume in lstVolumes:
+                        fRc2 = oExec.execBinaryNoStdOut('zfs', ('destroy', sVolume));
+                        if not fRc2:
+                            fRc = fRc2;
+
+                    # Destroy the pool
+                    fRc2 = self.destroyPool(oExec, sPool);
+                    if not fRc2:
+                        fRc = fRc2;
+                else:
+                    fRc = False;
+        else:
+            fRc = False;
+
         return fRc;
 
@@ -279 +340 @@
         return fRc;
 
+    def cleanupPoolsAndVolumes(self, oExec, sPoolIdStart, sVolIdStart):
+        """
+        Cleans up any pools and volumes starting with the name in the given
+        parameters.
+        """
+        # @todo: Needs implementation, for LVM based configs a similar approach can be used
+        #        as for Solaris.
+        _ = oExec;
+        _ = sPoolIdStart;
+        _ = sVolIdStart;
+        return True;
+
 class StorageCfg(object):
     """
@@ -459 +532 @@
         return self.oExec.mkDir(sMountPoint + '/' + sDir, fMode);
 
+    def cleanupLeftovers(self):
+        """
+        Tries to cleanup any leftover pools and volumes from a failed previous run.
+        """
+        return self.oStorOs.cleanupPoolsAndVolumes('pool', 'vol');
+

trunk/src/VBox/ValidationKit/tests/storage/tdStorageBenchmark1.py

@@ -791 +791 @@
             self.oStorCfg = storagecfg.StorageCfg(oExecutor, utils.getHostOs(), oDiskCfg);
 
+            # Try to cleanup any leftovers from a previous run first.
+            fRc = self.oStorCfg.cleanupLeftovers();
+            if not fRc:
+                reporter.error('Failed to cleanup any leftovers from a previous run');
+
             if self.fTestHost:
                 reporter.testStart('Host');