From: Martin Wilck <[email protected]> If multipathd gets a shutdown request during initial reconfigure(), it shouldn't send "READY=1" to systemd. Ensure this by sending "READY=1" via post_config_state().
Reviewed-by: Benjamin Marzinski <[email protected]> Signed-off-by: Martin Wilck <[email protected]> --- multipathd/main.c | 16 +++++++--------- 1 file changed, 7 insertions(+), 9 deletions(-) diff --git a/multipathd/main.c b/multipathd/main.c index fa53e96..53a22a4 100644 --- a/multipathd/main.c +++ b/multipathd/main.c @@ -189,6 +189,8 @@ static void do_sd_notify(enum daemon_status old_state, { char notify_msg[MSG_SIZE]; const char *msg; + static bool startup_done = false; + /* * Checkerloop switches back and forth between idle and running state. * No need to tell systemd each time. @@ -205,6 +207,11 @@ static void do_sd_notify(enum daemon_status old_state, if (msg && !safe_sprintf(notify_msg, "STATUS=%s", msg)) sd_notify(0, notify_msg); + + if (new_state == DAEMON_IDLE && !startup_done) { + sd_notify(0, "READY=1"); + startup_done = true; + } } #endif @@ -2903,9 +2910,6 @@ child (__attribute__((unused)) void *param) struct vectors * vecs; struct multipath * mpp; int i; -#ifdef USE_SYSTEMD - int startup_done = 0; -#endif int rc; int pid_fd = -1; struct config *conf; @@ -3065,12 +3069,6 @@ child (__attribute__((unused)) void *param) } lock_cleanup_pop(vecs->lock); post_config_state(DAEMON_IDLE); -#ifdef USE_SYSTEMD - if (!startup_done) { - sd_notify(0, "READY=1"); - startup_done = 1; - } -#endif } } -- 2.28.0 -- dm-devel mailing list [email protected] https://www.redhat.com/mailman/listinfo/dm-devel
