[SCM] CTDB repository - branch 1.2.40 updated - ctdb-1.2.46-2-g55b243a

[Amitay Isaacs]

The branch, 1.2.40 has been updated
       via  55b243a0387b8b0e58615f3b87afaa000189ade9 (commit)
       via  f24b2188839074e43d3d23ff7b87b4f09fb40b78 (commit)
      from  ec1bfcec167194344a5694427bede4597bcf2547 (commit)

http://gitweb.samba.org/?p=ctdb.git;a=shortlog;h=1.2.40


- Log -----------------------------------------------------------------
commit 55b243a0387b8b0e58615f3b87afaa000189ade9
Author: Amitay Isaacs <amitay at gmail.com>
Date:   Thu Aug 9 16:57:15 2012 +1000

    New version 1.2.47
    
    Signed-off-by: Amitay Isaacs <amitay at gmail.com>

commit f24b2188839074e43d3d23ff7b87b4f09fb40b78
Author: Martin Schwenke <martin at meltin.net>
Date:   Fri Aug 3 10:54:30 2012 +1000

    Eventscripts: Add "reconfigure" pseudo-event for policy routing
    
    This rebuilds all policy routes and can be used if the configuration
    changes.
    
    Signed-off-by: Martin Schwenke <martin at meltin.net>

-----------------------------------------------------------------------

Summary of changes:
 config/events.d/13.per_ip_routing |   14 ++++++++++++--
 packaging/RPM/ctdb.spec.in        |    4 +++-
 2 files changed, 15 insertions(+), 3 deletions(-)


Changeset truncated at 500 lines:

diff --git a/config/events.d/13.per_ip_routing b/config/events.d/13.per_ip_routing
index f16a74e..25f388b 100755
--- a/config/events.d/13.per_ip_routing
+++ b/config/events.d/13.per_ip_routing
@@ -275,7 +275,8 @@ flush_rules_and_routes ()
 
 # Add any missing routes.  Some might have gone missing if, for
 # example, all IPs on the network were removed (possibly if the
-# primary was removed).
+# primary was removed).  If $1 is "force" then (re-)add all the
+# routes.
 add_missing_routes ()
 {
     ctdb ip -v -Y | {
@@ -291,7 +292,8 @@ add_missing_routes ()
 	    [ -n "$_iface" ] || continue
 	    
 	    _table_id="${table_id_prefix}${_ip}"
-	    if [ -z "$(ip route show table $_table_id 2>/dev/null)" ]  ; then
+	    if [ -z "$(ip route show table $_table_id 2>/dev/null)" -o \
+		"$1" = "force" ]  ; then
 		add_routing_for_ip "$_iface" "$_ip"
 	    fi
 	done
@@ -387,6 +389,14 @@ case "$1" in
 	remove_bogus_routes
 	;;
 
+    reconfigure)
+	add_missing_routes "force"
+	remove_bogus_routes
+
+	# flush our route cache
+	set_proc sys/net/ipv4/route/flush 1
+	;;
+	
     *)
 	ctdb_standard_event_handler "$@"
 	;;
diff --git a/packaging/RPM/ctdb.spec.in b/packaging/RPM/ctdb.spec.in
index 7a8c080..39e14c7 100644
--- a/packaging/RPM/ctdb.spec.in
+++ b/packaging/RPM/ctdb.spec.in
@@ -3,7 +3,7 @@ Name: ctdb
 Summary: Clustered TDB
 Vendor: Samba Team
 Packager: Samba Team <samba at samba.org>
-Version: 1.2.46
+Version: 1.2.47
 Release: 1GITHASH
 Epoch: 0
 License: GNU GPL version 3
@@ -144,6 +144,8 @@ development libraries for ctdb
 %{_libdir}/libctdb.a
 
 %changelog
+* Thu Aug 08 2012 : Version 1.2.47
+ - Add reconfigure event for policy routing
 * Tue Jul 24 2012 : Version 1.2.46
  - Default route on NAT gateway should have a metric of 10
 * Thu Jul 12 2012 : Version 1.2.45


-- 
CTDB repository