From 202791cf7258ca7946989112c5ed6fffbd10be7a Mon Sep 17 00:00:00 2001 From: Amitay Isaacs Date: Wed, 4 Apr 2012 14:42:23 +1000 Subject: recoverd: Fix spurious warnings when running with --nopublicipcheck Signed-off-by: Amitay Isaacs (This used to be ctdb commit 7f8096f56d8274151705ac822b582d972078f8fe) --- ctdb/server/ctdb_recoverd.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'ctdb') diff --git a/ctdb/server/ctdb_recoverd.c b/ctdb/server/ctdb_recoverd.c index 97e46704b1..c079217868 100644 --- a/ctdb/server/ctdb_recoverd.c +++ b/ctdb/server/ctdb_recoverd.c @@ -2775,13 +2775,13 @@ static int verify_local_ip_allocation(struct ctdb_context *ctdb, struct ctdb_rec ctdb_addr_to_str(&ips->ips[j].addr))); need_takeover_run = true; } else if (ips->ips[j].pnn == pnn) { - if (!ctdb_sys_have_ip(&ips->ips[j].addr)) { + if (ctdb->do_checkpublicip && !ctdb_sys_have_ip(&ips->ips[j].addr)) { DEBUG(DEBUG_CRIT,("Public address '%s' is missing and we should serve this ip\n", ctdb_addr_to_str(&ips->ips[j].addr))); need_takeover_run = true; } } else { - if (ctdb_sys_have_ip(&ips->ips[j].addr)) { + if (ctdb->do_checkpublicip && ctdb_sys_have_ip(&ips->ips[j].addr)) { DEBUG(DEBUG_CRIT,("We are still serving a public address '%s' that we should not be serving.\n", ctdb_addr_to_str(&ips->ips[j].addr))); need_takeover_run = true; -- cgit