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

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