From 2a9f94a6a8674bdfe52dc50ff36859bcb2aae22a Mon Sep 17 00:00:00 2001 From: Hannes Reinecke Date: Fri, 13 Dec 2013 13:12:40 +0100 Subject: [PATCH 1/1] multipath: do not print 'path is up' for removed paths When a path is removed the previous checker message is still kept in the checker context, and will be printed upon each check. This causes multipath to print out 'path is up' even though it already has been removed from sysfs. Signed-off-by: Hannes Reinecke --- multipathd/main.c | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/multipathd/main.c b/multipathd/main.c index 32195119..309b1aab 100644 --- a/multipathd/main.c +++ b/multipathd/main.c @@ -1127,6 +1127,8 @@ check_path (struct vectors * vecs, struct path * pp) newstate = path_offline(pp); if (newstate == PATH_UP) newstate = get_state(pp, 1); + else + checker_clear_message(&pp->checker); if (newstate == PATH_WILD || newstate == PATH_UNCHECKED) { condlog(2, "%s: unusable path", pp->dev); @@ -1153,7 +1155,9 @@ check_path (struct vectors * vecs, struct path * pp) if (newstate != pp->state) { int oldstate = pp->state; pp->state = newstate; - LOG_MSG(1, checker_message(&pp->checker)); + + if (strlen(checker_message(&pp->checker))) + LOG_MSG(1, checker_message(&pp->checker)); /* * upon state change, reset the checkint @@ -1235,7 +1239,8 @@ check_path (struct vectors * vecs, struct path * pp) pp->tick = pp->checkint; } } - else if (newstate == PATH_DOWN) { + else if (newstate == PATH_DOWN && + strlen(checker_message(&pp->checker))) { if (conf->log_checker_err == LOG_CHKR_ERR_ONCE) LOG_MSG(3, checker_message(&pp->checker)); else -- 2.20.1