reload_map() doesn't do the work to sync the state after reloading the map. Instead of calling it directly, cli_reload() and uev_update_path() should call update_path_groups(), which calls reload_map() with all the necessary syncing.
Signed-off-by: Benjamin Marzinski <[email protected]> --- multipathd/cli_handlers.c | 2 +- multipathd/main.c | 13 ++++++++----- multipathd/main.h | 2 ++ 3 files changed, 11 insertions(+), 6 deletions(-) diff --git a/multipathd/cli_handlers.c b/multipathd/cli_handlers.c index f95813e..60e17d6 100644 --- a/multipathd/cli_handlers.c +++ b/multipathd/cli_handlers.c @@ -877,7 +877,7 @@ cli_reload(void *v, char **reply, int *len, void *data) return 1; } - return reload_map(vecs, mpp, 0, 1); + return update_path_groups(mpp, vecs, 0); } int resize_map(struct multipath *mpp, unsigned long long size, diff --git a/multipathd/main.c b/multipathd/main.c index 81ad6c0..27ff186 100644 --- a/multipathd/main.c +++ b/multipathd/main.c @@ -1272,10 +1272,13 @@ uev_update_path (struct uevent *uev, struct vectors * vecs) else { if (ro == 1) pp->mpp->force_readonly = 1; - retval = reload_map(vecs, mpp, 0, 1); - pp->mpp->force_readonly = 0; - condlog(2, "%s: map %s reloaded (retval %d)", - uev->kernel, mpp->alias, retval); + retval = update_path_groups(mpp, vecs, 0); + if (retval == 2) + condlog(2, "%s: map removed during reload", pp->dev); + else { + pp->mpp->force_readonly = 0; + condlog(2, "%s: map %s reloaded (retval %d)", uev->kernel, mpp->alias, retval); + } } } } @@ -1831,7 +1834,7 @@ int update_path_groups(struct multipath *mpp, struct vectors *vecs, int refresh) dm_lib_release(); if (setup_multipath(vecs, mpp) != 0) - return 1; + return 2; sync_map_state(mpp); return 0; diff --git a/multipathd/main.h b/multipathd/main.h index 8fd426b..e5c1398 100644 --- a/multipathd/main.h +++ b/multipathd/main.h @@ -43,5 +43,7 @@ int __setup_multipath (struct vectors * vecs, struct multipath * mpp, int reset); #define setup_multipath(vecs, mpp) __setup_multipath(vecs, mpp, 1) int update_multipath (struct vectors *vecs, char *mapname, int reset); +int update_path_groups(struct multipath *mpp, struct vectors *vecs, + int refresh); #endif /* MAIN_H */ -- 2.17.2 -- dm-devel mailing list [email protected] https://www.redhat.com/mailman/listinfo/dm-devel
