Changeset 66244 in vbox

Timestamp:

Mar 24, 2017 12:14:06 PM (8 years ago)

Author:

vboxsync

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

114165

Message:

ValidationKit/tests/storage: Implement option to use a ramdisk for backing the disk images

Location:

trunk/src/VBox/ValidationKit/tests/storage

Files:

• storagecfg.py (modified) (12 diffs)
• tdStorageBenchmark1.py (modified) (8 diffs)

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

@@ -8 +8 @@
 __copyright__ = \
 """
-Copyright (C) 2016 Oracle Corporation
+Copyright (C) 2016-2017 Oracle Corporation
 
 This file is part of VirtualBox Open Source Edition (OSE), as
@@ -38 +38 @@
     """
 
-    def __init__(self, sPath):
-        self.sPath   = sPath;
-        self.fUsed   = False;
+    def __init__(self, sPath, fRamDisk = False):
+        self.sPath    = sPath;
+        self.fUsed    = False;
+        self.fRamDisk = fRamDisk;
 
     def getPath(self):
@@ -53 +54 @@
         """
         return self.fUsed;
+
+    def isRamDisk(self):
+        """
+        Returns whether the disk objecthas a RAM backing.
+        """
+        return self.fRamDisk;
 
     def setUsed(self, fUsed):
@@ -94 +101 @@
     def __init__(self):
         StorageConfigOs.__init__(self);
+        self.idxRamDisk = 0;
 
     def _getActivePoolsStartingWith(self, oExec, sPoolIdStart):
@@ -211 +219 @@
         return fRc;
 
+    def createRamDisk(self, oExec, cbRamDisk):
+        """
+        Creates a RAM backed disk with the given size.
+        """
+        oDisk = None;
+        sRamDiskName = 'ramdisk%u' % (self.idxRamDisk,);
+        fRc, sOut, _ = oExec.execBinary('ramdiskadm', '-a', sRamDiskName, str(cbRamDisk));
+        if fRc:
+            self.idxRamDisk += 1;
+            oDisk = StorageDisk(sOut.rstrip(), True);
+
+        return oDisk;
+
+    def destroyRamDisk(self, oExec, oDisk):
+        """
+        Destroys the given ramdisk object.
+        """
+        sRamDiskName = os.path.basename(oDisk.getPath());
+        return oExec.execBinaryNoStdOut('ramdiskadm', ('-d', sRamDiskName));
+
 class StorageConfigOsLinux(StorageConfigOs):
     """
@@ -285 +313 @@
         if self.dSimplePools.has_key(sPool):
             sDiskPath = self.dSimplePools.get(sPool);
-            # Create a partition with the requested size
-            sFdiskScript = ';\n'; # Single partition filling everything
-            if cbVol is not None:
-                sFdiskScript = ',' + str(cbVol / 512) + '\n'; # Get number of sectors
-            fRc = oExec.execBinaryNoStdOut('sfdisk', ('--no-reread', '--wipe', 'always', '-q', '-f', sDiskPath), sFdiskScript);
-            if fRc:
-                if sDiskPath.find('nvme') != -1:
-                    sBlkDev = sDiskPath + 'p1';
-                else:
-                    sBlkDev = sDiskPath + '1';
+            if sDiskPath.find('zram') != -1:
+                sBlkDev = sDiskPath;
+            else:
+                # Create a partition with the requested size
+                sFdiskScript = ';\n'; # Single partition filling everything
+                if cbVol is not None:
+                    sFdiskScript = ',' + str(cbVol / 512) + '\n'; # Get number of sectors
+                fRc = oExec.execBinaryNoStdOut('sfdisk', ('--no-reread', '--wipe', 'always', '-q', '-f', sDiskPath), \
+                                               sFdiskScript);
+                if fRc:
+                    if sDiskPath.find('nvme') != -1:
+                        sBlkDev = sDiskPath + 'p1';
+                    else:
+                        sBlkDev = sDiskPath + '1';
         else:
             if cbVol is None:
@@ -324 +356 @@
             # Wipe partition table
             sDiskPath = self.dSimplePools.get(sPool);
-            fRc = oExec.execBinaryNoStdOut('sfdisk', ('--no-reread', '--wipe', 'always', '-q', '-f', '--delete', sDiskPath));
+            if sDiskPath.find('zram') == -1:
+                fRc = oExec.execBinaryNoStdOut('sfdisk', ('--no-reread', '--wipe', 'always', '-q', '-f', '--delete', \
+                                               sDiskPath));
         else:
             fRc = oExec.execBinaryNoStdOut('lvremove', (sPool + '/' + sVol,));
@@ -351 +385 @@
         _ = sVolIdStart;
         return True;
+
+    def createRamDisk(self, oExec, cbRamDisk):
+        """
+        Creates a RAM backed disk with the given size.
+        """
+        # Make sure the ZRAM module is loaded.
+        oDisk = None;
+        fRc = oExec.execBinaryNoStdOut('modprobe', ('zram',));
+        if fRc:
+            fRc, sOut, _ = oExec.execBinary('zramctl', ('--raw', '-f', '-s', str(cbRamDisk)));
+            if fRc:
+                oDisk = StorageDisk(sOut.rstrip(), True);
+
+        return oDisk;
+
+    def destroyRamDisk(self, oExec, oDisk):
+        """
+        Destroys the given ramdisk object.
+        """
+        return oExec.execBinaryNoStdOut('zramctl', ('-r', oDisk.getPath()));
 
 class StorageCfg(object):
@@ -427 +481 @@
         return cDisksUnused;
 
-    def createStoragePool(self, cDisks = 0, sRaidLvl = None):
+    def createStoragePool(self, cDisks = 0, sRaidLvl = None,
+                          cbPool = None, fRamDisk = False):
         """
         Create a new storage pool
@@ -435 +490 @@
         sPool = None;
 
-        if cDisks == 0:
-            cDisks = self.getUnusedDiskCount();
-
-        for oDisk in self.lstDisks:
-            if not oDisk.isUsed():
-                oDisk.setUsed(True);
+        if fRamDisk:
+            oDisk = self.oStorOs.createRamDisk(self.oExec, cbPool);
+            if oDisk is not None:
                 lstDisks.append(oDisk);
-                if len(lstDisks) == cDisks:
-                    break;
+                cDisks = 1;
+        else:
+            if cDisks == 0:
+                cDisks = self.getUnusedDiskCount();
+
+            for oDisk in self.lstDisks:
+                if not oDisk.isUsed():
+                    oDisk.setUsed(True);
+                    lstDisks.append(oDisk);
+                    if len(lstDisks) == cDisks:
+                        break;
 
         # Enough drives to satisfy the request?
@@ -468 +529 @@
             for oDisk in lstDisks:
                 oDisk.setUsed(False);
+                if oDisk.isRamDisk():
+                    self.oStorOs.destroyRamDisk(self.oExec, oDisk);
 
         return fRc, sPool;
@@ -484 +547 @@
                 for oDisk in lstDisks:
                     oDisk.setUsed(False);
+                    if oDisk.isRamDisk():
+                        self.oStorOs.destroyRamDisk(self.oExec, oDisk);
         else:
             fRc = False;

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

@@ -9 +9 @@
 __copyright__ = \
 """
-Copyright (C) 2012-2016 Oracle Corporation
+Copyright (C) 2012-2017 Oracle Corporation
 
 This file is part of VirtualBox Open Source Edition (OSE), as
@@ -430 +430 @@
             'TestsetSize': '20g',
             'QueueDepth':  '32',
-            'DiskSizeGb':  100
+            'DiskSizeGb':  30
         },
         # For stress testing which takes a lot of time.
@@ -500 +500 @@
         self.sIoLogPath              = self.sIoLogPathDef;
         self.fIoLog                  = False;
+        self.fUseRamDiskDef          = False;
+        self.fUseRamDisk             = self.fUseRamDiskDef;
 
     #
@@ -552 +554 @@
         reporter.log('  --enable-io-log');
         reporter.log('      Whether to enable I/O logging for each test');
+        reporter.log('  --use-ramdisk');
+        reporter.log('      Default: %s' % (self.fUseRamDiskDef));
         return rc;
 
@@ -641 +645 @@
         elif asArgs[iArg] == '--enable-io-log':
             self.fIoLog = True;
+        elif asArgs[iArg] == '--use-ramdisk':
+            self.fUseRamDisk = True;
         else:
             return vbox.TestDriver.parseOption(self, asArgs, iArg);
@@ -703 +709 @@
     #
 
-    def prepareStorage(self, oStorCfg):
+    def prepareStorage(self, oStorCfg, fRamDisk = False, cbPool = None):
         """
         Prepares the host storage for disk images or direct testing on the host.
@@ -709 +715 @@
         # Create a basic pool with the default configuration.
         sMountPoint = None;
-        fRc, sPoolId = oStorCfg.createStoragePool();
+        fRc, sPoolId = oStorCfg.createStoragePool(cbPool = cbPool, fRamDisk = fRamDisk);
         if fRc:
             fRc, sMountPoint = oStorCfg.createVolume(sPoolId);
@@ -984 +990 @@
             # for benchmarks
             if self.fRecreateStorCfg:
-                sMountPoint = self.prepareStorage(self.oStorCfg);
+                sMountPoint = self.prepareStorage(self.oStorCfg, self.fUseRamDisk, cbDisk);
                 if sMountPoint is not None:
                     # Create a directory where every normal user can write to.