From f196afd58b4f917b3808b2234a6cb78ec3d3357d Mon Sep 17 00:00:00 2001 From: Ronnie Sahlberg Date: Fri, 9 May 2008 13:41:31 +1000 Subject: [PATCH] fix a bug where the public ip addresses of the cluster would not be redistributed across the cluster after a recovery was performed. Remove a bogus check inside the recovery daemon that ONLY redistributed public addresses IFF the local node had/served public addresses. This was a valid optimization long ago when we enforced that all nodes must use the same public addresses file but is invalid today where we can have different public addresses configs on all nodes and even have some nodes that do NOT use public addresses at all. (This used to be ctdb commit 5833e6b99d9afaf35dc8354df8676b9115418b23) --- ctdb/server/ctdb_recoverd.c | 16 ++++++---------- 1 file changed, 6 insertions(+), 10 deletions(-) diff --git a/ctdb/server/ctdb_recoverd.c b/ctdb/server/ctdb_recoverd.c index a40dfbb62f3..95dd94f4b68 100644 --- a/ctdb/server/ctdb_recoverd.c +++ b/ctdb/server/ctdb_recoverd.c @@ -1452,18 +1452,14 @@ static int do_recovery(struct ctdb_recoverd *rec, DEBUG(DEBUG_NOTICE, (__location__ " Recovery - updated flags\n")); /* - if enabled, tell nodes to takeover their public IPs + tell nodes to takeover their public IPs */ - if (ctdb->vnn) { - rec->need_takeover_run = false; - ret = ctdb_takeover_run(ctdb, nodemap); - if (ret != 0) { - DEBUG(DEBUG_ERR, (__location__ " Unable to setup public takeover addresses\n")); - return -1; - } - DEBUG(DEBUG_INFO, (__location__ " Recovery - done takeover\n")); + rec->need_takeover_run = false; + ret = ctdb_takeover_run(ctdb, nodemap); + if (ret != 0) { + DEBUG(DEBUG_ERR, (__location__ " Unable to setup public takeover addresses\n")); + return -1; } - DEBUG(DEBUG_NOTICE, (__location__ " Recovery - takeip finished\n")); /* execute the "recovered" event script on all nodes */