sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-02-28 01:58:17 +03:00
Code

ctdb-daemon: Move release of all IPs to startup

Browse Source 
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>
This commit is contained in:
Martin Schwenke 2015-05-08 20:00:35 +10:00 committed by Amitay Isaacs
parent 7d0a4ab622
commit a1d6b3fb4b
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
ctdb/server/ctdb_daemon.c
View File

@ -1334,9 +1334,6 @@ int ctdb_start_daemon(struct ctdb_context *ctdb, bool do_fork)
} }
tevent_fd_set_auto_close(fde); 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 */ /* Start the transport */
if (ctdb->methods->start(ctdb) != 0) { if (ctdb->methods->start(ctdb) != 0) {
DEBUG(DEBUG_ALERT,("transport failed to start!\n")); DEBUG(DEBUG_ALERT,("transport failed to start!\n"));

3
ctdb/server/ctdb_monitor.c
View File

@ -247,6 +247,9 @@ static void ctdb_run_startup(struct event_context *ev, struct timed_event *te,
return; 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")); DEBUG(DEBUG_NOTICE,("Running the \"startup\" event.\n"));
ret = ctdb_event_script_callback(ctdb, ret = ctdb_event_script_callback(ctdb,
ctdb->monitor->monitor_context, ctdb->monitor->monitor_context,