From patchwork Mon Mar 19 15:01:38 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Martin Wilck X-Patchwork-Id: 10292491 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 7E4ED60349 for ; Mon, 19 Mar 2018 15:03:39 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 6CECF2940B for ; Mon, 19 Mar 2018 15:03:39 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 61F5F2941F; Mon, 19 Mar 2018 15:03:39 +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=-6.9 required=2.0 tests=BAYES_00,RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) (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 F171D2940B for ; Mon, 19 Mar 2018 15:03:38 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.phx2.redhat.com [10.5.11.15]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 699452BBE15; Mon, 19 Mar 2018 15:03:37 +0000 (UTC) Received: from colo-mx.corp.redhat.com (colo-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.20]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 3F3552C338; Mon, 19 Mar 2018 15:03:37 +0000 (UTC) Received: from lists01.pubmisc.prod.ext.phx2.redhat.com (lists01.pubmisc.prod.ext.phx2.redhat.com [10.5.19.33]) by colo-mx.corp.redhat.com (Postfix) with ESMTP id 0DCB2180BAD4; Mon, 19 Mar 2018 15:03:37 +0000 (UTC) Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.13]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id w2JF3UOP008785 for ; Mon, 19 Mar 2018 11:03:30 -0400 Received: by smtp.corp.redhat.com (Postfix) id 471066A040; Mon, 19 Mar 2018 15:03:30 +0000 (UTC) Delivered-To: dm-devel@redhat.com Received: from mx1.redhat.com (ext-mx02.extmail.prod.ext.phx2.redhat.com [10.5.110.26]) by smtp.corp.redhat.com (Postfix) with ESMTPS id E217A190D6; Mon, 19 Mar 2018 15:03:26 +0000 (UTC) Received: from smtp.nue.novell.com (smtp.nue.novell.com [195.135.221.5]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 2817E80C24; Mon, 19 Mar 2018 15:03:24 +0000 (UTC) Received: from emea4-mta.ukb.novell.com ([10.120.13.87]) by smtp.nue.novell.com with ESMTP (TLS encrypted); Mon, 19 Mar 2018 16:03:22 +0100 Received: from apollon.suse.de.de (nwb-a10-snat.microfocus.com [10.120.13.202]) by emea4-mta.ukb.novell.com with ESMTP (TLS encrypted); Mon, 19 Mar 2018 15:03:13 +0000 From: Martin Wilck To: Christophe Varoqui Date: Mon, 19 Mar 2018 16:01:38 +0100 Message-Id: <20180319150155.5363-4-mwilck@suse.com> In-Reply-To: <20180319150155.5363-1-mwilck@suse.com> References: <20180319150155.5363-1-mwilck@suse.com> X-Greylist: Sender passed SPF test, Sender IP whitelisted by DNSRBL, ACL 207 matched, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.26]); Mon, 19 Mar 2018 15:03:25 +0000 (UTC) X-Greylist: inspected by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.26]); Mon, 19 Mar 2018 15:03:25 +0000 (UTC) for IP:'195.135.221.5' DOMAIN:'smtp.nue.novell.com' HELO:'smtp.nue.novell.com' FROM:'mwilck@suse.com' RCPT:'' X-RedHat-Spam-Score: -2.301 (RCVD_IN_DNSWL_MED, SPF_PASS) 195.135.221.5 smtp.nue.novell.com 195.135.221.5 smtp.nue.novell.com X-Scanned-By: MIMEDefang 2.78 on 10.5.110.26 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.13 X-loop: dm-devel@redhat.com Cc: Martin Wilck , dm-devel@redhat.com Subject: [dm-devel] [PATCH v2 03/20] libmultipath: should_multipath: keep existing maps 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-Scanned-By: MIMEDefang 2.79 on 10.5.11.15 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.39]); Mon, 19 Mar 2018 15:03:38 +0000 (UTC) X-Virus-Scanned: ClamAV using ClamSMTP with find_multipaths "yes" and without the "-n" option to multipathd, if a path is already multipathed, keep it. The same logic is applied by "multipath -u -i". To do this, we need to add a "mpvec" parameter to should_multipath(). Signed-off-by: Martin Wilck Reviewed-by: Benjamin Marzinski --- libmultipath/configure.c | 2 +- libmultipath/wwids.c | 12 +++++++++++- libmultipath/wwids.h | 2 +- multipathd/main.c | 2 +- 4 files changed, 14 insertions(+), 4 deletions(-) diff --git a/libmultipath/configure.c b/libmultipath/configure.c index fa6e21cb31af..16ce797c7d44 100644 --- a/libmultipath/configure.c +++ b/libmultipath/configure.c @@ -979,7 +979,7 @@ int coalesce_paths (struct vectors * vecs, vector newmp, char * refwwid, continue; /* If find_multipaths was selected check if the path is valid */ - if (!refwwid && !should_multipath(pp1, pathvec)) { + if (!refwwid && !should_multipath(pp1, pathvec, curmp)) { orphan_path(pp1, "only one path"); continue; } diff --git a/libmultipath/wwids.c b/libmultipath/wwids.c index bc70a27409d3..cb6ab52aaa5b 100644 --- a/libmultipath/wwids.c +++ b/libmultipath/wwids.c @@ -15,6 +15,7 @@ #include "wwids.h" #include "defaults.h" #include "config.h" +#include "devmapper.h" /* * Copyright (c) 2010 Benjamin Marzinski, Redhat @@ -271,7 +272,7 @@ out: } int -should_multipath(struct path *pp1, vector pathvec) +should_multipath(struct path *pp1, vector pathvec, vector mpvec) { int i, ignore_new_devs; struct path *pp2; @@ -287,6 +288,15 @@ should_multipath(struct path *pp1, vector pathvec) condlog(4, "checking if %s should be multipathed", pp1->dev); if (!ignore_new_devs) { + char tmp_wwid[WWID_SIZE]; + struct multipath *mp = find_mp_by_wwid(mpvec, pp1->wwid); + + if (mp != NULL && dm_get_uuid(mp->alias, tmp_wwid) == 0 && + !strncmp(tmp_wwid, pp1->wwid, WWID_SIZE)) { + condlog(3, "wwid %s is already multipathed, keeping it", + pp1->wwid); + return 1; + } vector_foreach_slot(pathvec, pp2, i) { if (pp1->dev == pp2->dev) continue; diff --git a/libmultipath/wwids.h b/libmultipath/wwids.h index 95270129daa0..d9a78b38ccf8 100644 --- a/libmultipath/wwids.h +++ b/libmultipath/wwids.h @@ -12,7 +12,7 @@ "#\n" \ "# Valid WWIDs:\n" -int should_multipath(struct path *pp, vector pathvec); +int should_multipath(struct path *pp, vector pathvec, vector mpvec); int remember_wwid(char *wwid); int check_wwids_file(char *wwid, int write_wwid); int remove_wwid(char *wwid); diff --git a/multipathd/main.c b/multipathd/main.c index 0435133fadfb..707245c67231 100644 --- a/multipathd/main.c +++ b/multipathd/main.c @@ -933,7 +933,7 @@ rescan: mpp->action = ACT_RELOAD; extract_hwe_from_path(mpp); } else { - if (!should_multipath(pp, vecs->pathvec)) { + if (!should_multipath(pp, vecs->pathvec, vecs->mpvec)) { orphan_path(pp, "only one path"); return 0; }