From: Benjamin Marzinski <bmarzins@redhat.com>
Date: Tue, 27 Sep 2011 20:50:52 +0000 (-0500)
Subject: multipath: add default hardware configs.
X-Git-Tag: upstream/0.5.0~85
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=f7735ad547d9ebb952993ac0a6def0400fb23c80;p=platform%2Fupstream%2Fmultipath-tools.git

multipath: add default hardware configs.

Here are some hardware configs I've received from vendors, that haven't made it
upstream yet, along with a little bit of cleanup. The changes come from Redhat
BZ #622569, #636213, and #694602

Signed-off-by: Benjamin Marzinski <bmarzins@redhat.com>
---

diff --git a/libmultipath/hwtable.c b/libmultipath/hwtable.c
index c5dd7bd..34c7669 100644
--- a/libmultipath/hwtable.c
+++ b/libmultipath/hwtable.c
@@ -242,6 +242,24 @@ static struct hwentry default_hw[] = {
 		.prio_name     = DEFAULT_PRIO,
 		.prio_args     = NULL,
 	},
+	{
+		/* HP P2000 family arrays */
+		.vendor        = "HP",
+		.product       = "P2000 G3 FC|P2000G3 FC/iSCSI|P2000 G3 SAS|P2000 G3 iSCSI",
+		.getuid        = DEFAULT_GETUID,
+		.features      = DEFAULT_FEATURES,
+		.hwhandler     = DEFAULT_HWHANDLER,
+		.selector      = DEFAULT_SELECTOR,
+		.pgpolicy      = GROUP_BY_PRIO,
+		.pgfailback    = -FAILBACK_IMMEDIATE,
+		.rr_weight     = RR_WEIGHT_NONE,
+		.no_path_retry = 18,
+		.minio         = 100,
+		.minio_rq      = DEFAULT_MINIO_RQ,
+		.checker_name  = TUR,
+		.prio_name     = PRIO_ALUA,
+		.prio_args     = NULL,
+	},
 	/*
 	 * DDN controller family
 	 *
@@ -281,10 +299,10 @@ static struct hwentry default_hw[] = {
 		.pgpolicy      = MULTIBUS,
 		.pgfailback    = FAILBACK_UNDEF,
 		.rr_weight     = RR_WEIGHT_NONE,
-		.no_path_retry = NO_PATH_RETRY_UNDEF,
+		.no_path_retry = 6,
 		.minio         = DEFAULT_MINIO,
 		.minio_rq      = DEFAULT_MINIO_RQ,
-		.checker_name  = DIRECTIO,
+		.checker_name  = TUR,
 		.prio_name     = DEFAULT_PRIO,
 		.prio_args     = NULL,
 	},
@@ -320,6 +338,7 @@ static struct hwentry default_hw[] = {
 		.no_path_retry = 5,
 		.minio         = DEFAULT_MINIO,
 		.minio_rq      = DEFAULT_MINIO_RQ,
+		.checker_name  = TUR,
 		.prio_name     = DEFAULT_PRIO,
 		.prio_args     = NULL,
 	},
@@ -346,24 +365,6 @@ static struct hwentry default_hw[] = {
 		.prio_name     = DEFAULT_PRIO,
 		.prio_args     = NULL,
 	},
-	{
-		.vendor        = "EMC",
-		.product       = "Invista",
-		.bl_product    = "LUNZ",
-		.getuid        = DEFAULT_GETUID,
-		.features      = DEFAULT_FEATURES,
-		.hwhandler     = DEFAULT_HWHANDLER,
-		.selector      = DEFAULT_SELECTOR,
-		.pgpolicy      = FAILOVER,
-		.pgfailback    = FAILBACK_UNDEF,
-		.rr_weight     = RR_WEIGHT_NONE,
-		.no_path_retry = 5,
-		.minio         = DEFAULT_MINIO,
-		.minio_rq      = DEFAULT_MINIO_RQ,
-		.checker_name  = TUR,
-		.prio_name     = DEFAULT_PRIO,
-		.prio_args     = NULL,
-	},
 	/*
 	 * Hitachi controller family
 	 *
@@ -752,6 +753,24 @@ static struct hwentry default_hw[] = {
 		.prio_name     = PRIO_ALUA,
 		.prio_args     = NULL,
 	},
+	{
+		/* IBM RSSM */
+		.vendor        = "IBM",
+		.product       = "1820N00",
+		.getuid        = DEFAULT_GETUID,
+		.features      = DEFAULT_FEATURES,
+		.hwhandler     = DEFAULT_HWHANDLER,
+		.selector      = DEFAULT_SELECTOR,
+		.pgpolicy      = GROUP_BY_PRIO,
+		.pgfailback    = -FAILBACK_IMMEDIATE,
+		.rr_weight     = RR_WEIGHT_NONE,
+		.no_path_retry = NO_PATH_RETRY_QUEUE,
+		.minio         = 100,
+		.minio_rq      = DEFAULT_MINIO_RQ,
+		.checker_name  = TUR,
+		.prio_name     = PRIO_ALUA,
+		.prio_args     = NULL,
+	},
 	/*
 	 * IBM Power Virtual SCSI Devices
 	 *
@@ -1110,6 +1129,7 @@ static struct hwentry default_hw[] = {
 		.minio_rq      = DEFAULT_MINIO_RQ,
 		.checker_name  = DEFAULT_CHECKER,
 		.prio_name     = DEFAULT_PRIO,
+		.prio_args     = NULL,
 	},
 	/*
 	 * Pivot3 RAIGE