Blame SOURCES/0262-RHBZ-1699486-reload-with-failed-paths.patch

4ae388
---
4ae388
 libmultipath/configure.c |   12 ++++++------
4ae388
 libmultipath/discovery.c |    8 ++++++--
4ae388
 multipathd/main.c        |    1 +
4ae388
 3 files changed, 13 insertions(+), 8 deletions(-)
4ae388
4ae388
Index: multipath-tools-130222/libmultipath/discovery.c
4ae388
===================================================================
4ae388
--- multipath-tools-130222.orig/libmultipath/discovery.c
4ae388
+++ multipath-tools-130222/libmultipath/discovery.c
4ae388
@@ -1264,8 +1264,12 @@ get_prio (struct path * pp)
4ae388
 		}
4ae388
 		return 1;
4ae388
 	}
4ae388
-	condlog(3, "%s: %s prio = %u",
4ae388
-		pp->dev, prio_name(p), pp->priority);
4ae388
+	if (old_prio != PRIO_UNDEF && old_prio != pp->priority)
4ae388
+		condlog(2, "%s: prio changed from %d to %d", pp->dev,
4ae388
+			old_prio, pp->priority);
4ae388
+	else
4ae388
+		condlog(3, "%s: %s prio = %u",
4ae388
+			pp->dev, prio_name(p), pp->priority);
4ae388
 	return 0;
4ae388
 }
4ae388
 
4ae388
Index: multipath-tools-130222/multipathd/main.c
4ae388
===================================================================
4ae388
--- multipath-tools-130222.orig/multipathd/main.c
4ae388
+++ multipath-tools-130222/multipathd/main.c
4ae388
@@ -1370,6 +1370,7 @@ int update_prio(struct path *pp, int ref
4ae388
 
4ae388
 int update_path_groups(struct multipath *mpp, struct vectors *vecs, int refresh)
4ae388
 {
4ae388
+	condlog(2, "%s: updating path groups %d", mpp->alias, refresh);
4ae388
 	if (reload_map(vecs, mpp, refresh))
4ae388
 		return 1;
4ae388
 
4ae388
Index: multipath-tools-130222/libmultipath/configure.c
4ae388
===================================================================
4ae388
--- multipath-tools-130222.orig/libmultipath/configure.c
4ae388
+++ multipath-tools-130222/libmultipath/configure.c
4ae388
@@ -453,12 +453,6 @@ select_action (struct multipath * mpp, v
4ae388
 		return;
4ae388
 	}
4ae388
 
4ae388
-	if (pathcount(mpp, PATH_UP) == 0) {
4ae388
-		mpp->action = ACT_NOTHING;
4ae388
-		condlog(3, "%s: set ACT_NOTHING (no usable path)",
4ae388
-			mpp->alias);
4ae388
-		return;
4ae388
-	}
4ae388
 	if (force_reload) {
4ae388
 		mpp->force_udev_reload = 1;
4ae388
 		mpp->action = ACT_RELOAD;
4ae388
@@ -466,6 +460,12 @@ select_action (struct multipath * mpp, v
4ae388
 			mpp->alias);
4ae388
 		return;
4ae388
 	}
4ae388
+	if (pathcount(mpp, PATH_UP) == 0) {
4ae388
+		mpp->action = ACT_NOTHING;
4ae388
+		condlog(3, "%s: set ACT_NOTHING (no usable path)",
4ae388
+			mpp->alias);
4ae388
+		return;
4ae388
+	}
4ae388
 	if (cmpp->size != mpp->size) {
4ae388
 		mpp->force_udev_reload = 1;
4ae388
 		mpp->action = ACT_RESIZE;