diff options
| author | Martin Schwenke <martin@meltin.net> | 2022-01-15 13:02:02 +1100 |
|---|---|---|
| committer | Martin Schwenke <martins@samba.org> | 2022-01-17 10:21:33 +0000 |
| commit | 34d2ca0ae6471c8d742b22aa4c57012232a2a832 (patch) | |
| tree | 6fc27544d03c1037e804731f48987b9c1020e9e8 /ctdb/server/ctdb_recoverd.c | |
| parent | 1dfb266038f6fdf971bb0ffe0726f778b986371d (diff) | |
| download | samba-34d2ca0ae6471c8d742b22aa4c57012232a2a832.tar.gz | |
ctdb-config: Add configuration option [cluster] leader timeout
Signed-off-by: Martin Schwenke <martin@meltin.net>
Reviewed-by: Amitay Isaacs <amitay@gmail.com>
Diffstat (limited to 'ctdb/server/ctdb_recoverd.c')
| -rw-r--r-- | ctdb/server/ctdb_recoverd.c | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/ctdb/server/ctdb_recoverd.c b/ctdb/server/ctdb_recoverd.c index c2a48a07b4e..cc239959c56 100644 --- a/ctdb/server/ctdb_recoverd.c +++ b/ctdb/server/ctdb_recoverd.c @@ -48,8 +48,6 @@ #include "ctdb_cluster_mutex.h" -#define LEADER_BROADCAST_TIMEOUT 5 - /* List of SRVID requests that need to be processed */ struct srvid_list { struct srvid_list *next, *prev; @@ -253,7 +251,6 @@ struct ctdb_recoverd { uint32_t leader; struct tevent_timer *leader_broadcast_te; struct tevent_timer *leader_broadcast_timeout_te; - unsigned int leader_broadcast_timeout; uint32_t pnn; uint32_t last_culprit_node; struct ctdb_node_map_old *nodemap; @@ -2006,7 +2003,7 @@ static int leader_broadcast_timeout_start(struct ctdb_recoverd *rec) tevent_add_timer( ctdb->ev, rec, - timeval_current_ofs(rec->leader_broadcast_timeout, 0), + timeval_current_ofs(ctdb_config.leader_timeout, 0), leader_broadcast_timeout_handler, rec); if (rec->leader_broadcast_timeout_te == NULL) { @@ -2979,7 +2976,6 @@ static void monitor_cluster(struct ctdb_context *ctdb) rec->leader = CTDB_UNKNOWN_PNN; rec->pnn = ctdb_get_pnn(ctdb); rec->cluster_lock_handle = NULL; - rec->leader_broadcast_timeout = LEADER_BROADCAST_TIMEOUT; rec->helper_pid = -1; rec->takeover_run = ctdb_op_init(rec, "takeover runs"); |