summaryrefslogtreecommitdiffstats
path: root/ctdb/server/ctdbd.c
diff options
context:
space:
mode:
authorRonnie Sahlberg <ronniesahlberg@gmail.com>2010-11-09 15:19:06 +1100
committerRonnie Sahlberg <ronniesahlberg@gmail.com>2010-11-10 14:55:24 +1100
commit5f76f3c0e248446f13227a210bd6d2dfa3a8d261 (patch)
tree84c9b70bd417cf7634c1c08263094402dd244d02 /ctdb/server/ctdbd.c
parent93058e79766536c6a48fbb8906da73a2e6562786 (diff)
downloadsamba-5f76f3c0e248446f13227a210bd6d2dfa3a8d261.tar.gz
samba-5f76f3c0e248446f13227a210bd6d2dfa3a8d261.tar.xz
samba-5f76f3c0e248446f13227a210bd6d2dfa3a8d261.zip
Add a new tunable : DisableIPFailover that when set to non 0
will stopp any ip reallocations at all from happening. (This used to be ctdb commit d8d37493478a26c5f1809a5f3df89ffd6e149281)
Diffstat (limited to 'ctdb/server/ctdbd.c')
-rw-r--r--ctdb/server/ctdbd.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/ctdb/server/ctdbd.c b/ctdb/server/ctdbd.c
index f8647f0900d..93a2d0823c3 100644
--- a/ctdb/server/ctdbd.c
+++ b/ctdb/server/ctdbd.c
@@ -207,6 +207,7 @@ 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) {
@@ -323,8 +324,6 @@ int main(int argc, const char *argv[])
ctdb->valgrinding = options.valgrinding;
- ctdb->do_checkpublicip = !options.no_publicipcheck;
-
if (options.max_persistent_check_errors < 0) {
ctdb->max_persistent_check_errors = 0xFFFFFFFFFFFFFFFFLL;
} else {