Blame SOURCES/0213-RHBZ-1430908-merge-dell-configs.patch

d88bf6
---
d88bf6
 libmultipath/hwtable.c  |   81 +-----------------------------------------------
d88bf6
 multipath.conf.defaults |   69 +---------------------------------------
d88bf6
 2 files changed, 5 insertions(+), 145 deletions(-)
d88bf6
d88bf6
Index: multipath-tools-130222/libmultipath/hwtable.c
d88bf6
===================================================================
d88bf6
--- multipath-tools-130222.orig/libmultipath/hwtable.c
d88bf6
+++ multipath-tools-130222/libmultipath/hwtable.c
d88bf6
@@ -731,91 +731,16 @@ static struct hwentry default_hw[] = {
d88bf6
 		.prio_args     = NULL,
d88bf6
 	},
d88bf6
 	{
d88bf6
-		/* DELL MD3000 */
d88bf6
+		/* DELL MD3xxxx family */
d88bf6
 		.vendor        = "DELL",
d88bf6
-		.product       = "MD3000",
d88bf6
+		.product       = "^MD3",
d88bf6
 		.bl_product    = "Universal Xport",
d88bf6
 		.features      = "2 pg_init_retries 50",
d88bf6
 		.hwhandler     = "1 rdac",
d88bf6
 		.pgpolicy      = GROUP_BY_PRIO,
d88bf6
 		.pgfailback    = -FAILBACK_IMMEDIATE,
d88bf6
 		.rr_weight     = RR_WEIGHT_NONE,
d88bf6
-		.no_path_retry = 15,
d88bf6
-		.checker_name  = RDAC,
d88bf6
-		.prio_name     = PRIO_RDAC,
d88bf6
-		.prio_args     = NULL,
d88bf6
-	},
d88bf6
-	{
d88bf6
-		/* DELL MD3000i */
d88bf6
-		.vendor        = "DELL",
d88bf6
-		.product       = "MD3000i",
d88bf6
-		.bl_product    = "Universal Xport",
d88bf6
-		.features      = "2 pg_init_retries 50",
d88bf6
-		.hwhandler     = "1 rdac",
d88bf6
-		.pgpolicy      = GROUP_BY_PRIO,
d88bf6
-		.pgfailback    = -FAILBACK_IMMEDIATE,
d88bf6
-		.rr_weight     = RR_WEIGHT_NONE,
d88bf6
-		.no_path_retry = 15,
d88bf6
-		.checker_name  = RDAC,
d88bf6
-		.prio_name     = PRIO_RDAC,
d88bf6
-		.prio_args     = NULL,
d88bf6
-	},
d88bf6
-	{
d88bf6
-		/* DELL MD32xx */
d88bf6
-		.vendor        = "DELL",
d88bf6
-		.product       = "MD32xx",
d88bf6
-		.bl_product    = "Universal Xport",
d88bf6
-		.features      = "2 pg_init_retries 50",
d88bf6
-		.hwhandler     = "1 rdac",
d88bf6
-		.pgpolicy      = GROUP_BY_PRIO,
d88bf6
-		.pgfailback    = -FAILBACK_IMMEDIATE,
d88bf6
-		.rr_weight     = RR_WEIGHT_NONE,
d88bf6
-		.no_path_retry = 15,
d88bf6
-		.checker_name  = RDAC,
d88bf6
-		.prio_name     = PRIO_RDAC,
d88bf6
-		.prio_args     = NULL,
d88bf6
-	},
d88bf6
-	{
d88bf6
-		/* DELL MD32xxi */
d88bf6
-		.vendor        = "DELL",
d88bf6
-		.product       = "MD32xxi",
d88bf6
-		.bl_product    = "Universal Xport",
d88bf6
-		.features      = "2 pg_init_retries 50",
d88bf6
-		.hwhandler     = "1 rdac",
d88bf6
-		.pgpolicy      = GROUP_BY_PRIO,
d88bf6
-		.pgfailback    = -FAILBACK_IMMEDIATE,
d88bf6
-		.rr_weight     = RR_WEIGHT_NONE,
d88bf6
-		.no_path_retry = 15,
d88bf6
-		.checker_name  = RDAC,
d88bf6
-		.prio_name     = PRIO_RDAC,
d88bf6
-		.prio_args     = NULL,
d88bf6
-	},
d88bf6
-	{
d88bf6
-		/* DELL MD36xxi */
d88bf6
-		.vendor        = "DELL",
d88bf6
-		.product       = "MD36xxi",
d88bf6
-		.bl_product    = "Universal Xport",
d88bf6
-		.features      = "2 pg_init_retries 50",
d88bf6
-		.hwhandler     = "1 rdac",
d88bf6
-		.pgpolicy      = GROUP_BY_PRIO,
d88bf6
-		.pgfailback    = -FAILBACK_IMMEDIATE,
d88bf6
-		.rr_weight     = RR_WEIGHT_NONE,
d88bf6
-		.no_path_retry = 15,
d88bf6
-		.checker_name  = RDAC,
d88bf6
-		.prio_name     = PRIO_RDAC,
d88bf6
-		.prio_args     = NULL,
d88bf6
-	},
d88bf6
-	{
d88bf6
-		/* DELL MD36xxf */
d88bf6
-		.vendor        = "DELL",
d88bf6
-		.product       = "MD36xxf",
d88bf6
-		.bl_product    = "Universal Xport",
d88bf6
-		.features      = "2 pg_init_retries 50",
d88bf6
-		.hwhandler     = "1 rdac",
d88bf6
-		.pgpolicy      = GROUP_BY_PRIO,
d88bf6
-		.pgfailback    = -FAILBACK_IMMEDIATE,
d88bf6
-		.rr_weight     = RR_WEIGHT_NONE,
d88bf6
-		.no_path_retry = 15,
d88bf6
+		.no_path_retry = 30,
d88bf6
 		.checker_name  = RDAC,
d88bf6
 		.prio_name     = PRIO_RDAC,
d88bf6
 		.prio_args     = NULL,
d88bf6
Index: multipath-tools-130222/multipath.conf.defaults
d88bf6
===================================================================
d88bf6
--- multipath-tools-130222.orig/multipath.conf.defaults
d88bf6
+++ multipath-tools-130222/multipath.conf.defaults
d88bf6
@@ -619,7 +619,7 @@
d88bf6
 #	}
d88bf6
 #	device {
d88bf6
 #		vendor "DELL"
d88bf6
-#		product "MD3000"
d88bf6
+#		product "^MD3"
d88bf6
 #		product_blacklist "Universal Xport"
d88bf6
 #		path_grouping_policy "group_by_prio"
d88bf6
 #		path_checker "rdac"
d88bf6
@@ -628,72 +628,7 @@
d88bf6
 #		prio "rdac"
d88bf6
 #		failback immediate
d88bf6
 #		rr_weight "uniform"
d88bf6
-#		no_path_retry 15
d88bf6
-#	}
d88bf6
-#	device {
d88bf6
-#		vendor "DELL"
d88bf6
-#		product "MD3000i"
d88bf6
-#		product_blacklist "Universal Xport"
d88bf6
-#		path_grouping_policy "group_by_prio"
d88bf6
-#		path_checker "rdac"
d88bf6
-#		features "2 pg_init_retries 50"
d88bf6
-#		hardware_handler "1 rdac"
d88bf6
-#		prio "rdac"
d88bf6
-#		failback immediate
d88bf6
-#		rr_weight "uniform"
d88bf6
-#		no_path_retry 15
d88bf6
-#	}
d88bf6
-#	device {
d88bf6
-#		vendor "DELL"
d88bf6
-#		product "MD32xx"
d88bf6
-#		product_blacklist "Universal Xport"
d88bf6
-#		path_grouping_policy "group_by_prio"
d88bf6
-#		path_checker "rdac"
d88bf6
-#		features "2 pg_init_retries 50"
d88bf6
-#		hardware_handler "1 rdac"
d88bf6
-#		prio "rdac"
d88bf6
-#		failback immediate
d88bf6
-#		rr_weight "uniform"
d88bf6
-#		no_path_retry 15
d88bf6
-#	}
d88bf6
-#	device {
d88bf6
-#		vendor "DELL"
d88bf6
-#		product "MD32xxi"
d88bf6
-#		product_blacklist "Universal Xport"
d88bf6
-#		path_grouping_policy "group_by_prio"
d88bf6
-#		path_checker "rdac"
d88bf6
-#		features "2 pg_init_retries 50"
d88bf6
-#		hardware_handler "1 rdac"
d88bf6
-#		prio "rdac"
d88bf6
-#		failback immediate
d88bf6
-#		rr_weight "uniform"
d88bf6
-#		no_path_retry 15
d88bf6
-#	}
d88bf6
-#	device {
d88bf6
-#		vendor "DELL"
d88bf6
-#		product "MD36xxi"
d88bf6
-#		product_blacklist "Universal Xport"
d88bf6
-#		path_grouping_policy "group_by_prio"
d88bf6
-#		path_checker "rdac"
d88bf6
-#		features "2 pg_init_retries 50"
d88bf6
-#		hardware_handler "1 rdac"
d88bf6
-#		prio "rdac"
d88bf6
-#		failback immediate
d88bf6
-#		rr_weight "uniform"
d88bf6
-#		no_path_retry 15
d88bf6
-#	}
d88bf6
-#	device {
d88bf6
-#		vendor "DELL"
d88bf6
-#		product "MD36xxf"
d88bf6
-#		product_blacklist "Universal Xport"
d88bf6
-#		path_grouping_policy "group_by_prio"
d88bf6
-#		path_checker "rdac"
d88bf6
-#		features "2 pg_init_retries 50"
d88bf6
-#		hardware_handler "1 rdac"
d88bf6
-#		prio "rdac"
d88bf6
-#		failback immediate
d88bf6
-#		rr_weight "uniform"
d88bf6
-#		no_path_retry 15
d88bf6
+#		no_path_retry 30
d88bf6
 #	}
d88bf6
 #	device {
d88bf6
 #		vendor "NETAPP"