ctdb-daemon: Skip monitoring when not in RUNNING runstate
authorMartin Schwenke <martin@meltin.net>
Mon, 4 Sep 2017 04:39:01 +0000 (14:39 +1000)
committerAmitay Isaacs <amitay@samba.org>
Thu, 14 Sep 2017 12:49:15 +0000 (14:49 +0200)
Monitoring does not need to be done in other states.

Signed-off-by: Martin Schwenke <martin@meltin.net>
Reviewed-by: Amitay Isaacs <amitay@gmail.com>
ctdb/server/ctdb_monitor.c

index 1b29df50872b502c739f9648ff0c20d12285a55f..90808b03c6fe586798b10af90b8dadf3c49c026b 100644 (file)
@@ -388,6 +388,7 @@ static void ctdb_check_health(struct tevent_context *ev,
 
        if (ctdb->recovery_mode != CTDB_RECOVERY_NORMAL ||
            ctdb->nodes[ctdb->pnn]->flags & NODE_FLAGS_INACTIVE ||
+           ctdb->runstate != CTDB_RUNSTATE_RUNNING ||
            ctdb->monitor->monitoring_mode == CTDB_MONITORING_DISABLED) {
                skip_monitoring = true;
        } else {