diff options
| author | Ronnie Sahlberg <ronniesahlberg@gmail.com> | 2010-11-10 14:46:05 +1100 |
|---|---|---|
| committer | Ronnie Sahlberg <ronniesahlberg@gmail.com> | 2010-11-10 14:55:25 +1100 |
| commit | 7e29fd60934a90109a13f745ac9ae135c503bdb3 (patch) | |
| tree | 89cf806cda05f7e536ff51621ba5d11f897a8d8f | |
| parent | 055eafb7907a9bb04f2f576aa86946bc3dcef530 (diff) | |
| download | samba-7e29fd60934a90109a13f745ac9ae135c503bdb3.tar.gz samba-7e29fd60934a90109a13f745ac9ae135c503bdb3.tar.xz samba-7e29fd60934a90109a13f745ac9ae135c503bdb3.zip | |
Dont check remote ip allocation if public ip mgmt is disabled
(This used to be ctdb commit 441ad00af842a8b7b5291de60d8ab08a064f5327)
| -rw-r--r-- | ctdb/server/ctdb_recoverd.c | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/ctdb/server/ctdb_recoverd.c b/ctdb/server/ctdb_recoverd.c index fca1583214..5639d5b2f4 100644 --- a/ctdb/server/ctdb_recoverd.c +++ b/ctdb/server/ctdb_recoverd.c @@ -1277,10 +1277,12 @@ static int ctdb_reload_remote_public_ips(struct ctdb_context *ctdb, return -1; } - if (rec->ip_check_disable_ctx == NULL) { - if (verify_remote_ip_allocation(ctdb, ctdb->nodes[j]->known_public_ips)) { - DEBUG(DEBUG_ERR,("Node %d has inconsistent public ip allocation and needs update.\n", ctdb->nodes[j]->pnn)); - rec->need_takeover_run = true; + if (ctdb->tunable.disable_ip_failover == 0) { + if (rec->ip_check_disable_ctx == NULL) { + if (verify_remote_ip_allocation(ctdb, ctdb->nodes[j]->known_public_ips)) { + DEBUG(DEBUG_ERR,("Node %d has inconsistent public ip allocation and needs update.\n", ctdb->nodes[j]->pnn)); + rec->need_takeover_run = true; + } } } |