Changeset 63746 in vbox

Timestamp:

Sep 7, 2016 10:31:07 AM (9 years ago)

Author:

vboxsync

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

110536

Message:

ValidationKit/tdStorageBenchmark: Add option to test the different host I/O cache settings for each controller

Location:

trunk/src/VBox/ValidationKit

Files:

• testdriver/vboxwrappers.py (modified) (1 diff)
• tests/storage/tdStorageBenchmark1.py (modified) (11 diffs)

trunk/src/VBox/ValidationKit/testdriver/vboxwrappers.py

@@ -1636 +1636 @@
         return False
 
+    def setStorageControllerHostIoCache(self, sController, fUseHostIoCache):
+        """
+        Set maximum ports count for storage controller
+        """
+        try:
+            oCtl = self.o.machine.getStorageControllerByName(sController);
+            oCtl.useHostIOCache = fUseHostIoCache;
+            self.oTstDrv.processPendingEvents();
+            reporter.log('set controller "%s" host I/O cache setting to %r' % (sController, fUseHostIoCache));
+            return True;
+        except:
+            reporter.log('unable to set storage controller "%s" host I/O cache setting to %r' % (sController, fUseHostIoCache));
+
+        return False;
+
     def setBootOrder(self, iPosition, eType):
         """

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

@@ -424 +424 @@
     };
 
+    kdHostIoCacheDescs = {
+        'default'        : 'HostCacheDef',
+        'hostiocache'    : 'HostCacheOn',
+        'no-hostiocache' : 'HostCacheOff'
+    };
+
     # Array indexes for the test configs.
     kiVmName      = 0;
     kiStorageCtrl = 1;
-    kiDiskFmt     = 2;
-    kiDiskVar     = 3;
-    kiCpuCount    = 4;
-    kiVirtMode    = 5;
-    kiIoTest      = 6;
-    kiTestSet     = 7;
+    kiHostIoCache = 2
+    kiDiskFmt     = 3;
+    kiDiskVar     = 4;
+    kiCpuCount    = 5;
+    kiVirtMode    = 6;
+    kiIoTest      = 7;
+    kiTestSet     = 8;
 
     def __init__(self):
@@ -446 +453 @@
         self.asStorageCtrlsDef       = ['AHCI', 'IDE', 'LsiLogicSAS', 'LsiLogic', 'BusLogic', 'NVMe'];
         self.asStorageCtrls          = self.asStorageCtrlsDef;
+        self.asHostIoCacheDef        = ['default', 'hostiocache', 'no-hostiocache'];
+        self.asHostIoCache           = self.asHostIoCacheDef;
         self.asDiskFormatsDef        = ['VDI', 'VMDK', 'VHD', 'QED', 'Parallels', 'QCOW', 'iSCSI'];
         self.asDiskFormats           = self.asDiskFormatsDef;
@@ -475 +484 @@
         reporter.log('  --storage-ctrls <type1[:type2[:...]]>');
         reporter.log('      Default: %s' % (':'.join(self.asStorageCtrlsDef)));
+        reporter.log('  --host-io-cache <setting1[:setting2[:...]]>');
+        reporter.log('      Default: %s' % (':'.join(self.asHostIoCacheDef)));
         reporter.log('  --disk-formats  <type1[:type2[:...]]>');
         reporter.log('      Default: %s' % (':'.join(self.asDiskFormatsDef)));
@@ -480 +491 @@
         reporter.log('      Default: %s' % (':'.join(self.asDiskVariantsDef)));
         reporter.log('  --iscsi-targets     <target1[:target2[:...]]>');
-        reporter.log('      Default: %s' % (':'.join(self.asIscsiTargets)));
+        reporter.log('      Default: %s' % (':'.join(self.asIscsiTargetsDef)));
         reporter.log('  --tests         <test1[:test2[:...]]>');
-        reporter.log('      Default: %s' % (':'.join(self.asTests)));
+        reporter.log('      Default: %s' % (':'.join(self.asTestsDef)));
         reporter.log('  --test-sets     <set1[:set2[:...]]>');
-        reporter.log('      Default: %s' % (':'.join(self.asTestSets)));
+        reporter.log('      Default: %s' % (':'.join(self.asTestSetsDef)));
         reporter.log('  --test-vms      <vm1[:vm2[:...]]>');
         reporter.log('      Test the specified VMs in the given order. Use this to change');
@@ -530 +541 @@
                 raise base.InvalidOption('The "--storage-ctrls" takes a colon separated list of Storage controller types');
             self.asStorageCtrls = asArgs[iArg].split(':');
+        elif asArgs[iArg] == '--host-io-cache':
+            iArg += 1;
+            if iArg >= len(asArgs):
+                raise base.InvalidOption('The "--host-io-cache" takes a colon separated list of I/O cache settings');
+            self.asHostIoCache = asArgs[iArg].split(':');
         elif asArgs[iArg] == '--disk-formats':
             iArg += 1;
@@ -780 +796 @@
             return False;
 
+        # IDE does not support the no host I/O cache setting
+        if     asTestCfg[self.kiHostIoCache] == 'no-hostiocache' \
+           and asTestCfg[self.kiStorageCtrl] == 'IDE':
+            return False;
+
         return True;
 
@@ -797 +818 @@
         """
         return self.kdVirtModeDescs[sVirtMode];
+
+    def fnFormatHostIoCache(self, sHostIoCache):
+        """
+        Formats the host I/O cache mode to be a little less cryptic for use in test
+        descriptions.
+        """
+        return self.kdHostIoCacheDescs[sHostIoCache];
 
     def testBenchmark(self, sTargetOs, sBenchmark, sMountpoint, oExecutor, dTestSet):
@@ -828 +856 @@
         return fRc;
 
-    def testOneCfg(self, sVmName, eStorageController, sDiskFormat, sDiskVariant, # pylint: disable=R0913
-                   sDiskPath, cCpus, sIoTest, sVirtMode, sTestSet):
+    def testOneCfg(self, sVmName, eStorageController, sHostIoCache, sDiskFormat, # pylint: disable=R0913,R0915
+                   sDiskVariant, sDiskPath, cCpus, sIoTest, sVirtMode, sTestSet):
         """
         Runs the specified VM thru test #1.
@@ -870 +898 @@
             fRc = oSession.ensureControllerAttached(_ControllerTypeToName(eStorageController));
             fRc = fRc and oSession.setStorageControllerType(eStorageController, _ControllerTypeToName(eStorageController));
+
+            if sHostIoCache == 'hostiocache':
+                fRc = fRc and oSession.setStorageControllerHostIoCache(_ControllerTypeToName(eStorageController), True);
+            elif sHostIoCache == 'no-hostiocache':
+                fRc = fRc and oSession.setStorageControllerHostIoCache(_ControllerTypeToName(eStorageController), False);
 
             iDevice = 0;
@@ -987 +1020 @@
         aasTestCfgs.insert(self.kiVmName,      self.asTestVMs);
         aasTestCfgs.insert(self.kiStorageCtrl, self.asStorageCtrls);
+        aasTestCfgs.insert(self.kiHostIoCache, (self.asHostIoCache, self.fnFormatHostIoCache));
         aasTestCfgs.insert(self.kiDiskFmt,     self.asDiskFormats);
         aasTestCfgs.insert(self.kiDiskVar,     self.asDiskVariants);
@@ -1003 +1037 @@
         while len(asTestCfg) > 0:
             fRc = self.testOneCfg(asTestCfg[self.kiVmName], self.getStorageCtrlFromName(asTestCfg[self.kiStorageCtrl]), \
-                                  asTestCfg[self.kiDiskFmt], asTestCfg[self.kiDiskVar], sDiskPath, \
-                                  asTestCfg[self.kiCpuCount], asTestCfg[self.kiIoTest], asTestCfg[self.kiVirtMode], \
-                                  asTestCfg[self.kiTestSet]) and fRc and True; # pychecker hack.
+                                  asTestCfg[self.kiHostIoCache], asTestCfg[self.kiDiskFmt], asTestCfg[self.kiDiskVar],
+                                  sDiskPath, asTestCfg[self.kiCpuCount], asTestCfg[self.kiIoTest], \
+                                  asTestCfg[self.kiVirtMode], asTestCfg[self.kiTestSet]) and fRc and True; # pychecker hack.
 
             asTestCfg = oTstCfgMgr.getNextTestCfg();