[SCM] CTDB repository - branch 1.0.69 updated - ctdb-1.0.69-18-gd26d522

[Ronnie Sahlberg]

The branch, 1.0.69 has been updated
       via  d26d522fd0a1df7f06be056e7458ed5349a00658 (commit)
       via  d02c0e9371981bc6830f792d65e9f08832656cf0 (commit)
      from  87e674f93728fb20209b6473f07ca323530ddbdc (commit)

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


- Log -----------------------------------------------------------------
commit d26d522fd0a1df7f06be056e7458ed5349a00658
Author: root <root at rcn1.VSOFS1.COM>
Date:   Tue May 5 10:24:14 2009 +1000

    new version 1.0.69-6

commit d02c0e9371981bc6830f792d65e9f08832656cf0
Author: root <root at rcn1.VSOFS1.COM>
Date:   Tue May 5 09:55:36 2009 +1000

    try to add the routes back also for the releaseip event to workaround the issue
    with when the kernel removes too many addresses (see 10.interfaces for the details)

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

Summary of changes:
 config/events.d/99.routing |    2 +-
 packaging/RPM/ctdb.spec    |    8 +++++++-
 2 files changed, 8 insertions(+), 2 deletions(-)


Changeset truncated at 500 lines:

diff --git a/config/events.d/99.routing b/config/events.d/99.routing
index ec0a7bf..02d86a6 100755
--- a/config/events.d/99.routing
+++ b/config/events.d/99.routing
@@ -24,7 +24,7 @@ shift
 PATH=/usr/bin:/bin:/usr/sbin:/sbin:$PATH
 
 case $cmd in 
-     takeip)
+     takeip|releaseip)
 	iface=$1
 	cat $CTDB_BASE/static-routes | egrep "^$iface " | while read IFACE DEST GW; do
 		route add -net $DEST gw $GW
diff --git a/packaging/RPM/ctdb.spec b/packaging/RPM/ctdb.spec
index 432a6aa..db3677b 100644
--- a/packaging/RPM/ctdb.spec
+++ b/packaging/RPM/ctdb.spec
@@ -5,7 +5,7 @@ Vendor: Samba Team
 Packager: Samba Team <samba at samba.org>
 Name: ctdb
 Version: 1.0
-Release: 69_5
+Release: 69_6
 Epoch: 0
 License: GNU GPL version 3
 Group: System Environment/Daemons
@@ -121,6 +121,12 @@ fi
 %{_includedir}/ctdb_private.h
 
 %changelog
+* Tue May 5 2009 : Version 1.0.69-6
+ - Try to add back the routes in 99.routing both for the takeip and also the
+   releaseip event since during releaseip) too many addresses may have been
+   deleted, causing routes to be lost.
+   See 10.interfaces for the workaround for "ip addr del" deleting too
+   many addresses.
 * Fri May 1 2009 : Version 1.0.69-5
  - Add a new variable VerifyRecoveryLock. When set to 0 this will skip
    the test inside the main where it verifies that the recovery masted does


-- 
CTDB repository