Merge 005e724 into cbd7226

Makefile

@@ -64,7 +64,7 @@ SM_LIBS += fcoelib
 SM_LIBS += constants
 SM_LIBS += cbtutil
 
-UDEV_RULES = 40-multipath 55-xs-mpath-scsidev 57-usb 58-xapi
+UDEV_RULES = 65-multipath 55-xs-mpath-scsidev 57-usb 58-xapi
 MPATH_DAEMON = sm-multipath
 MPATH_CONF = multipath.conf
 SMLOG_CONF = SMlog

drivers/mpath_cli.py

@@ -59,10 +59,8 @@ def reconfigure():
 
 def is_working():
     cmd="help"
-    util.SMlog("mpath cmd: %s" % cmd)
     try:
         (rc,stdout,stderr) = util.doexec(mpathcmd,cmd)
-	util.SMlog("mpath output: %s" % stdout)
 	m=regex3.search(stdout)
 	if m:
 	    return True

mk/sm.spec.in

@@ -327,7 +327,7 @@ tests/run_python_unittests.sh
 %{_unitdir}/usb-scan.socket
 %{_unitdir}/mpathcount.service
 %{_unitdir}/mpathcount.socket
-%config /etc/udev/rules.d/40-multipath.rules
+%config /etc/udev/rules.d/65-multipath.rules
 %config /etc/udev/rules.d/55-xs-mpath-scsidev.rules
 %config /etc/udev/rules.d/58-xapi.rules
 %config /etc/multipath.xenserver/multipath.conf

udev/65-multipath.rules

@@ -0,0 +1,16 @@
+SUBSYSTEM!="block", GOTO="end_mpath"
+KERNEL=="nbd*", GOTO="end_mpath"
+KERNEL=="td[a-z]*", GOTO="end_mpath"
+
+IMPORT{db}="DM_MULTIPATH_DEVICE_PATH"
+ACTION=="add",  ENV{DM_MULTIPATH_DEVICE_PATH}=="1", GOTO="count_mpath"
+ACTION=="remove", ENV{DM_MULTIPATH_DEVICE_PATH}=="1",  GOTO="count_mpath"
+IMPORT{db}="DM_ACTION"
+ACTION=="change", ENV{DM_ACTION}=="PATH_REINSTATED", GOTO="count_mpath"
+ACTION=="change", ENV{DM_ACTION}=="PATH_FAILED", GOTO="count_mpath"
+GOTO="end_mpath"
+
+LABEL="count_mpath"
+ACTION=="add|change", PROGRAM=="/sbin/dmsetup info -c -o name --noheadings -j %M -m %m", RESULT=="?*", SYMLINK+="disk/by-scsid/%c/mapper"
+ACTION=="*", RUN+="/opt/xensource/libexec/kickpipe mpathcount"
+LABEL="end_mpath"