[SCM] CTDB repository - branch master updated - ctdb-1.10-206-g307e915

[Ronnie Sahlberg]

The branch, master has been updated
       via  307e915459c26a728a1ec16bd735d983d493df53 (commit)
       via  84600d1f53632d5fe76c308727f31f61b5ec1010 (commit)
      from  2d67186e5acd5aa8cb3eb1f4fbd4a41153c52e96 (commit)

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


- Log -----------------------------------------------------------------
commit 307e915459c26a728a1ec16bd735d983d493df53
Merge: 84600d1f53632d5fe76c308727f31f61b5ec1010 2d67186e5acd5aa8cb3eb1f4fbd4a41153c52e96
Author: Ronnie Sahlberg <ronniesahlberg at gmail.com>
Date:   Thu May 12 18:58:07 2011 +1000

    Merge branch 'master' of ssh://git.samba.org/data/git/ctdb

commit 84600d1f53632d5fe76c308727f31f61b5ec1010
Author: Ronnie Sahlberg <ronniesahlberg at gmail.com>
Date:   Thu May 12 10:24:46 2011 +1000

    When using multiple VLANs, some funky stuff can sometimes happen when
    adding/removing IP addresses causing routes might be dropped by the system.
    
    The easiest workaround for this is to unconditionally try to reapply
    all static routes for all interfaces once ipreallocation has finished,
    not just adding them back on the affected interface.
    
    This worksaround a funky issue in
    CQ S1023538

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

Summary of changes:
 config/events.d/11.routing |   13 ++++++-------
 1 files changed, 6 insertions(+), 7 deletions(-)


Changeset truncated at 500 lines:

diff --git a/config/events.d/11.routing b/config/events.d/11.routing
index 9a1fdef..b6093a2 100755
--- a/config/events.d/11.routing
+++ b/config/events.d/11.routing
@@ -19,13 +19,12 @@ loadconfig
     exit 0
 }
 
-case "$1" in 
-    takeip|releaseip)
-	iface=$2
-	cat $CTDB_BASE/static-routes | egrep "^$iface " | while read IFACE DEST GW; do
-	    ip route add $DEST via $GW dev $IFACE >/dev/null 2>/dev/null
-	done
-	;;
+case "$1" in
+    recovered|ipreallocated)
+        cat $CTDB_BASE/static-routes | while read IFACE DEST GW; do
+            ip route add $DEST via $GW dev $IFACE >/dev/null 2>/dev/null
+        done
+        ;;
 
     updateip)
 	oiface=$2


-- 
CTDB repository