[NEW PATCH] BZ#732980 Devices block size must be 512 (via gerrit-bot)

Federico Simoncelli fsimonce at redhat.com
Fri Sep 2 16:45:03 UTC 2011


New patch submitted by Federico Simoncelli (fsimonce at redhat.com)

You can review this change at: http://gerrit.usersys.redhat.com/855

commit e25ccf37bad08c9a5bfe6cda6c80ca6c55fa8242
Author: Federico Simoncelli <fsimonce at redhat.com>
Date:   Fri Sep 2 16:43:18 2011 +0000

    BZ#732980 Devices block size must be 512
    
    Change-Id: If303fac85a29bed7b989b0b6302fc4c83075f500

diff --git a/vdsm/storage/hsm.py b/vdsm/storage/hsm.py
index a77be87..68ec3dc 100644
--- a/vdsm/storage/hsm.py
+++ b/vdsm/storage/hsm.py
@@ -755,6 +755,8 @@ class HSM:
                         'devtype': dev.get("devtype", ""),
                         'pathstatus': dev.get("paths", []),
                         'pathlist': dev.get("connections", []),
+                        'logicalblocksize': dev.get("logicalblocksize", ""),
+                        'physicalblocksize': dev.get("physicalblocksize", ""),
                         'partitioned': partitioned}
                 for path in devInfo["pathstatus"]:
                     path["lun"] = path["hbtl"].lun
@@ -836,14 +838,24 @@ class HSM:
         knowndevs = list(multipath.getMPDevNamesIter())
         devices = []
         devSizes = []
+        devBlkSz = set()
 
         for dev in devlist:
             if dev in knowndevs:
                 devices.append(dev)
                 devSizes.append(multipath.getDeviceSize(devicemapper.getDmId(dev)))
+                devBlkSz.add(multipath.getDeviceBlockSizes(devicemapper.getDmId(dev)))
             else:
                 raise se.InvalidPhysDev(dev)
 
+        # Block size check
+        if len(devBlkSz) != 1:
+            raise se.VolumeGroupBlockSizeError("VG devices must have the same block size")
+
+        # Remove this check when we'll support different block sizes
+        if (512, 512) not in devBlkSz:
+            raise se.VolumeGroupBlockSizeError("VG devices block size must be 512")
+
         #Minimal size check
         size = sum(devSizes)
         if size < MINIMALVGSIZE:
diff --git a/vdsm/storage/multipath.py b/vdsm/storage/multipath.py
index 269e0e3..b54236f 100644
--- a/vdsm/storage/multipath.py
+++ b/vdsm/storage/multipath.py
@@ -226,6 +226,8 @@ def pathListIter(filterGuids=None):
                 "vendor" : "",
                 "product" :"",
                 "fwrev" : "",
+                "logicalblocksize" : "",
+                "physicalblocksize" : "",
                 }
 
 
@@ -252,6 +254,14 @@ def pathListIter(filterGuids=None):
                 except Exception:
                     log.warn("Problem getting fwrev from device `%s`", slave, exc_info=True)
 
+            if not devInfo["logicalblocksize"] or not devInfo["physicalblocksize"]:
+                try:
+                    logBlkSize, phyBlkSize = getDeviceBlockSizes(slave)
+                    devInfo["logicalblocksize"] = str(logBlkSize)
+                    devInfo["physicalblocksize"] = str(phyBlkSize)
+                except  Exception:
+                    log.warn("Problem getting blocksize from device `%s`", slave, exc_info=True)
+
             pathInfo = {}
             pathInfo["physdev"] = slave
             pathInfo["state"] = pathStatuses.get(slave, "failed")
diff --git a/vdsm/storage/storage_exception.py b/vdsm/storage/storage_exception.py
index 421737b..2b6c586 100644
--- a/vdsm/storage/storage_exception.py
+++ b/vdsm/storage/storage_exception.py
@@ -999,6 +999,10 @@ class VolumeGroupReplaceTagError(StorageException):
     code = 516
     message = "Replace Volume Group tag error"
 
+class VolumeGroupBlockSizeError(StorageException):
+    code = 517
+    message = "Volume Group block size error"
+
 class CannotCreateLogicalVolume(StorageException):
     code = 550
     message = "Cannot create Logical Volume"




More information about the vdsm-patches mailing list