CA-332978: Only force reload multipath on start

Signed-off-by: Mark Syms <mark.syms@citrix.com>
xapi-project · May 20, 2020 · 45c4009 · 45c4009
1 parent e3a35d7
commit 45c4009
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 4 deletions.
diff --git a/drivers/XE_SR_ERRORCODES.xml b/drivers/XE_SR_ERRORCODES.xml
@@ -773,6 +773,11 @@
                 <description>Multipath generic failure</description>
                 <value>431</value>
         </code>
+        <code>
+                <name>MultipathMapperPathMissing</name>
+                <description>Device Mapper path missing</description>
+                <value>432</value>
+        </code>
         <code>
             <name>TapdiskAlreadyRunning</name>
             <description>The tapdisk is already running</description>

diff --git a/drivers/mpath_dmp.py b/drivers/mpath_dmp.py
@@ -234,12 +234,18 @@ def _is_valid_multipath_device(sid):
 def _refresh_DMP(sid, npaths):
     if not _is_valid_multipath_device(sid):
         return
-    util.retry(lambda: util.pread2(['/usr/sbin/multipath', '-r', sid]), maxretry = 3,
-                           period = 4)
     path = os.path.join(DEVMAPPERPATH, sid)
-    util.wait_for_path(path, 10)
+    # If the mapper path doesn't exist force a reload in multipath
     if not os.path.exists(path):
-        raise xs_errors.XenError('DMP failed to activate mapper path')
+        util.retry(lambda: util.pread2(
+            ['/usr/sbin/multipath', '-r', sid]),
+                   maxretry = 3,
+                   period = 4)
+        util.wait_for_path(path, 10)
+    if not os.path.exists(path):
+        raise xs_errors.XenError('MultipathMapperPathMissing',
+                                 'Device mapper path {} not found'.format(
+                                     path))
     lvm_path = "/dev/disk/by-scsid/"+sid+"/mapper"
     util.wait_for_path(lvm_path, 10)
     activate_MPdev(sid, path)