Changeset 64847 in vbox for trunk/src/VBox/ValidationKit/tests/storage

Timestamp:

Dec 13, 2016 12:42:29 PM (8 years ago)

Author:

vboxsync

Message:

ValdiationKit/storaage: Increase the timeout for the benchmarks to 2 hourse because running the complete benchmark with QCOW exceeds the timeout. The 4K block size hurts performance too much

Location:

trunk/src/VBox/ValidationKit/tests/storage

Files:

• remoteexecutor.py (modified) (4 diffs)
• storagecfg.py (modified) (1 diff)
• tdStorageBenchmark1.py (modified) (5 diffs)

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

@@ -139 +139 @@
         return (True, str(sOutput));
 
-    def _execLocallyOrThroughTxs(self, sExec, asArgs, sInput):
+    def _execLocallyOrThroughTxs(self, sExec, asArgs, sInput, cMsTimeout):
         """
         Executes the given program locally or through TXS based on the
@@ -154 +154 @@
                 oStdIn = '/dev/null'; # pylint: disable=R0204
             fRc = self.oTxsSession.syncExecEx(sExec, (sExec,) + asArgs,
-                                              oStdIn = oStdIn, oStdOut = oStdOut);
+                                              oStdIn = oStdIn, oStdOut = oStdOut,
+                                              cMsTimeout = cMsTimeout);
             sOutput = oStdOut.getOutput();
         else:
@@ -160 +161 @@
         return (fRc, sOutput);
 
-    def execBinary(self, sExec, asArgs, sInput = None):
+    def execBinary(self, sExec, asArgs, sInput = None, cMsTimeout = 3600000):
         """
         Executes the given binary with the given arguments
@@ -172 +173 @@
         sBinary = self._getBinaryPath(sExec);
         if sBinary is not None:
-            fRc, sOutput = self._execLocallyOrThroughTxs(sBinary, asArgs, sInput);
+            fRc, sOutput = self._execLocallyOrThroughTxs(sBinary, asArgs, sInput, cMsTimeout);
         else:
             fRc = False;

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

@@ -392 +392 @@
 
         # Destroy all volumes first.
-        for sMountPoint in self.dVols.keys():
+        for sMountPoint in self.dVols.keys(): # pylint: disable=C0201
             self.destroyVolume(sMountPoint);
 
         # Destroy all pools.
-        for sPool in self.dPools.keys():
+        for sPool in self.dPools.keys(): # pylint: disable=C0201
             self.destroyStoragePool(sPool);
 

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

@@ -127 +127 @@
         """ Runs the testcase """
         _ = cMsTimeout
-        fRc, sOutput = self.oExecutor.execBinary('fio', (self.sCfgFileId,));
+        fRc, sOutput = self.oExecutor.execBinary('fio', (self.sCfgFileId,), cMsTimeout = cMsTimeout);
         # @todo: Parse output.
         _ = sOutput;
@@ -182 +182 @@
         if self.fDirectIo:
             tupArgs += ('-I',);
-        fRc, sOutput = self.oExecutor.execBinary('iozone', tupArgs);
+        fRc, sOutput = self.oExecutor.execBinary('iozone', tupArgs, cMsTimeout = cMsTimeout);
         if fRc:
             self.sResult = sOutput;
@@ -835 +835 @@
         return self.kdHostIoCacheDescs[sHostIoCache];
 
-    def testBenchmark(self, sTargetOs, sBenchmark, sMountpoint, oExecutor, dTestSet):
+    def testBenchmark(self, sTargetOs, sBenchmark, sMountpoint, oExecutor, dTestSet, \
+                      cMsTimeout = 3600000):
         """
         Runs the given benchmark on the test host.
@@ -852 +853 @@
             fRc = oTst.prepare();
             if fRc:
-                fRc = oTst.run();
+                fRc = oTst.run(cMsTimeout);
                 if fRc:
                     if self.fReportBenchmarkResults:
@@ -1009 +1010 @@
                     sMountPoint = self.prepareStorage(oStorCfgVm);
                     if sMountPoint is not None:
-                        self.testBenchmark('linux', sIoTest, sMountPoint, oExecVm, dTestSet);
+                        self.testBenchmark('linux', sIoTest, sMountPoint, oExecVm, dTestSet, \
+                                           cMsTimeout = 2 * 3600 * 1000); # 2 hours max (Benchmark and QCOW takes some time)
                         self.cleanupStorage(oStorCfgVm);
                     else: