Change in vdsm[master]: multipath.getMPDevNamesIter() return /dev/mapper.

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


Eduardo has uploaded a new change for review.

Change subject: multipath.getMPDevNamesIter() return /dev/mapper.
......................................................................

multipath.getMPDevNamesIter() return /dev/mapper.

multipath names return the /dev/mapper part of the path for
consistency with lvm module.

Change-Id: I1ec54147205992ac130684d01e73cd7aceccad48
Signed-off-by: Eduardo <ewarszaw at redhat.com>
---
M vdsm/storage/devicemapper.py
M vdsm/storage/hsm.py
M vdsm/storage/lvm.py
M vdsm/storage/multipath.py
4 files changed, 7 insertions(+), 9 deletions(-)


  git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/67/17967/1

diff --git a/vdsm/storage/devicemapper.py b/vdsm/storage/devicemapper.py
index 451c736..686b453 100644
--- a/vdsm/storage/devicemapper.py
+++ b/vdsm/storage/devicemapper.py
@@ -27,11 +27,11 @@
 from supervdsm import getProxy
 from vdsm.constants import EXT_DMSETUP
 
-DMPATH_FORMAT = "/dev/mapper/%s"
+DMPATH_PREFIX = "/dev/mapper/"
 
 
 def getDmId(deviceMultipathName):
-    devlinkPath = DMPATH_FORMAT % deviceMultipathName
+    devlinkPath = os.path.join(DMPATH_PREFIX, deviceMultipathName)
     try:
         devStat = os.stat(devlinkPath)
     except OSError:
diff --git a/vdsm/storage/hsm.py b/vdsm/storage/hsm.py
index c754ee8..6459d75 100644
--- a/vdsm/storage/hsm.py
+++ b/vdsm/storage/hsm.py
@@ -2028,7 +2028,8 @@
             se.VolumeGroupCreateError(str(vgname), str(devlist)))
         misc.validateUUID(vgname, 'vgname')
         # getSharedLock(connectionsResource...)
-        knowndevs = set(multipath.getMPDevNamesIter())
+        knowndevs = set(os.path.basename(p) for p
+                        in multipath.getMPDevNamesIter())
         size = 0
         devices = []
 
@@ -3113,7 +3114,7 @@
         """
         supervdsm.getProxy().appropriateDevice(guid, thiefId)
         supervdsm.getProxy().udevTrigger(guid)
-        devPath = devicemapper.DMPATH_FORMAT % guid
+        devPath = os.path.join(devicemapper.DMPATH_PREFIX, guid)
         utils.retry(partial(fileUtils.validateQemuReadable, devPath),
                     expectedException=OSError,
                     timeout=QEMU_READABLE_TIMEOUT)
diff --git a/vdsm/storage/lvm.py b/vdsm/storage/lvm.py
index 8fc42c4..8f957ec 100644
--- a/vdsm/storage/lvm.py
+++ b/vdsm/storage/lvm.py
@@ -130,10 +130,7 @@
 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'))
+    dmPaths = [dev.replace(r'\x', r'\\x') for dev in strippeds]
     filt = '|'.join(dmPaths)
     if len(filt) > 0:
         filt = "'a|" + filt + "|', "
diff --git a/vdsm/storage/multipath.py b/vdsm/storage/multipath.py
index 924d747..1f9773c 100644
--- a/vdsm/storage/multipath.py
+++ b/vdsm/storage/multipath.py
@@ -381,7 +381,7 @@
 
 def getMPDevNamesIter():
     for _, name in getMPDevsIter():
-        yield name
+        yield os.path.join(devicemapper.DMPATH_PREFIX, name)
 
 
 def getMPDevsIter():


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

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


More information about the vdsm-patches mailing list