diff options
| author | Martin Schwenke <martin@meltin.net> | 2015-05-08 20:00:35 +1000 |
|---|---|---|
| committer | Amitay Isaacs <amitay@samba.org> | 2015-05-13 06:42:13 +0200 |
| commit | a1d6b3fb4bff4251facd52bfe7c03d68562a81a7 (patch) | |
| tree | 2c17b38c85f80dcfaef33bbe3c4a0afbb2154f3a | |
| parent | 7d0a4ab6229b19ee55f79cdcf6de811b429e4657 (diff) | |
| download | samba-a1d6b3fb4bff4251facd52bfe7c03d68562a81a7.tar.gz | |
ctdb-daemon: Move release of all IPs to startup
This means that DisableIPFailover will be set if it should be.
Signed-off-by: Martin Schwenke <martin@meltin.net>
Reviewed-by: Amitay Isaacs <amitay@gmail.com>
| -rw-r--r-- | ctdb/server/ctdb_daemon.c | 3 | ||||
| -rw-r--r-- | ctdb/server/ctdb_monitor.c | 3 |
2 files changed, 3 insertions, 3 deletions
diff --git a/ctdb/server/ctdb_daemon.c b/ctdb/server/ctdb_daemon.c index fa54d3da5bc..dada0a4f161 100644 --- a/ctdb/server/ctdb_daemon.c +++ b/ctdb/server/ctdb_daemon.c @@ -1334,9 +1334,6 @@ int ctdb_start_daemon(struct ctdb_context *ctdb, bool do_fork) } tevent_fd_set_auto_close(fde); - /* release any IPs we hold from previous runs of the daemon */ - ctdb_release_all_ips(ctdb); - /* Start the transport */ if (ctdb->methods->start(ctdb) != 0) { DEBUG(DEBUG_ALERT,("transport failed to start!\n")); diff --git a/ctdb/server/ctdb_monitor.c b/ctdb/server/ctdb_monitor.c index c502f0e40e5..6dd7c1e637a 100644 --- a/ctdb/server/ctdb_monitor.c +++ b/ctdb/server/ctdb_monitor.c @@ -247,6 +247,9 @@ static void ctdb_run_startup(struct event_context *ev, struct timed_event *te, return; } + /* release any IPs we hold from previous runs of the daemon */ + ctdb_release_all_ips(ctdb); + DEBUG(DEBUG_NOTICE,("Running the \"startup\" event.\n")); ret = ctdb_event_script_callback(ctdb, ctdb->monitor->monitor_context, |