From: Martin Schwenke Date: Tue, 10 Nov 2015 02:54:47 +0000 (+1100) Subject: ctdb-recoverd: Explicitly set initial recovery master to unknown X-Git-Url: http://git.samba.org/?a=commitdiff_plain;h=e90cab70739cc7c39600c065389f7bdad6038031;p=obnox%2Fsamba%2Fsamba-obnox.git ctdb-recoverd: Explicitly set initial recovery master to unknown Signed-off-by: Martin Schwenke Reviewed-by: Amitay Isaacs --- diff --git a/ctdb/server/ctdb_recoverd.c b/ctdb/server/ctdb_recoverd.c index 25180be092e..b01df0aa7a1 100644 --- a/ctdb/server/ctdb_recoverd.c +++ b/ctdb/server/ctdb_recoverd.c @@ -3503,11 +3503,10 @@ static void main_loop(struct ctdb_context *ctdb, struct ctdb_recoverd *rec, TALLOC_FREE(rec->force_rebalance_nodes); } - /* This is a special case. When recovery daemon is started, recmaster - * is set to -1. If a node is not started in stopped state, then - * start election to decide recovery master + /* When recovery daemon is started, recmaster is set to + * "unknown" so it knows to start an election. */ - if (rec->recmaster == (uint32_t)-1) { + if (rec->recmaster == CTDB_UNKNOWN_PNN) { DEBUG(DEBUG_NOTICE,(__location__ " Initial recovery master set - forcing election\n")); force_election(rec, pnn, nodemap); return; @@ -3918,6 +3917,7 @@ static void monitor_cluster(struct ctdb_context *ctdb) CTDB_NO_MEMORY_FATAL(ctdb, rec); rec->ctdb = ctdb; + rec->recmaster = CTDB_UNKNOWN_PNN; rec->takeover_run = ctdb_op_init(rec, "takeover runs"); CTDB_NO_MEMORY_FATAL(ctdb, rec->takeover_run);