scripts: Move dropping of all IPs from initscript to "init" event

It makes sense to do this in the "init" event and make the initscript less complicated. Signed-off-by: Martin Schwenke <[email protected]> (This used to be ctdb commit 0b77cceb49a30a181063adc7868d42d2851318e8)
whyshan · Jun 20, 2013 · 9614681 · 9614681
1 parent bee02e0
commit 9614681
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/ctdb/config/ctdb.init b/ctdb/config/ctdb.init
@@ -247,10 +247,6 @@ start() {
 
     export_debug_variables
 
-    # make sure we drop any ips that might still be held if previous
-    # instance of ctdb got killed with -9 or similar
-    drop_all_public_ips 2>&1 | script_log "ctdb.init"
-
     if select_tdb_checker ; then
 	check_persistent_databases || return $?
 	check_non_persistent_databases

diff --git a/ctdb/config/events.d/00.ctdb b/ctdb/config/events.d/00.ctdb
@@ -75,6 +75,10 @@ case "$1" in
 	    echo "mkdir -p $CTDB_VARDIR/state - failed - $ret"
 	    exit $ret
 	}
+
+	# make sure we drop any ips that might still be held if
+	# previous instance of ctdb got killed with -9 or similar
+	drop_all_public_ips
 	;;
 
      setup)