summaryrefslogtreecommitdiffstats
path: root/ctdb/server/ctdb_daemon.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/ctdb_daemon.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/ctdb_daemon.c')
-rw-r--r--ctdb/server/ctdb_daemon.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/ctdb/server/ctdb_daemon.c b/ctdb/server/ctdb_daemon.c
index 5eca7275c6..0fb1a8de23 100644
--- a/ctdb/server/ctdb_daemon.c
+++ b/ctdb/server/ctdb_daemon.c
@@ -815,7 +815,9 @@ int ctdb_start_daemon(struct ctdb_context *ctdb, bool do_fork, bool use_syslog)
tevent_fd_set_auto_close(fde);
/* release any IPs we hold from previous runs of the daemon */
- ctdb_release_all_ips(ctdb);
+ if (ctdb->tunable.disable_ip_failover == 0) {
+ ctdb_release_all_ips(ctdb);
+ }
/* start the transport going */
ctdb_start_transport(ctdb);