All of lore.kernel.org
 help / color / mirror / Atom feed
From: Martin Wilck <mwilck@suse.com>
To: Christophe Varoqui <christophe.varoqui@opensvc.com>,
	Benjamin Marzinski <bmarzins@redhat.com>
Cc: Julian Andres Klode <julian.klode@canonical.com>,
	dm-devel@redhat.com, Martin Wilck <mwilck@suse.com>
Subject: [PATCH v3 05/20] libmultipath: trigger change uevent on new device creation
Date: Mon,  2 Apr 2018 21:50:36 +0200	[thread overview]
Message-ID: <20180402195051.26854-6-mwilck@suse.com> (raw)
In-Reply-To: <20180402195051.26854-1-mwilck@suse.com>

From: Benjamin Marzinski <bmarzins@redhat.com>

When multipath first sees a path device with find_multipaths
enabled, it can't know if the device should be multipathed. This means
that it will not claim the device in udev.  If the device is eventually
multipathed, multipath should trigger a change uevent to update the udev
database to claim the device.

Signed-off-by: Benjamin Marzinski <bmarzins@redhat.com>
Reviewed-by: Martin Wilck <mwilck@suse.com>
---
 libmultipath/configure.c | 26 ++++++++++++++++++++++++--
 libmultipath/configure.h |  1 +
 libmultipath/wwids.c     |  2 +-
 multipath/main.c         |  2 +-
 multipathd/main.c        |  3 ++-
 5 files changed, 29 insertions(+), 5 deletions(-)

diff --git a/libmultipath/configure.c b/libmultipath/configure.c
index 16ce797..245bd11 100644
--- a/libmultipath/configure.c
+++ b/libmultipath/configure.c
@@ -442,6 +442,28 @@ trigger_udev_change(const struct multipath *mpp)
 	udev_device_unref(udd);
 }
 
+void
+trigger_paths_udev_change(const struct multipath *mpp)
+{
+	struct pathgroup * pgp;
+	struct path * pp;
+	int i, j;
+
+	if (!mpp || !mpp->pg)
+		return;
+
+	vector_foreach_slot (mpp->pg, pgp, i) {
+		if (!pgp->paths)
+			continue;
+		vector_foreach_slot(pgp->paths, pp, j) {
+			if (!pp->udev)
+				continue;
+			sysfs_attr_set_value(pp->udev, "uevent", "change",
+					     strlen("change"));
+		}
+	}
+}
+
 static int
 is_mpp_known_to_udev(const struct multipath *mpp)
 {
@@ -836,8 +858,8 @@ int domap(struct multipath *mpp, char *params, int is_daemon)
 		 * succeeded
 		 */
 		mpp->force_udev_reload = 0;
-		if (mpp->action == ACT_CREATE)
-			remember_wwid(mpp->wwid);
+		if (mpp->action == ACT_CREATE && remember_wwid(mpp->wwid) == 1)
+			trigger_paths_udev_change(mpp);
 		if (!is_daemon) {
 			/* multipath client mode */
 			dm_switchgroup(mpp->alias, mpp->bestpg);
diff --git a/libmultipath/configure.h b/libmultipath/configure.h
index 27a7e6f..545cbc2 100644
--- a/libmultipath/configure.h
+++ b/libmultipath/configure.h
@@ -37,3 +37,4 @@ int get_refwwid (enum mpath_cmds cmd, char * dev, enum devtypes dev_type,
 		 vector pathvec, char **wwid);
 int reload_map(struct vectors *vecs, struct multipath *mpp, int refresh, int is_daemon);
 struct udev_device *get_udev_device(const char *dev, enum devtypes dev_type);
+void trigger_paths_udev_change(const struct multipath *mpp);
diff --git a/libmultipath/wwids.c b/libmultipath/wwids.c
index cb6ab52..ea56911 100644
--- a/libmultipath/wwids.c
+++ b/libmultipath/wwids.c
@@ -329,5 +329,5 @@ remember_wwid(char *wwid)
 		condlog(3, "wrote wwid %s to wwids file", wwid);
 	else
 		condlog(4, "wwid %s already in wwids file", wwid);
-	return 0;
+	return ret;
 }
diff --git a/multipath/main.c b/multipath/main.c
index 4d45df3..19c729d 100644
--- a/multipath/main.c
+++ b/multipath/main.c
@@ -425,7 +425,7 @@ configure (struct config *conf, enum mpath_cmds cmd,
 		}
 		if (cmd == CMD_ADD_WWID) {
 			r = remember_wwid(refwwid);
-			if (r == 0)
+			if (r >= 0)
 				printf("wwid '%s' added\n", refwwid);
 			else
 				printf("failed adding '%s' to wwids file\n",
diff --git a/multipathd/main.c b/multipathd/main.c
index 707245c..da40595 100644
--- a/multipathd/main.c
+++ b/multipathd/main.c
@@ -2309,7 +2309,8 @@ configure (struct vectors * vecs)
 
 	sync_maps_state(mpvec);
 	vector_foreach_slot(mpvec, mpp, i){
-		remember_wwid(mpp->wwid);
+		if (remember_wwid(mpp->wwid) == 1)
+			trigger_paths_udev_change(mpp);
 		update_map_pr(mpp);
 	}
 
-- 
2.16.1

  parent reply	other threads:[~2018-04-02 19:50 UTC|newest]

Thread overview: 25+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2018-04-02 19:50 [PATCH v3 00/20] multipath path classification Martin Wilck
2018-04-02 19:50 ` [PATCH v3 01/20] Revert "multipath: ignore -i if find_multipaths is set" Martin Wilck
2018-04-02 19:50 ` [PATCH v3 02/20] Revert "multipathd: imply -n " Martin Wilck
2018-04-02 19:50 ` [PATCH v3 03/20] libmultipath: should_multipath: keep existing maps Martin Wilck
2018-04-02 19:50 ` [PATCH v3 04/20] multipath -u -i: respect entries in WWIDs file Martin Wilck
2018-04-02 19:50 ` Martin Wilck [this message]
2018-04-02 19:50 ` [PATCH v3 06/20] libmultipath: trigger path uevent only when necessary Martin Wilck
2018-04-02 19:50 ` [PATCH v3 07/20] libmultipath: change find_multipaths option to multi-value Martin Wilck
2018-04-02 19:50 ` [PATCH v3 08/20] libmultipath: use const char* in open_file() Martin Wilck
2018-04-02 19:50 ` [PATCH v3 09/20] libmultipath: functions to indicate mapping failure in /dev/shm Martin Wilck
2018-04-02 19:50 ` [PATCH v3 10/20] libmultipath: indicate wwid failure in dm_addmap_create() Martin Wilck
2018-04-02 19:50 ` [PATCH v3 11/20] multipath -u: common code path for result message Martin Wilck
2018-04-02 19:50 ` [PATCH v3 12/20] multipath -u: change output to environment/key format Martin Wilck
2018-04-02 19:50 ` [PATCH v3 13/20] multipath -u: treat failed wwids as invalid Martin Wilck
2018-04-02 19:50 ` [PATCH v3 14/20] multipath -u: add DM_MULTIPATH_DEVICE_PATH=2 for "maybe" Martin Wilck
2018-04-02 19:50 ` [PATCH v3 15/20] libmultipath: implement find_multipaths_timeout Martin Wilck
2018-04-02 19:50 ` [PATCH v3 16/20] multipath -u : set FIND_MULTIPATHS_WAIT_UNTIL from /dev/shm Martin Wilck
2018-04-02 19:50 ` [PATCH v3 17/20] multipath -u: test if path is busy Martin Wilck
2018-04-12 18:41   ` Benjamin Marzinski
2018-04-12 22:17     ` Martin Wilck
2018-04-13 15:53       ` Benjamin Marzinski
2018-04-13 17:57         ` Martin Wilck
2018-04-02 19:50 ` [PATCH v3 18/20] multipath -u: quick check if path is multipathed Martin Wilck
2018-04-02 19:50 ` [PATCH v3 19/20] libmultipath: enable find_multipaths "smart" Martin Wilck
2018-04-02 19:50 ` [PATCH v3 20/20] multipath.rules: find_multipaths "smart" logic Martin Wilck

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20180402195051.26854-6-mwilck@suse.com \
    --to=mwilck@suse.com \
    --cc=bmarzins@redhat.com \
    --cc=christophe.varoqui@opensvc.com \
    --cc=dm-devel@redhat.com \
    --cc=julian.klode@canonical.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.