vbox的更動 62052 路徑 trunk/src/VBox/ValidationKit

時間撮記:

2016-7-6 下午12:41:01 (8 年 以前)

作者:

vboxsync

訊息:

ValidationKit/tests/storage: Fixes to get the testcase working on a host

位置:

trunk/src/VBox/ValidationKit/tests/storage

檔案:

• storagecfg.py (修改) (5 筆差異)
• tdStorageBenchmark1.py (修改) (8 筆差異)

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

@@ -117 +117 @@
         fRc = True;
         if sZPoolRaid is not None:
-            fRc = oExec.execBinary('zpool', ('create', sPool, sZPoolRaid,) + asDisks);
+            fRc = oExec.execBinary('zpool', ('create', '-f', sPool, sZPoolRaid,) + tuple(asDisks));
         else:
             fRc = False;
@@ -214 +214 @@
 
     kdStorageCfgs = {
-        'testboxstor1': ('solaris', 'c[3-9]t*d0')
+        'testboxstor1.de.oracle.com': ('solaris', 'c[3-9]t\dd0\Z')
     };
 
@@ -315 +315 @@
 
             # Find a name for the pool
-            sPool = 'pool' + self.iPoolId;
+            sPool = 'pool' + str(self.iPoolId);
             self.iPoolId += 1;
 
@@ -359 +359 @@
         sMountPoint = None;
         if self.dPools.has_key(sPool):
-            sVol = 'vol' + self.iVolId;
+            sVol = 'vol' + str(self.iVolId);
             sMountPoint = self.oStorOs.getMntBase() + '/' + sVol;
             self.iVolId += 1;
@@ -382 +382 @@
             fRc = self.oStorOs.destroyVolume(self.oExec, sPool, sVol);
             if fRc:
-                self.dVols.pop(sVol);
-        else:
-            fRc = False;
-
-        return fRc;
-
+                self.dVols.pop(sMountPoint);
+        else:
+            fRc = False;
+
+        return fRc;
+

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

@@ -74 +74 @@
 
     kdHostIoEngine = {
-        'solaris': 'solarisaio',
-        'linux':   'libaio'
+        'solaris': ('solarisaio', False),
+        'linux':   ('libaio', True)
     };
 
@@ -87 +87 @@
 
         sTargetOs = self.dCfg.get('TargetOs', 'linux');
-        sIoEngine = self.kdHostIoEngine.get(sTargetOs);
+        sIoEngine, fDirectIo = self.kdHostIoEngine.get(sTargetOs);
         if sIoEngine is None:
             return False;
@@ -97 +97 @@
         cfgBuf.write('iodepth=' + self.dCfg.get('QueueDepth', '32') + '\n');
         cfgBuf.write('size=' + self.dCfg.get('TestsetSize', '2g') + '\n');
-        cfgBuf.write('direct=1\n');
+        if fDirectIo:
+            cfgBuf.write('direct=1\n');
+        else:
+            cfgBuf.write('direct=0\n');
         cfgBuf.write('directory=' + self.dCfg.get('FilePath', '/mnt') + '\n');
 
@@ -116 +119 @@
         cfgBuf.write('stonewall\n');
 
-        self.sCfgFileId = self.oExecutor.copyString(cfgBuf, 'aio-test', cMsTimeout);
+        self.sCfgFileId = self.oExecutor.copyString(cfgBuf.getvalue(), 'aio-test', cMsTimeout);
         return self.sCfgFileId is not None;
 
@@ -157 +160 @@
         self.sQueueDepth  = dCfg.get('QueueDepth',  '32');
         self.sFilePath    = dCfg.get('FilePath',    '/mnt/iozone');
+        self.fDirectIo    = True;
+
+        sTargetOs = dCfg.get('TargetOs');
+        if sTargetOs == 'solaris':
+            self.fDirectIo = False;
 
     def prepare(self, cMsTimeout = 30000):
@@ -165 +173 @@
     def run(self, cMsTimeout = 30000):
         """ Runs the testcase """
-        fRc, sOutput = self.oExecutor.execBinary('iozone', ('-r', self.sRecordSize, '-s', self.sTestsetSize, \
-                                                            '-t', '1', '-T', '-I', \
-                                                            '-H', self.sQueueDepth,'-F', self.sFilePath));
+        tupArgs = ('-r', self.sRecordSize, '-s', self.sTestsetSize, \
+                   '-t', '1', '-T', '-H', self.sQueueDepth, '-F', self.sFilePath + '/iozone.tmp');
+        if self.fDirectIo:
+            tupArgs += ('-I',);
+        fRc, sOutput = self.oExecutor.execBinary('iozone', tupArgs);
         if fRc:
             self.sResult = sOutput;
@@ -389 +399 @@
         # Create a basic pool with the default configuration.
         oStorCfg = storagecfg.StorageCfg(oExecutor, socket.gethostname().lower());
-        fRc, sPoolId = oStorCfg.createStoragePool(oExecutor);
+        fRc, sPoolId = oStorCfg.createStoragePool();
         if fRc:
             fRc, sMountpoint = oStorCfg.createVolume(sPoolId);
             if fRc:
-
                 # Create a basic config
                 dCfg = {
@@ -424 +433 @@
                     reporter.testDone();
             else:
-                reporter.testFailure('Creating a storage pool on the target failed');
+                reporter.testFailure('Creating a storage volume on the target failed');
 
             oStorCfg.cleanup();
+        else:
+            reporter.testFailure('Creating a storage pool on the target failed');
 
         return fRc;