The branch, master has been updated
via a9bce1ac9794f108825190948f404c864a533435 (commit)
via d1d48f8661d83b01de6c552ee70021acdc6384cb (commit)
via 09aa91224fe7b835dc0a2c58868cce28ce54809f (commit)
from 008533d971aec9c28c6e4750ef4677dd943633ff (commit)
http://gitweb.samba.org/?p=sahlberg/ctdb.git;a=shortlog;h=master
- Log -----------------------------------------------------------------
commit a9bce1ac9794f108825190948f404c864a533435
Author: Ronnie Sahlberg <[EMAIL PROTECTED]>
Date: Mon Aug 4 14:58:52 2008 +1000
New version 1.0.52
Signed-off-by: Ronnie Sahlberg <[EMAIL PROTECTED]>
commit d1d48f8661d83b01de6c552ee70021acdc6384cb
Author: Andrew Tridgell <[EMAIL PROTECTED]>
Date: Fri Aug 1 14:23:15 2008 +1000
we need an additional gratuitous arp before the NFS tickles
commit 09aa91224fe7b835dc0a2c58868cce28ce54809f
Author: Andrew Tridgell <[EMAIL PROTECTED]>
Date: Fri Aug 1 14:17:50 2008 +1000
ensure we use killtcp on non-NFS/non-CIFS ports for faster failover of
other protocols
-----------------------------------------------------------------------
Summary of changes:
config/events.d/61.nfstickle | 3 +++
config/functions | 10 +++++++++-
packaging/RPM/ctdb.spec | 8 +++++++-
3 files changed, 19 insertions(+), 2 deletions(-)
Changeset truncated at 500 lines:
diff --git a/config/events.d/61.nfstickle b/config/events.d/61.nfstickle
index 5335595..5fa6206 100755
--- a/config/events.d/61.nfstickle
+++ b/config/events.d/61.nfstickle
@@ -26,6 +26,9 @@ case $cmd in
iface=$1
ip=$2
shopt -s nullglob
+ # first send a grat arp, to ensure the client knows the updated
+ # mac address for this IP
+ ctdb gratiousarp $ip $iface
# send tickle acks for all the connections the old server had
for f in $NFS_TICKLE_SHARED_DIRECTORY/*/$ip; do
cat $f | while read dest; do
diff --git a/config/functions b/config/functions
index 20325b1..5df121f 100644
--- a/config/functions
+++ b/config/functions
@@ -229,8 +229,16 @@ kill_tcp_connections() {
srcport=`echo $src | cut -d: -f2`
destip=`echo $dest | cut -d: -f1`
destport=`echo $dest | cut -d: -f2`
- ctdb killtcp $srcip:$srcport $destip:$destport >/dev/null 2>&1 ||
_failed=1
echo "Killing TCP connection $srcip:$srcport $destip:$destport"
+ ctdb killtcp $srcip:$srcport $destip:$destport >/dev/null 2>&1 ||
_failed=1
+ case $destport in
+ # we only do one-way killtcp for NFS and CIFS
+ 139|445|2049) : ;;
+ # for all others we do 2-way
+ *)
+ ctdb killtcp $destip:$destport $srcip:$srcport >/dev/null 2>&1
|| _failed=1
+ ;;
+ esac
_killcount=`expr $_killcount + 1`
done < $connfile
/bin/rm -f $connfile
diff --git a/packaging/RPM/ctdb.spec b/packaging/RPM/ctdb.spec
index bff072b..13fae3d 100644
--- a/packaging/RPM/ctdb.spec
+++ b/packaging/RPM/ctdb.spec
@@ -5,7 +5,7 @@ Vendor: Samba Team
Packager: Samba Team <[EMAIL PROTECTED]>
Name: ctdb
Version: 1.0
-Release: 51
+Release: 52
Epoch: 0
License: GNU GPL version 3
Group: System Environment/Daemons
@@ -118,6 +118,12 @@ fi
%{_includedir}/ctdb_private.h
%changelog
+* Mon Aug 4 2008 : Version 1.0.52
+ - Send an explicit gratious arp when starting sending the tcp tickles.
+ - When doing failover, issue a killtcp to non-NFS/non-CIFS clients
+ so that they fail quickly. NFS and CIFS already fail and recover
+ quickly.
+ - Update the test scripts to handle CTRL-C to kill off the test.
* Mon Jul 28 2008 : Version 1.0.51
- Strip off the vlan tag from bond devices before we check in /proc
if the interface is up or not.
--
CTDB repository
