diff --git a/ctdb/common/ctdb_recoverd.c b/ctdb/common/ctdb_recoverd.c index cd68a9ce00c..3f8882ce79d 100644 --- a/ctdb/common/ctdb_recoverd.c +++ b/ctdb/common/ctdb_recoverd.c @@ -36,6 +36,7 @@ static void timeout_func(struct event_context *ev, struct timed_event *te, } #define CONTROL_TIMEOUT() timeval_current_ofs(5, 0) +#define MONITOR_TIMEOUT() timeval_current_ofs(1, 0) static int set_recovery_mode(struct ctdb_context *ctdb, struct ctdb_node_map *nodemap, uint32_t rec_mode) { @@ -699,7 +700,7 @@ again: /* we only check for recovery once every second */ timed_out = 0; - event_add_timed(ctdb->ev, mem_ctx, CONTROL_TIMEOUT(), timeout_func, ctdb); + event_add_timed(ctdb->ev, mem_ctx, MONITOR_TIMEOUT(), timeout_func, ctdb); while (!timed_out) { event_loop_once(ctdb->ev); } diff --git a/ctdb/include/ctdb_private.h b/ctdb/include/ctdb_private.h index 418e4751ee0..31751c24ae9 100644 --- a/ctdb/include/ctdb_private.h +++ b/ctdb/include/ctdb_private.h @@ -334,7 +334,7 @@ struct ctdb_db_context { #define CTDB_TRAVERSE_TIMEOUT 20 /* timeout between dead-node monitoring events */ -#define CTDB_MONITORING_TIMEOUT 3 +#define CTDB_MONITORING_TIMEOUT 2 /* number of monitoring timeouts before a node is considered dead */ #define CTDB_MONITORING_DEAD_COUNT 2