From patchwork Fri Nov 12 20:17:12 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: bmarzins@sourceware.org X-Patchwork-Id: 320832 X-Patchwork-Delegate: christophe.varoqui@free.fr Received: from mx3-phx2.redhat.com (mx3-phx2.redhat.com [209.132.183.24]) by demeter1.kernel.org (8.14.4/8.14.3) with ESMTP id oACKJo3O005671 for ; Fri, 12 Nov 2010 20:20:11 GMT Received: from lists01.pubmisc.prod.ext.phx2.redhat.com (lists01.pubmisc.prod.ext.phx2.redhat.com [10.5.19.33]) by mx3-phx2.redhat.com (8.13.8/8.13.8) with ESMTP id oACKHZTu015816; Fri, 12 Nov 2010 15:17:36 -0500 Received: from int-mx10.intmail.prod.int.phx2.redhat.com (int-mx10.intmail.prod.int.phx2.redhat.com [10.5.11.23]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id oACKHXCO018693 for ; Fri, 12 Nov 2010 15:17:33 -0500 Received: from mx1.redhat.com (ext-mx09.extmail.prod.ext.phx2.redhat.com [10.5.110.13]) by int-mx10.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id oACKHSfL018047 for ; Fri, 12 Nov 2010 15:17:28 -0500 Received: from sourceware.org (server1.sourceware.org [209.132.180.131]) by mx1.redhat.com (8.13.8/8.13.8) with SMTP id oACKHFrv013670 for ; Fri, 12 Nov 2010 15:17:16 -0500 Received: (qmail 6297 invoked by uid 9475); 12 Nov 2010 20:17:12 -0000 Date: 12 Nov 2010 20:17:12 -0000 Message-ID: <20101112201712.6278.qmail@sourceware.org> From: bmarzins@sourceware.org To: dm-cvs@sourceware.org, dm-devel@redhat.com X-RedHat-Spam-Score: -2.31 (RCVD_IN_DNSWL_MED,T_RP_MATCHES_RCVD) X-Scanned-By: MIMEDefang 2.68 on 10.5.11.23 X-Scanned-By: MIMEDefang 2.67 on 10.5.110.13 X-loop: dm-devel@redhat.com Subject: [dm-devel] multipath-tools ./multipath.conf.defaults libm ... X-BeenThere: dm-devel@redhat.com X-Mailman-Version: 2.1.12 Precedence: junk Reply-To: device-mapper development List-Id: device-mapper development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: dm-devel-bounces@redhat.com Errors-To: dm-devel-bounces@redhat.com X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by milter-greylist-4.2.3 (demeter1.kernel.org [140.211.167.41]); Fri, 12 Nov 2010 20:20:11 +0000 (UTC) --- multipath-tools/multipath.conf.defaults 2010/09/21 18:06:04 1.5.4.27 +++ multipath-tools/multipath.conf.defaults 2010/11/12 20:17:09 1.5.4.28 @@ -59,7 +59,7 @@ # } # device { # vendor "(COMPAQ|HP)" -# product "HSV1[01]1|HSV2[01]0|HSV300|HSV4[05]0" +# product "HSV1[01]1|HSV2[01]0|HSV3[046]0|HSV4[05]0" # getuid_callout "/sbin/scsi_id -g -u -s /block/%n" # prio_callout "/sbin/mpath_prio_alua /dev/%n" # features "0" @@ -67,7 +67,7 @@ # path_grouping_policy group_by_prio # failback immediate # rr_weight uniform -# no_path_retry 12 +# no_path_retry 18 # rr_min_io 100 # path_checker tur # } @@ -163,6 +163,20 @@ # path_checker cciss_tur # } # device { +# vendor "HP" +# product "P2000 G3*|P2000G3 FC/iSCSI" +# getuid_callout "/sbin/scsi_id -g -u -s /block/%n" +# prio_callout "/sbin/mpath_prio_alua /dev/%n" +# features "0" +# hardware_handler "0" +# path_grouping_policy group_by_prio +# failback immediate +# rr_weight uniform +# no_path_retry 18 +# rr_min_io 100 +# path_checker tur +# } +# device { # vendor "DDN" # product "SAN DataDirector" # getuid_callout "/sbin/scsi_id -g -u -s /block/%n" --- multipath-tools/libmultipath/hwtable.c 2010/09/21 18:06:05 1.20.2.33 +++ multipath-tools/libmultipath/hwtable.c 2010/11/12 20:17:12 1.20.2.34 @@ -91,9 +91,9 @@ .checker_name = HP_SW, }, { - /* EVA 3000/5000 with new firmware, EVA 4000/6000/8000, EVA 4400 */ + /* EVA 3000/5000 with new firmware, EVA 4x00/6x00/8x00 */ .vendor = "(COMPAQ|HP)", - .product = "HSV1[01]1|HSV2[01]0|HSV300|HSV4[05]|HSV4[05]0", + .product = "HSV1[01]1|HSV2[01]0|HSV3[046]0|HSV4[05]0", .getuid = DEFAULT_GETUID, .getprio = "/sbin/mpath_prio_alua /dev/%n", .features = DEFAULT_FEATURES, @@ -102,7 +102,7 @@ .pgpolicy = GROUP_BY_PRIO, .pgfailback = -FAILBACK_IMMEDIATE, .rr_weight = RR_WEIGHT_NONE, - .no_path_retry = 12, + .no_path_retry = 18, .minio = 100, .checker_name = TUR, }, @@ -201,6 +201,22 @@ .minio = DEFAULT_MINIO, .checker_name = CCISS_TUR, }, + { + /* HP P2000 product family */ + .vendor = "HP", + .product = "P2000 G3*|P2000G3 FC/iSCSI", + .getuid = DEFAULT_GETUID, + .getprio = "/sbin/mpath_prio_alua /dev/%n", + .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, + .checker_name = TUR, + }, /* * DDN controller family *