Changeset 65731 in vbox for trunk/src/VBox/ValidationKit

Timestamp:

Feb 10, 2017 1:25:41 PM (8 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

113445

Message:

ValidationKit/tdStorageBenchmark1: Upload the raw benchmark output including stderr

Location:

trunk/src/VBox/ValidationKit/tests/storage

Files:

• remoteexecutor.py (modified) (6 diffs)
• storagecfg.py (modified) (6 diffs)
• tdStorageBenchmark1.py (modified) (7 diffs)

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

@@ -89 +89 @@
 
     def __init__(self, oTxsSession = None, asBinaryPaths = None, sScratchPath = None):
-        self.oTxsSession = oTxsSession;
-        self.asPaths = asBinaryPaths;
+        self.oTxsSession  = oTxsSession;
+        self.asPaths      = asBinaryPaths;
+        self.sScratchPath = sScratchPath;
         if self.asPaths is None:
             self.asPaths = [ ];
-        self.sScratchPath = sScratchPath
 
     def _isFile(self, sFile):
@@ -123 +123 @@
         reporter.log('Executing [sudo]: %s' % (asArgs, ));
         reporter.flushall();
+        fRc = False;
+        sOutput = '';
+        sError = '';
         try:
             oProcess = utils.sudoProcessPopen(asArgs, stdout=subprocess.PIPE, stdin=subprocess.PIPE,
-                                              shell = False, close_fds = False);
-
-            sOutput, _ = oProcess.communicate(sInput);
+                                              stderr=subprocess.PIPE, shell = False, close_fds = False);
+
+            sOutput, sError = oProcess.communicate(sInput);
             iExitCode  = oProcess.poll();
 
             if iExitCode is not 0:
-                print(sOutput);
-                raise subprocess.CalledProcessError(iExitCode, asArgs);
+                fRc = False;
         except:
             reporter.errorXcpt();
-            return (False, None);
-        reporter.log('Exit code [sudo]: %s (%s)' % (True, asArgs));
-        return (True, str(sOutput));
+            fRc = False;
+        reporter.log('Exit code [sudo]: %s (%s)' % (fRc, asArgs));
+        return (fRc, str(sOutput), str(sError));
 
     def _execLocallyOrThroughTxs(self, sExec, asArgs, sInput, cMsTimeout):
@@ -148 +150 @@
         if self.oTxsSession is not None:
             oStdOut = StdInOutBuffer();
+            oStdErr = StdInOutBuffer();
             oStdIn = None;
             if sInput is not None:
@@ -155 +158 @@
             fRc = self.oTxsSession.syncExecEx(sExec, (sExec,) + asArgs,
                                               oStdIn = oStdIn, oStdOut = oStdOut,
-                                              cMsTimeout = cMsTimeout);
+                                              oStdErr = oStdErr, cMsTimeout = cMsTimeout);
             sOutput = oStdOut.getOutput();
-        else:
-            fRc, sOutput = self._sudoExecuteSync([sExec, ] + list(asArgs), sInput);
-        return (fRc, sOutput);
+            sError = oStdErr.getOutput();
+        else:
+            fRc, sOutput, sError = self._sudoExecuteSync([sExec, ] + list(asArgs), sInput);
+        return (fRc, sOutput, sError);
 
     def execBinary(self, sExec, asArgs, sInput = None, cMsTimeout = 3600000):
@@ -171 +175 @@
         fRc = True;
         sOutput = None;
+        sError = None;
         sBinary = self._getBinaryPath(sExec);
         if sBinary is not None:
-            fRc, sOutput = self._execLocallyOrThroughTxs(sBinary, asArgs, sInput, cMsTimeout);
+            fRc, sOutput, sError = self._execLocallyOrThroughTxs(sBinary, asArgs, sInput, cMsTimeout);
         else:
             fRc = False;
-        return (fRc, sOutput);
+        return (fRc, sOutput, sError);
 
     def execBinaryNoStdOut(self, sExec, asArgs, sInput = None):
@@ -184 +189 @@
         returning whether the process exited successfully.
         """
-        fRc, _ = self.execBinary(sExec, asArgs, sInput);
+        fRc, _, _ = self.execBinary(sExec, asArgs, sInput);
         return fRc;
 

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

@@ -150 +150 @@
         fRc = True;
         if sZPoolRaid is not None:
-            fRc = oExec.execBinary('zpool', ('create', '-f', sPool, sZPoolRaid,) + tuple(asDisks));
+            fRc = oExec.execBinaryNoStdOut('zpool', ('create', '-f', sPool, sZPoolRaid,) + tuple(asDisks));
         else:
             fRc = False;
@@ -163 +163 @@
         fRc = True;
         if cbVol is not None:
-            fRc, _ = oExec.execBinary('zfs', ('create', '-o', 'mountpoint='+sMountPoint, '-V', cbVol, sPool + '/' + sVol));
-        else:
-            fRc, _ = oExec.execBinary('zfs', ('create', '-o', 'mountpoint='+sMountPoint, sPool + '/' + sVol));
+            fRc = oExec.execBinaryNoStdOut('zfs', ('create', '-o', 'mountpoint='+sMountPoint, '-V', cbVol, sPool + '/' + sVol));
+        else:
+            fRc = oExec.execBinaryNoStdOut('zfs', ('create', '-o', 'mountpoint='+sMountPoint, sPool + '/' + sVol));
 
         return fRc;
@@ -173 +173 @@
         Destroys the given volume.
         """
-        fRc, _ = oExec.execBinary('zfs', ('destroy', sPool + '/' + sVol));
+        fRc = oExec.execBinaryNoStdOut('zfs', ('destroy', sPool + '/' + sVol));
         return fRc;
 
@@ -180 +180 @@
         Destroys the given storage pool.
         """
-        fRc, _ = oExec.execBinary('zpool', ('destroy', sPool));
+        fRc = oExec.execBinaryNoStdOut('zpool', ('destroy', sPool));
         return fRc;
 
@@ -289 +289 @@
             if cbVol is not None:
                 sFdiskScript = ',' + str(cbVol / 512) + '\n'; # Get number of sectors
-            fRc, _ = oExec.execBinary('sfdisk', ('--no-reread', '--wipe', 'always', '-q', '-f', sDiskPath), sFdiskScript);
+            fRc = oExec.execBinaryNoStdOut('sfdisk', ('--no-reread', '--wipe', 'always', '-q', '-f', sDiskPath), sFdiskScript);
             if fRc:
                 if sDiskPath.find('nvme') is not -1:
@@ -318 +318 @@
         # Unmount first
         sMountPoint = self.dMounts[sPool + '/' + sVol];
-        fRc, _ = oExec.execBinary('umount', (sMountPoint,));
+        fRc = oExec.execBinaryNoStdOut('umount', (sMountPoint,));
         self.dMounts.pop(sPool + '/' + sVol);
         oExec.rmDir(sMountPoint);

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

@@ -84 +84 @@
         self.sCfgFileId = None;
         self.dCfg       = dCfg;
+        self.sError     = None;
+        self.sResult    = None;
 
     def prepare(self, cMsTimeout = 30000):
@@ -127 +129 @@
         """ Runs the testcase """
         _ = cMsTimeout
-        fRc, sOutput = self.oExecutor.execBinary('fio', (self.sCfgFileId,), cMsTimeout = cMsTimeout);
-        # @todo: Parse output.
-        _ = sOutput;
+        fRc, sOutput, sError = self.oExecutor.execBinary('fio', (self.sCfgFileId,), cMsTimeout = cMsTimeout);
+        if fRc:
+            self.sResult = sOutput;
+        else:
+            self.sError = ('Binary: fio\n' +
+                           '\nOutput:\n\n' +
+                           sOutput +
+                           '\nError:\n\n' +
+                           sError);
         return fRc;
 
@@ -140 +148 @@
         """
         return True;
+
+    def getErrorReport(self):
+        """
+        Returns the error report in case the testcase failed.
+        """
+        return self.sError;
 
 class IozoneTest(object):
@@ -148 +162 @@
         self.oExecutor = oExecutor;
         self.sResult = None;
+        self.sError = None;
         self.lstTests = [ ('initial writers', 'FirstWrite'),
                           ('rewriters',       'Rewrite'),
@@ -182 +197 @@
         if self.fDirectIo:
             tupArgs += ('-I',);
-        fRc, sOutput = self.oExecutor.execBinary('iozone', tupArgs, cMsTimeout = cMsTimeout);
+        fRc, sOutput, sError = self.oExecutor.execBinary('iozone', tupArgs, cMsTimeout = cMsTimeout);
         if fRc:
             self.sResult = sOutput;
+        else:
+            self.sError = ('Binary: iozone\n' +
+                           '\nOutput:\n\n' +
+                           sOutput +
+                           '\nError:\n\n' +
+                           sError);
 
         _ = cMsTimeout;
@@ -233 +254 @@
         return fRc;
 
+    def getErrorReport(self):
+        """
+        Returns the error report in case the testcase failed.
+        """
+        return self.sError;
 
 class StorTestCfgMgr(object):
@@ -894 +920 @@
                 else:
                     reporter.testFailure('Running the testcase failed');
+                    reporter.addLogString(oTst.getErrorReport(), sBenchmark + '.log',
+                                          'log/release/client', 'Benchmark raw output');
             else:
                 reporter.testFailure('Preparing the testcase failed');