From: Martin Schwenke <martin@meltin.net>
Date: Tue, 6 Feb 2018 01:00:31 +0000 (+1100)
Subject: ctdb-scripts: Do not use ctdb_service_reconfigure() for policy routing
X-Git-Tag: talloc-2.1.12~328
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=0519c513adc7c6f024c50facfb8a963fedd3e1b7;p=thirdparty%2Fsamba.git

ctdb-scripts: Do not use ctdb_service_reconfigure() for policy routing

This is an unconditional reconfiguration so skip the unnecessary
logic.

Signed-off-by: Martin Schwenke <martin@meltin.net>
Reviewed-by: Amitay Isaacs <amitay@gmail.com>
---

diff --git a/ctdb/config/events.d/13.per_ip_routing b/ctdb/config/events.d/13.per_ip_routing
index 4fff73b40e1..d8e02475dff 100755
--- a/ctdb/config/events.d/13.per_ip_routing
+++ b/ctdb/config/events.d/13.per_ip_routing
@@ -354,17 +354,6 @@ remove_bogus_routes ()
 
 ######################################################################
 
-service_reconfigure ()
-{
-    add_missing_routes "force"
-    remove_bogus_routes
-
-    # flush our route cache
-    set_proc sys/net/ipv4/route/flush 1
-}
-
-######################################################################
-
 ctdb_check_args "$@"
 
 case "$1" in
@@ -435,7 +424,13 @@ ipreallocated)
 	;;
 
 reconfigure)
-	ctdb_service_reconfigure
+	echo "Reconfiguring service \"${service_name}\"..."
+
+	add_missing_routes "force"
+	remove_bogus_routes
+
+	# flush our route cache
+	set_proc sys/net/ipv4/route/flush 1
 	;;
 esac