libmultipath: trigger change uevent on new device creation
authorBenjamin Marzinski <bmarzins@redhat.com>
Fri, 13 Apr 2018 21:59:58 +0000 (23:59 +0200)
committerChristophe Varoqui <christophe.varoqui@opensvc.com>
Fri, 11 May 2018 08:48:29 +0000 (10:48 +0200)
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>
Signed-off-by: Martin Wilck <mwilck@suse.com>
libmultipath/configure.c
libmultipath/configure.h
libmultipath/wwids.c
multipath/main.c
multipathd/main.c

index 6df8359..dd98123 100644 (file)
@@ -444,6 +444,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)
 {
@@ -842,8 +864,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);
index 27a7e6f..545cbc2 100644 (file)
@@ -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);
index d0256c2..2806342 100644 (file)
@@ -331,5 +331,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;
 }
index ba83771..686b037 100644 (file)
@@ -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",
index 20b6fe0..10a0ee7 100644 (file)
@@ -2323,7 +2323,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);
        }