Remove duplicate hwtable entry for XtremIO

PATCH In review Hannes Reinecke 2 participants 3 messages Mar 30, 2015 – Apr 8, 2015 Device mapper

Share & tools

Hannes Reinecke

author

2015-03-30 06:23 UTC #0 lore raw

PATCH 1/2 Remove duplicate hwtable entry for XtremIO

Commit b47e607408e1edce3a03744b4aefa292723c7fc6 introduced a new hwtable entry for EMC XtremIO instead of updating the existing one.

Signed-off-by Hannes Reinecke <[email protected]>

---
 libmultipath/hwtable.c | 17 ++---------------
 1 file changed, 2 insertions(+), 15 deletions(-)

libmultipath/hwtable.c +2 ~~-15~~

index 13611fe..fa4b20f 100644
@@ -294,11 +294,11 @@ static struct hwentry default_hw[] = {
 		.product       = "XtremApp",
 		.features      = DEFAULT_FEATURES,
 		.hwhandler     = DEFAULT_HWHANDLER,
+		.selector      = "queue-length 0",
 		.pgpolicy      = MULTIBUS,
 		.pgfailback    = FAILBACK_UNDEF,
-		.rr_weight     = RR_WEIGHT_NONE,
-		.no_path_retry = 5,
 		.checker_name  = TUR,
+		.fast_io_fail  = 5,
 		.prio_name     = DEFAULT_PRIO,
 		.prio_args     = NULL,
 	},

@@ -1166,19 +1166,6 @@ static struct hwentry default_hw[] = {
 		.prio_name     = PRIO_ALUA,
 		.prio_args     = NULL,
 	},
-	{
-		.vendor        = "XtremIO",
-		.product       = "XtremApp",
-		.features      = DEFAULT_FEATURES,
-		.hwhandler     = DEFAULT_HWHANDLER,
-		.selector      = "queue-length 0",
-		.pgpolicy      = MULTIBUS,
-		.pgfailback    = -FAILBACK_IMMEDIATE,
-		.checker_name  = DIRECTIO,
-		.fast_io_fail  = 15,
-		.prio_name     = DEFAULT_PRIO,
-		.prio_args     = NULL,
-	},
 	/*
 	 * EOL
 	 */

Signature · 1 line

1.8.4.5

Hannes Reinecke

author

2015-03-30 06:23 UTC #1 lore raw

PATCH 2/2 Merge Dell MD3XXX hardware table entries

Remove duplicate entries and merge MD36xxi/MD36xxf into a single one.

Signed-off-by Hannes Reinecke <[email protected]>

---
 libmultipath/hwtable.c | 53 ++++----------------------------------------------
 1 file changed, 4 insertions(+), 49 deletions(-)

libmultipath/hwtable.c +4 ~~-49~~

index fa4b20f..f83f3e7 100644
@@ -728,7 +728,7 @@ static struct hwentry default_hw[] = {
 		.prio_args     = NULL,
 	},
 	{
-		/* DELL MD3000 */
+		/* DELL MD3000/MD3000i */
 		.vendor        = "DELL",
 		.product       = "MD3000",
 		.bl_product    = "Universal Xport",

@@ -743,22 +743,7 @@ static struct hwentry default_hw[] = {
 		.prio_args     = NULL,
 	},
 	{
-		/* DELL MD3000i */
-		.vendor        = "DELL",
-		.product       = "MD3000i",
-		.bl_product    = "Universal Xport",
-		.features      = "2 pg_init_retries 50",
-		.hwhandler     = "1 rdac",
-		.pgpolicy      = GROUP_BY_PRIO,
-		.pgfailback    = -FAILBACK_IMMEDIATE,
-		.rr_weight     = RR_WEIGHT_NONE,
-		.no_path_retry = 15,
-		.checker_name  = RDAC,
-		.prio_name     = PRIO_RDAC,
-		.prio_args     = NULL,
-	},
-	{
-		/* DELL MD32xx */
+		/* DELL MD32xx/MD32xxi */
 		.vendor        = "DELL",
 		.product       = "MD32xx",
 		.bl_product    = "Universal Xport",

@@ -773,39 +758,9 @@ static struct hwentry default_hw[] = {
 		.prio_args     = NULL,
 	},
 	{
-		/* DELL MD32xxi */
-		.vendor        = "DELL",
-		.product       = "MD32xxi",
-		.bl_product    = "Universal Xport",
-		.features      = "2 pg_init_retries 50",
-		.hwhandler     = "1 rdac",
-		.pgpolicy      = GROUP_BY_PRIO,
-		.pgfailback    = -FAILBACK_IMMEDIATE,
-		.rr_weight     = RR_WEIGHT_NONE,
-		.no_path_retry = 15,
-		.checker_name  = RDAC,
-		.prio_name     = PRIO_RDAC,
-		.prio_args     = NULL,
-	},
-	{
-		/* DELL MD36xxi */
-		.vendor        = "DELL",
-		.product       = "MD36xxi",
-		.bl_product    = "Universal Xport",
-		.features      = "2 pg_init_retries 50",
-		.hwhandler     = "1 rdac",
-		.pgpolicy      = GROUP_BY_PRIO,
-		.pgfailback    = -FAILBACK_IMMEDIATE,
-		.rr_weight     = RR_WEIGHT_NONE,
-		.no_path_retry = 15,
-		.checker_name  = RDAC,
-		.prio_name     = PRIO_RDAC,
-		.prio_args     = NULL,
-	},
-	{
-		/* DELL MD36xxf */
+		/* DELL MD36xxi/MD36xxf */
 		.vendor        = "DELL",
-		.product       = "MD36xxf",
+		.product       = "MD36xx(i|f)",
 		.bl_product    = "Universal Xport",
 		.features      = "2 pg_init_retries 50",
 		.hwhandler     = "1 rdac",

Signature · 1 line

1.8.4.5

Xose Vazquez Perez

2015-04-08 09:46 UTC #2 lore raw

In reply to Hannes Reinecke

Quoted 38 lines · Hannes Reinecke

Commit b47e607408e1edce3a03744b4aefa292723c7fc6 introduced a new hwtable entry for EMC XtremIO instead of updating the existing one.

Signed-off-by Hannes Reinecke <[email protected]>

---
 libmultipath/hwtable.c | 17 ++---------------
 1 file changed, 2 insertions(+), 15 deletions(-)

libmultipath/hwtable.c +2 -8

index 13611fe..fa4b20f 100644
@@ -294,11 +294,11 @@ static struct hwentry default_hw[] = {
 		.product       = "XtremApp",
 		.features      = DEFAULT_FEATURES,
 		.hwhandler     = DEFAULT_HWHANDLER,
+		.selector      = "queue-length 0",
 		.pgpolicy      = MULTIBUS,
 		.pgfailback    = FAILBACK_UNDEF,
-		.rr_weight     = RR_WEIGHT_NONE,
-		.no_path_retry = 5,
 		.checker_name  = TUR,
+		.fast_io_fail  = 5,
 		.prio_name     = DEFAULT_PRIO,
 		.prio_args     = NULL,
 	},

@@ -1166,19 +1166,6 @@ static struct hwentry default_hw[] = {
 		.prio_name     = PRIO_ALUA,
 		.prio_args     = NULL,
 	},
-	{
-		.vendor        = "XtremIO",
-		.product       = "XtremApp",
-		.features      = DEFAULT_FEATURES,
-		.hwhandler     = DEFAULT_HWHANDLER,
-		.selector      = "queue-length 0",

libmultipath/hwtable.c static struct hwentry default_hw[] = { · line 1171

Quoted 10 lines

libmultipath/hwtable.c +0 -7

-		.pgpolicy      = MULTIBUS,
-		.pgfailback    = -FAILBACK_IMMEDIATE,
-		.checker_name  = DIRECTIO,
-		.fast_io_fail  = 15,
-		.prio_name     = DEFAULT_PRIO,
-		.prio_args     = NULL,
-	},
 	/*
 	 * EOL
 	 */

CC: Vincent Chen <[email protected]> and Benjamin Marzinski <[email protected]> because this patch modifies a previous configuration 83302a2f64ca8ee8dac5d6ac08e8eb8a5e9af343