From mboxrd@z Thu Jan 1 00:00:00 1970 From: mwilck@suse.com Subject: [PATCH 01/19] multipathd: allow shutdown during configure() Date: Wed, 16 Sep 2020 17:37:00 +0200 Message-ID: <20200916153718.582-2-mwilck@suse.com> References: <20200916153718.582-1-mwilck@suse.com> Mime-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Return-path: In-Reply-To: <20200916153718.582-1-mwilck@suse.com> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: dm-devel-bounces@redhat.com Errors-To: dm-devel-bounces@redhat.com To: Christophe Varoqui , Benjamin Marzinski Cc: Chongyun Wu , dm-devel@redhat.com, Martin Wilck List-Id: dm-devel.ids From: Martin Wilck reconfigure() can be a long-running operation; both initial path discovery and initial map setup can take a long time. Allow the main program to indicate that the process should be interrupted if a shutdown signal was received. We take advantage of the dynamic linker's symbol lookup ordering here. The default implementation of should_exit never returns true, but callers (like multipathd) can override it. Cc: Chongyun Wu Signed-off-by: Martin Wilck --- libmultipath/configure.c | 6 ++++++ libmultipath/discovery.c | 3 +++ libmultipath/util.c | 5 +++++ libmultipath/util.h | 1 + multipathd/main.c | 17 +++++++++++++++++ 5 files changed, 32 insertions(+) diff --git a/libmultipath/configure.c b/libmultipath/configure.c index 213dbe4..7a8eef3 100644 --- a/libmultipath/configure.c +++ b/libmultipath/configure.c @@ -1159,6 +1159,12 @@ int coalesce_paths (struct vectors * vecs, vector newmp, char * refwwid, vector_foreach_slot (pathvec, pp1, k) { int invalid; + + if (should_exit()) { + ret = CP_FAIL; + goto out; + } + /* skip this path for some reason */ /* 1. if path has no unique id or wwid blacklisted */ diff --git a/libmultipath/discovery.c b/libmultipath/discovery.c index 3f1b1d7..000f4c9 100644 --- a/libmultipath/discovery.c +++ b/libmultipath/discovery.c @@ -200,6 +200,9 @@ path_discovery (vector pathvec, int flag) const char *devtype; const char *devpath; + if (should_exit()) + break; + devpath = udev_list_entry_get_name(entry); condlog(4, "Discover device %s", devpath); udevice = udev_device_new_from_syspath(udev, devpath); diff --git a/libmultipath/util.c b/libmultipath/util.c index 1512424..7a0b2eb 100644 --- a/libmultipath/util.c +++ b/libmultipath/util.c @@ -422,3 +422,8 @@ void _log_bitfield_overflow(const char *f, unsigned int bit, unsigned int len) { condlog(0, "%s: bitfield overflow: %u >= %u", f, bit, len); } + +int should_exit(void) +{ + return 0; +} diff --git a/libmultipath/util.h b/libmultipath/util.h index 045bbee..a0d3d50 100644 --- a/libmultipath/util.h +++ b/libmultipath/util.h @@ -27,6 +27,7 @@ int parse_prkey(const char *ptr, uint64_t *prkey); int parse_prkey_flags(const char *ptr, uint64_t *prkey, uint8_t *flags); int safe_write(int fd, const void *buf, size_t count); void set_max_fds(rlim_t max_fds); +int should_exit(void); #define KERNEL_VERSION(maj, min, ptc) ((((maj) * 256) + (min)) * 256 + (ptc)) #define ARRAY_SIZE(x) (sizeof(x)/sizeof((x)[0])) diff --git a/multipathd/main.c b/multipathd/main.c index f7229a7..d5e90b2 100644 --- a/multipathd/main.c +++ b/multipathd/main.c @@ -141,6 +141,11 @@ static inline enum daemon_status get_running_state(void) return st; } +int should_exit(void) +{ + return get_running_state() == DAEMON_SHUTDOWN; +} + /* * global copy of vecs for use in sig handlers */ @@ -2580,6 +2585,9 @@ configure (struct vectors * vecs) goto fail; } + if (should_exit()) + goto fail; + conf = get_multipath_config(); pthread_cleanup_push(put_multipath_config, conf); vector_foreach_slot (vecs->pathvec, pp, i){ @@ -2596,6 +2604,9 @@ configure (struct vectors * vecs) goto fail; } + if (should_exit()) + goto fail; + /* * create new set of maps & push changed ones into dm * In the first call, use FORCE_RELOAD_WEAK to avoid making @@ -2610,6 +2621,9 @@ configure (struct vectors * vecs) goto fail; } + if (should_exit()) + goto fail; + /* * may need to remove some maps which are no longer relevant * e.g., due to blacklist changes in conf file @@ -2621,6 +2635,9 @@ configure (struct vectors * vecs) dm_lib_release(); + if (should_exit()) + goto fail; + sync_maps_state(mpvec); vector_foreach_slot(mpvec, mpp, i){ if (remember_wwid(mpp->wwid) == 1) -- 2.28.0