sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-02-02 09:47:23 +03:00
Code

Undo damage done by d8d37493478a26c5f1809a5f3df89ffd6e149281

Browse Source 
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)
This commit is contained in:
Martin Schwenke 2012-03-22 15:27:25 +11:00 committed by Ronnie Sahlberg
parent 430cbcc30b
commit fbe64dec01
3 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
ctdb/include/ctdb_private.h
View File

@ -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;

2
ctdb/server/ctdb_recoverd.c
View File

@ -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));

4
ctdb/server/ctdbd.c
View File

@ -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 {