diff options
| author | Martin Schwenke <martin@meltin.net> | 2012-03-22 15:27:25 +1100 |
|---|---|---|
| committer | Ronnie Sahlberg <ronniesahlberg@gmail.com> | 2012-03-22 15:34:52 +1100 |
| commit | fbe64dec018afec3ca56b3fd90eb4dc4e3d53d15 (patch) | |
| tree | ccadbb9887dcf62071ea2fde07ec6a26a9e9d0c7 | |
| parent | 430cbcc30b9fb20318fedef022ce5329a9972fa4 (diff) | |
| download | samba-fbe64dec018afec3ca56b3fd90eb4dc4e3d53d15.tar.gz samba-fbe64dec018afec3ca56b3fd90eb4dc4e3d53d15.tar.xz samba-fbe64dec018afec3ca56b3fd90eb4dc4e3d53d15.zip | |
Undo damage done by d8d37493478a26c5f1809a5f3df89ffd6e149281
The implementation of DisableIPFailover got intermingled with
--nopublicipcheck. This just looks wrong - Ronnie must have been
having a bad day. :-)
Signed-off-by: Martin Schwenke <martin@meltin.net>
(This used to be ctdb commit 5083b266dd68b292c4275505f3d1b878dbf12f11)
| -rw-r--r-- | ctdb/include/ctdb_private.h | 1 | ||||
| -rw-r--r-- | ctdb/server/ctdb_recoverd.c | 2 | ||||
| -rw-r--r-- | ctdb/server/ctdbd.c | 4 |
3 files changed, 4 insertions, 3 deletions
diff --git a/ctdb/include/ctdb_private.h b/ctdb/include/ctdb_private.h index 3d5751b980..657bb62bc6 100644 --- a/ctdb/include/ctdb_private.h +++ b/ctdb/include/ctdb_private.h @@ -453,6 +453,7 @@ struct ctdb_context { uint32_t recovery_master; struct ctdb_call_state *pending_calls; struct ctdb_client_ip *client_ip_list; + bool do_checkpublicip; struct trbt_tree *server_ids; bool do_setsched; void *saved_scheduler_param; diff --git a/ctdb/server/ctdb_recoverd.c b/ctdb/server/ctdb_recoverd.c index 642679b4ad..97e46704b1 100644 --- a/ctdb/server/ctdb_recoverd.c +++ b/ctdb/server/ctdb_recoverd.c @@ -1406,7 +1406,7 @@ static int ctdb_reload_remote_public_ips(struct ctdb_context *ctdb, return -1; } - if (ctdb->tunable.disable_ip_failover == 0) { + if (ctdb->do_checkpublicip) { 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)); diff --git a/ctdb/server/ctdbd.c b/ctdb/server/ctdbd.c index a8d956d865..4205bd227b 100644 --- a/ctdb/server/ctdbd.c +++ b/ctdb/server/ctdbd.c @@ -209,8 +209,6 @@ int main(int argc, const char *argv[]) ctdb_tunables_set_defaults(ctdb); - ctdb->tunable.disable_ip_failover = options.no_publicipcheck; - ret = ctdb_set_recovery_lock_file(ctdb, options.recovery_lock_file); if (ret == -1) { DEBUG(DEBUG_ALERT,("ctdb_set_recovery_lock_file failed - %s\n", ctdb_errstr(ctdb))); @@ -323,6 +321,8 @@ int main(int argc, const char *argv[]) ctdb->do_setsched = 1; } + ctdb->do_checkpublicip = !options.no_publicipcheck; + if (options.max_persistent_check_errors < 0) { ctdb->max_persistent_check_errors = 0xFFFFFFFFFFFFFFFFLL; } else { |