From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Benjamin Marzinski Date: Fri, 16 Jul 2021 12:39:17 -0500 Subject: [PATCH] multipath: print warning if multipathd is not running. If multipath notices that multipath devices exist or were created, and multipathd is not running, it now prints a warning message, so users are notified of the issue. Signed-off-by: Benjamin Marzinski --- libmultipath/configure.c | 13 +++++++++++-- libmultipath/configure.h | 1 + multipath/main.c | 5 +++++ 3 files changed, 17 insertions(+), 2 deletions(-) diff --git a/libmultipath/configure.c b/libmultipath/configure.c index f24d9283..9c8d3e34 100644 --- a/libmultipath/configure.c +++ b/libmultipath/configure.c @@ -1043,7 +1043,8 @@ deadmap (struct multipath * mpp) return 1; /* dead */ } -int check_daemon(void) +extern int +check_daemon(void) { int fd; char *reply; @@ -1097,6 +1098,8 @@ int coalesce_paths (struct vectors * vecs, vector newmp, char * refwwid, struct config *conf; int allow_queueing; uint64_t *size_mismatch_seen; + bool map_processed = false; + bool no_daemon = false; /* ignore refwwid if it's empty */ if (refwwid && !strlen(refwwid)) @@ -1239,7 +1242,9 @@ int coalesce_paths (struct vectors * vecs, vector newmp, char * refwwid, conf = get_multipath_config(); allow_queueing = conf->allow_queueing; put_multipath_config(conf); - if (!is_daemon && !allow_queueing && !check_daemon()) { + if (!is_daemon && !allow_queueing && + (no_daemon || !check_daemon())) { + no_daemon = true; if (mpp->no_path_retry != NO_PATH_RETRY_UNDEF && mpp->no_path_retry != NO_PATH_RETRY_FAIL) condlog(3, "%s: multipathd not running, unset " @@ -1267,6 +1272,7 @@ int coalesce_paths (struct vectors * vecs, vector newmp, char * refwwid, else remove_map(mpp, vecs, 0); } + map_processed = true; } /* * Flush maps with only dead paths (ie not in sysfs) @@ -1292,6 +1298,9 @@ int coalesce_paths (struct vectors * vecs, vector newmp, char * refwwid, condlog(2, "%s: remove (dead)", alias); } } + if (map_processed && !is_daemon && (no_daemon || !check_daemon())) + condlog(2, "multipath devices exist, but multipathd service is not running"); + ret = CP_OK; out: free(size_mismatch_seen); diff --git a/libmultipath/configure.h b/libmultipath/configure.h index 81090dd4..8a266d31 100644 --- a/libmultipath/configure.h +++ b/libmultipath/configure.h @@ -59,3 +59,4 @@ struct udev_device *get_udev_device(const char *dev, enum devtypes dev_type); void trigger_paths_udev_change(struct multipath *mpp, bool is_mpath); void trigger_partitions_udev_change(struct udev_device *dev, const char *action, int len); +int check_daemon(void); diff --git a/multipath/main.c b/multipath/main.c index 607cada2..14d045c9 100644 --- a/multipath/main.c +++ b/multipath/main.c @@ -254,6 +254,7 @@ get_dm_mpvec (enum mpath_cmds cmd, vector curmp, vector pathvec, char * refwwid) int i; struct multipath * mpp; char params[PARAMS_SIZE], status[PARAMS_SIZE]; + bool maps_present = false; if (dm_get_maps(curmp)) return 1; @@ -302,6 +303,8 @@ get_dm_mpvec (enum mpath_cmds cmd, vector curmp, vector pathvec, char * refwwid) if (cmd == CMD_CREATE) reinstate_paths(mpp); + + maps_present = true; } if (cmd == CMD_LIST_SHORT || cmd == CMD_LIST_LONG) { @@ -311,6 +314,8 @@ get_dm_mpvec (enum mpath_cmds cmd, vector curmp, vector pathvec, char * refwwid) put_multipath_config(conf); } + if (maps_present && !check_daemon()) + condlog(2, "multipath devices exist, but multipathd service is not running"); return 0; }