ctdb-daemon: Reset script timeout count in monitor code

This is the only place it is used.

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

diff --git a/ctdb/server/ctdb_monitor.c b/ctdb/server/ctdb_monitor.c
index 44cc54739de97de8dbc02cadd6542bc77adf86c3..80abbff31b1520e2cfaea591ee62d8984485b535 100644 (file)
--- a/ctdb/server/ctdb_monitor.c
+++ b/ctdb/server/ctdb_monitor.c
@@ -152,6 +152,8 @@ static void ctdb_health_callback(struct ctdb_context *ctdb, int status, void *p)
                        /* We pretend this is OK. */
                        goto after_change_status;
                }
+       } else {
+               ctdb->event_script_timeouts = 0;
        }
 
        if (status != 0 && !(node->flags & NODE_FLAGS_UNHEALTHY)) {

diff --git a/ctdb/server/eventscript.c b/ctdb/server/eventscript.c
index 117ec807f8d0522da51569eb92e0423763e040d6..5bc2ee8c503bf412ca5f77d22c790962c06efbe2 100644 (file)
--- a/ctdb/server/eventscript.c
+++ b/ctdb/server/eventscript.c
@@ -420,7 +420,6 @@ static void ctdb_event_script_handler(struct tevent_context *ev,
                               state->options, status));
                }
 
-               ctdb->event_script_timeouts = 0;
                talloc_free(state);
                return;
        }