Change in vdsm[master]: Normalize lvm._buildFilter().

ewarszaw at redhat.com ewarszaw at redhat.com
Mon Aug 12 12:48:47 UTC 2013


Eduardo has uploaded a new change for review.

Change subject: Normalize lvm._buildFilter().
......................................................................

Normalize lvm._buildFilter().

Change-Id: I2c0a5c61ba6754db996b2c88b32bedee852df22f
Signed-off-by: Eduardo <ewarszaw at redhat.com>
---
M vdsm/storage/lvm.py
1 file changed, 11 insertions(+), 15 deletions(-)


  git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/66/17966/1

diff --git a/vdsm/storage/lvm.py b/vdsm/storage/lvm.py
index bc9d30c..8fc42c4 100644
--- a/vdsm/storage/lvm.py
+++ b/vdsm/storage/lvm.py
@@ -127,16 +127,14 @@
 USER_DEV_LIST = filter(None, config.get("irs", "lvm_dev_whitelist").split(","))
 
 
-def _buildFilter(devList):
-    devList = list(devList)
-    devList.sort()
-    devs = []
-    for dev in devList:
-        strippedDev = dev.strip()
-        if strippedDev:
-            prefixedDev = os.path.join(PV_PREFIX, strippedDev)
-            devs.append(prefixedDev.replace(r'\x', r'\\x'))
-    filt = '|'.join(devs)
+def _buildFilter(devices):
+    strippeds = sorted(set(d.strip() for d in devices))
+    strippeds.discard('')  # Who has put a blank here?
+    dmPaths = []
+    for dev in strippeds:
+        dmPath = os.path.join(PV_PREFIX, dev)
+        dmPaths.append(dmPath.replace(r'\x', r'\\x'))
+    filt = '|'.join(dmPaths)
     if len(filt) > 0:
         filt = "'a|" + filt + "|', "
 
@@ -273,12 +271,10 @@
 
             return self._extraCfg
 
-    def _addExtraCfg(self, cmd, devList=None):
+    def _addExtraCfg(self, cmd, devices=tuple()):
         newcmd = [constants.EXT_LVM, cmd[0]]
-        if devList is not None:
-            devList = list(set(devList))
-            devList.sort()
-            conf = _buildConfig(devList)
+        if devices:
+            conf = _buildConfig(devices)
         else:
             conf = self._getCachedExtraCfg()
 


-- 
To view, visit http://gerrit.ovirt.org/17966
To unsubscribe, visit http://gerrit.ovirt.org/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I2c0a5c61ba6754db996b2c88b32bedee852df22f
Gerrit-PatchSet: 1
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Eduardo <ewarszaw at redhat.com>


More information about the vdsm-patches mailing list