[SCM] CTDB repository - branch master updated - ctdb-1.0.76-2-gea5fd7a

[Ronnie Sahlberg]

The branch, master has been updated
       via  ea5fd7a8da230846e4283499018e3eebecd3efd2 (commit)
       via  34633223a46caaa079da233663f9c6dcc1803f87 (commit)
      from  56b7095994d1de95e40a223ed503b5572ea9d1b9 (commit)

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


- Log -----------------------------------------------------------------
commit ea5fd7a8da230846e4283499018e3eebecd3efd2
Author: Ronnie Sahlberg <ronniesahlberg at gmail.com>
Date:   Tue Mar 31 11:36:43 2009 +1100

    new version 1.0.77

commit 34633223a46caaa079da233663f9c6dcc1803f87
Author: Ronnie Sahlberg <ronniesahlberg at gmail.com>
Date:   Tue Mar 31 11:33:28 2009 +1100

    we must also try to set the routes when we release an ip since during the release/10.interfaces there can actually be a window where the kernel decides to remove all addresses (before we manually add them back in 10.interfaces) during which the kernel may also decide to delete all routes since there are no gateways reachable through this interface anymore.

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

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


Changeset truncated at 500 lines:

diff --git a/config/events.d/99.routing b/config/events.d/99.routing
index ec0a7bf..0674193 100755
--- a/config/events.d/99.routing
+++ b/config/events.d/99.routing
@@ -24,10 +24,10 @@ 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
+	    ip route add $DEST via $GW dev $IFACE >/dev/null 2>/dev/null
 	done
 
 	;;
diff --git a/packaging/RPM/ctdb.spec b/packaging/RPM/ctdb.spec
index 66c3647..01d2558 100644
--- a/packaging/RPM/ctdb.spec
+++ b/packaging/RPM/ctdb.spec
@@ -4,7 +4,7 @@ Summary: Clustered TDB
 Vendor: Samba Team
 Packager: Samba Team <samba at samba.org>
 Name: ctdb
-Version: 1.0.76
+Version: 1.0.77
 Release: 1
 Epoch: 0
 License: GNU GPL version 3
@@ -119,7 +119,7 @@ fi
 %{_bindir}/ctdb
 %{_bindir}/smnotify
 %{_bindir}/ctdb_ipmux
-%{_bindir}/ctdb_diagnostics
+%{_bindir}/ctdB_diagnostics
 %{_bindir}/onnode
 %{_mandir}/man1/ctdb.1.gz
 %{_mandir}/man1/ctdbd.1.gz
@@ -128,6 +128,8 @@ fi
 %{_includedir}/ctdb_private.h
 
 %changelog
+* Tue Mar 31 2009 : Version 1.0.77
+ - Update the 99.routing eventscript to also try to add the routes (back) during a releaseip event. Similar to the reasons why we must add addresses back during releaseip in 10.interfaces
 * Wed Mar 24 2009 : Version 1.0.76
  - Add a debugging command "xpnn" which can print the pnn of the node even when ctdbd is not running.
  - Redo the NATGW implementation to allow multiple disjoing NATGW groups in the same cluster.


-- 
CTDB repository