From patchwork Thu Aug 18 17:58:15 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Xose Vazquez Perez X-Patchwork-Id: 9288567 X-Patchwork-Delegate: christophe.varoqui@free.fr Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 37470600CB for ; Thu, 18 Aug 2016 18:04:09 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 2F032292A4 for ; Thu, 18 Aug 2016 18:04:09 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 23B0A292CB; Thu, 18 Aug 2016 18:04:09 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-4.1 required=2.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, FREEMAIL_FROM, RCVD_IN_DNSWL_MED, T_DKIM_INVALID autolearn=ham version=3.3.1 Received: from mx6-phx2.redhat.com (mx6-phx2.redhat.com [209.132.183.39]) (using TLSv1.2 with cipher DHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 037D3292A4 for ; Thu, 18 Aug 2016 18:04:07 +0000 (UTC) Received: from lists01.pubmisc.prod.ext.phx2.redhat.com (lists01.pubmisc.prod.ext.phx2.redhat.com [10.5.19.33]) by mx6-phx2.redhat.com (8.14.4/8.14.4) with ESMTP id u7II0LU9022269; Thu, 18 Aug 2016 14:00:22 -0400 Received: from int-mx09.intmail.prod.int.phx2.redhat.com (int-mx09.intmail.prod.int.phx2.redhat.com [10.5.11.22]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id u7IHx9U6016741 for ; Thu, 18 Aug 2016 13:59:09 -0400 Received: from mx1.redhat.com (ext-mx06.extmail.prod.ext.phx2.redhat.com [10.5.110.30]) by int-mx09.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id u7IHx9WF020106 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=NO); Thu, 18 Aug 2016 13:59:09 -0400 Received: from mail-wm0-f65.google.com (mail-wm0-f65.google.com [74.125.82.65]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 3EFD743A54; Thu, 18 Aug 2016 17:59:08 +0000 (UTC) Received: by mail-wm0-f65.google.com with SMTP id i5so588589wmg.2; Thu, 18 Aug 2016 10:59:08 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=Gkr+/j3tJBczU0mkVG9DUu/AFg5r67F5rAXKeS8Zio8=; b=cBXfImwO+comudZB1D4EfKWChFwH9pBfH9zRy9mG1jN7T7LjWyFpR++qTkuAKtiIKA 6u/0AUry4mbTla6TKhf2jPGkzsrlAcAVYsRuN6OIEPTP82xK8dZnlztvOR2GpWeArsIn aZWNznJPws38xaFCndqUQVe9UVINHsDMVavSreid7E1UxEFVxpuLP1+VrCLZd0aM2U5q IK3GjZkjLPypXhrsRSxn5sRp8SxwIV5dbLISQFaXtpolA3KVLEmi7n/UdIqrfzMjGBPh kRb0nktJ0o9zLJEShpc0fRRySsgmj/Blm4z59lDrts0CRDwxPme4SiL/N3sN1BoUT0Ef YgFA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=Gkr+/j3tJBczU0mkVG9DUu/AFg5r67F5rAXKeS8Zio8=; b=bjlUCHon/0Pj68py3TcKbwAbNBkaJMqM+xUuh6MDP1BGnwFLKX7OLD8bTEgRuze5N8 asnyG0YURpUxDX8FYak1xVkSNNPuRdcsEdcAIkGQTYUter6CbP3gUofAg6XtY6wphyjl 1p1FS/bFR33Ig4UDTtxrCeUBDORas05AXFyWUALwrq7M3EmCTNzfduAlGAkI7GbqtdH4 /VctBeoJ/LOzcPxqPG3/Jy50K8gASeVT7PGGm+s8NL/sPjP/5gC/YDERXnahPg+oIMWn MJdJidquJUDkcooIYm+b9/XqMVaPykpAiKMfvVGkBtUbn/b9DPpPBiABgSz9B17ligBK zdkA== X-Gm-Message-State: AEkooutQGAMNw+BQjtATTyE9ngYL9CjgT3wXkbY4QWjqlg8tIYT9f+7WEkKMfoFn1uZA2Q== X-Received: by 10.194.178.193 with SMTP id da1mr3028967wjc.66.1471543146839; Thu, 18 Aug 2016 10:59:06 -0700 (PDT) Received: from localhost ([46.222.167.224]) by smtp.gmail.com with ESMTPSA id i3sm3271762wjd.31.2016.08.18.10.59.05 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 18 Aug 2016 10:59:05 -0700 (PDT) From: Xose Vazquez Perez To: Date: Thu, 18 Aug 2016 19:58:15 +0200 Message-Id: <1471543096-11441-3-git-send-email-xose.vazquez@gmail.com> In-Reply-To: <1471543096-11441-1-git-send-email-xose.vazquez@gmail.com> References: <1471543096-11441-1-git-send-email-xose.vazquez@gmail.com> X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.30]); Thu, 18 Aug 2016 17:59:08 +0000 (UTC) X-Greylist: inspected by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.30]); Thu, 18 Aug 2016 17:59:08 +0000 (UTC) for IP:'74.125.82.65' DOMAIN:'mail-wm0-f65.google.com' HELO:'mail-wm0-f65.google.com' FROM:'xose.vazquez@gmail.com' RCPT:'' X-RedHat-Spam-Score: -0.02 (BAYES_50, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, FREEMAIL_FROM, RCVD_IN_DNSWL_LOW, RCVD_IN_MSPIKE_H3, RCVD_IN_MSPIKE_WL, SPF_PASS) 74.125.82.65 mail-wm0-f65.google.com 74.125.82.65 mail-wm0-f65.google.com X-Scanned-By: MIMEDefang 2.68 on 10.5.11.22 X-Scanned-By: MIMEDefang 2.78 on 10.5.110.30 X-loop: dm-devel@redhat.com Cc: Xose Vazquez Perez , device-mapper development Subject: [dm-devel] [PATCH 3/4] multipath-tools: change default failback from manual to undefined X-BeenThere: dm-devel@redhat.com X-Mailman-Version: 2.1.12 Precedence: junk 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-Virus-Scanned: ClamAV using ClamSMTP Default value is: manual 30 .pgfailback = FAILBACK_UNDEF, 45 .pgfailback = -FAILBACK_IMMEDIATE, manual is not used by any device. I hope it's reasonable. If someone disagrees, drop it. Cc: Hannes Reinecke Cc: Benjamin Marzinski Cc: Christophe Varoqui Cc: device-mapper development Signed-off-by: Xose Vazquez Perez --- libmultipath/defaults.h | 2 +- libmultipath/hwtable.c | 32 +------------------------------- multipath/multipath.conf.5 | 8 +++++++- 3 files changed, 9 insertions(+), 33 deletions(-) diff --git a/libmultipath/defaults.h b/libmultipath/defaults.h index 9bf27d6..a7c74fe 100644 --- a/libmultipath/defaults.h +++ b/libmultipath/defaults.h @@ -12,7 +12,7 @@ #define DEFAULT_MINIO 1000 #define DEFAULT_MINIO_RQ 1 #define DEFAULT_PGPOLICY FAILOVER -#define DEFAULT_FAILBACK -FAILBACK_MANUAL +#define DEFAULT_FAILBACK FAILBACK_UNDEF #define DEFAULT_RR_WEIGHT RR_WEIGHT_NONE #define DEFAULT_NO_PATH_RETRY NO_PATH_RETRY_UNDEF #define DEFAULT_VERBOSITY 2 diff --git a/libmultipath/hwtable.c b/libmultipath/hwtable.c index 72b5e1d..c4037d5 100644 --- a/libmultipath/hwtable.c +++ b/libmultipath/hwtable.c @@ -37,7 +37,6 @@ static struct hwentry default_hw[] = { .vendor = "APPLE", .product = "Xserve RAID", .pgpolicy = MULTIBUS, - .pgfailback = FAILBACK_UNDEF, }, /* * HPE @@ -58,7 +57,6 @@ static struct hwentry default_hw[] = { .no_path_retry = NO_PATH_RETRY_QUEUE, .hwhandler = "1 hp_sw", .pgpolicy = GROUP_BY_PRIO, - .pgfailback = FAILBACK_UNDEF, .checker_name = HP_SW, .prio_name = PRIO_HP_SW, }, @@ -67,7 +65,6 @@ static struct hwentry default_hw[] = { .vendor = "HP", .product = "A6189A", .pgpolicy = MULTIBUS, - .pgfailback = FAILBACK_UNDEF, .no_path_retry = 12, }, { @@ -76,7 +73,6 @@ static struct hwentry default_hw[] = { .product = "(MSA|HSV)1[01]0", .hwhandler = "1 hp_sw", .pgpolicy = GROUP_BY_PRIO, - .pgfailback = FAILBACK_UNDEF, .no_path_retry = 12, .checker_name = HP_SW, .prio_name = PRIO_HP_SW, @@ -104,7 +100,6 @@ static struct hwentry default_hw[] = { .vendor = "HP", .product = "(MSA2[02]12fc|MSA2012i)", .pgpolicy = MULTIBUS, - .pgfailback = FAILBACK_UNDEF, .no_path_retry = 18, }, { @@ -140,7 +135,6 @@ static struct hwentry default_hw[] = { .vendor = "HP", .product = "LOGICAL VOLUME", .pgpolicy = MULTIBUS, - .pgfailback = FAILBACK_UNDEF, .no_path_retry = 12, }, { @@ -159,7 +153,6 @@ static struct hwentry default_hw[] = { .vendor = "DDN", .product = "SAN DataDirector", .pgpolicy = MULTIBUS, - .pgfailback = FAILBACK_UNDEF, }, /* * EMC @@ -169,7 +162,6 @@ static struct hwentry default_hw[] = { .vendor = "EMC", .product = "SYMMETRIX", .pgpolicy = MULTIBUS, - .pgfailback = FAILBACK_UNDEF, .no_path_retry = 6, }, { @@ -190,14 +182,12 @@ static struct hwentry default_hw[] = { .product = "Invista", .bl_product = "LUNZ", .pgpolicy = MULTIBUS, - .pgfailback = FAILBACK_UNDEF, .no_path_retry = 5, }, { .vendor = "XtremIO", .product = "XtremApp", .pgpolicy = MULTIBUS, - .pgfailback = FAILBACK_UNDEF, }, /* * DELL @@ -212,7 +202,6 @@ static struct hwentry default_hw[] = { .vendor = "COMPELNT", .product = "Compellent Vol", .pgpolicy = MULTIBUS, - .pgfailback = FAILBACK_UNDEF, .no_path_retry = NO_PATH_RETRY_QUEUE, }, { @@ -258,7 +247,6 @@ static struct hwentry default_hw[] = { .vendor = "FSC", .product = "CentricStor", .pgpolicy = GROUP_BY_SERIAL, - .pgfailback = FAILBACK_UNDEF, }, { .vendor = "FUJITSU", @@ -273,7 +261,6 @@ static struct hwentry default_hw[] = { .vendor = "(EUROLOGC|EuroLogc)", .product = "FC2502", .pgpolicy = MULTIBUS, - .pgfailback = FAILBACK_UNDEF, }, /* * Hitachi @@ -286,7 +273,6 @@ static struct hwentry default_hw[] = { .vendor = "(HITACHI|HP)", .product = "^OPEN-", .pgpolicy = MULTIBUS, - .pgfailback = FAILBACK_UNDEF, }, { /* AMS 2000 and HUS 100 families */ @@ -307,7 +293,6 @@ static struct hwentry default_hw[] = { .vendor = "IBM", .product = "ProFibre 4000R", .pgpolicy = MULTIBUS, - .pgfailback = FAILBACK_UNDEF, }, { /* DS4300 / FAStT600 */ @@ -444,7 +429,6 @@ static struct hwentry default_hw[] = { .vendor = "IBM", .product = "^3542", .pgpolicy = MULTIBUS, - .pgfailback = FAILBACK_UNDEF, }, { /* Enterprise Storage Server / Shark family */ @@ -452,7 +436,6 @@ static struct hwentry default_hw[] = { .product = "^2105", .no_path_retry = NO_PATH_RETRY_QUEUE, .pgpolicy = MULTIBUS, - .pgfailback = FAILBACK_UNDEF, }, { /* DS6000 */ @@ -469,7 +452,6 @@ static struct hwentry default_hw[] = { .product = "^2107900", .no_path_retry = NO_PATH_RETRY_QUEUE, .pgpolicy = MULTIBUS, - .pgfailback = FAILBACK_UNDEF, }, { /* Storwize family / SAN Volume Controller / Flex System V7000 */ @@ -487,7 +469,6 @@ static struct hwentry default_hw[] = { .uid_attribute = "ID_UID", .no_path_retry = NO_PATH_RETRY_QUEUE, .pgpolicy = MULTIBUS, - .pgfailback = FAILBACK_UNDEF, }, { .vendor = "IBM", @@ -496,7 +477,6 @@ static struct hwentry default_hw[] = { .uid_attribute = "ID_UID", .no_path_retry = NO_PATH_RETRY_QUEUE, .pgpolicy = MULTIBUS, - .pgfailback = FAILBACK_UNDEF, }, { /* Power RAID */ @@ -523,7 +503,6 @@ static struct hwentry default_hw[] = { .product = "2810XIV", .no_path_retry = NO_PATH_RETRY_QUEUE, .pgpolicy = MULTIBUS, - .pgfailback = FAILBACK_UNDEF, }, /* * IBM Power Virtual SCSI Devices @@ -535,14 +514,12 @@ static struct hwentry default_hw[] = { .vendor = "AIX", .product = "VDASD", .pgpolicy = MULTIBUS, - .pgfailback = FAILBACK_UNDEF, .no_path_retry = (300 / DEFAULT_CHECKINT), }, { /* 3303 NVDISK */ .vendor = "IBM", .product = "3303[ ]+NVDISK", - .pgfailback = FAILBACK_UNDEF, .no_path_retry = (300 / DEFAULT_CHECKINT), }, { @@ -602,7 +579,6 @@ static struct hwentry default_hw[] = { .vendor = "NEXENTA", .product = "COMSTAR", .pgpolicy = GROUP_BY_SERIAL, - .pgfailback = FAILBACK_UNDEF, .no_path_retry = 30, }, /* @@ -612,7 +588,6 @@ static struct hwentry default_hw[] = { .vendor = "SGI", .product = "TP9100", .pgpolicy = MULTIBUS, - .pgfailback = FAILBACK_UNDEF, }, { .vendor = "SGI", @@ -703,7 +678,6 @@ static struct hwentry default_hw[] = { .vendor = "SUN", .product = "(StorEdge 3510|T4)", .pgpolicy = MULTIBUS, - .pgfailback = FAILBACK_UNDEF, }, { .vendor = "SUN", @@ -766,7 +740,6 @@ static struct hwentry default_hw[] = { .product = "RAIGE VOLUME", .no_path_retry = NO_PATH_RETRY_QUEUE, .pgpolicy = MULTIBUS, - .pgfailback = FAILBACK_UNDEF, }, /* * Intel @@ -818,7 +791,6 @@ static struct hwentry default_hw[] = { .vendor = "PURE", .product = "FlashArray", .pgpolicy = MULTIBUS, - .pgfailback = FAILBACK_UNDEF, .fast_io_fail = 10, .dev_loss = 60, }, @@ -830,7 +802,6 @@ static struct hwentry default_hw[] = { .vendor = "(HUAWEI|HUASY)", .product = "XSG1", .pgpolicy = MULTIBUS, - .pgfailback = FAILBACK_UNDEF, }, /* * Red Hat @@ -852,7 +823,6 @@ static struct hwentry default_hw[] = { .vendor = "KOVE", .product = "XPD", .pgpolicy = MULTIBUS, - .pgfailback = FAILBACK_UNDEF, }, #if 0 /* @@ -882,7 +852,7 @@ static struct hwentry default_hw[] = { .hwhandler = "0", .prio_name = "const", .prio_args = "", - .pgfailback = -FAILBACK_MANUAL, + .pgfailback = FAILBACK_UNDEF, .rr_weight = RR_WEIGHT_NONE, .no_path_retry = NO_PATH_RETRY_UNDEF, .minio = 1000, diff --git a/multipath/multipath.conf.5 b/multipath/multipath.conf.5 index 40df315..466ad94 100644 --- a/multipath/multipath.conf.5 +++ b/multipath/multipath.conf.5 @@ -422,6 +422,8 @@ Default value is: \fBmpath\fR .TP .B failback Tell multipathd how to manage path group failback. +To select \fIimmediate\fR or a \fIvalue\fR, it's mandatory that the device +has support for a working prioritizer and a 'preferred path'. .RS .TP 12 .I immediate @@ -440,7 +442,11 @@ another node requested the failover. .I values > 0 Deferred failback (time to defer in seconds). .TP -Default value is: \fBmanual\fR +.\" XXX +.I +??? Undefined. +.TP +Default value is: \fB\fR .RE . .