ensure we use killtcp on non-NFS/non-CIFS ports for faster failover of

other protocols

diff --git a/config/functions b/config/functions
index 20325b1812e4aacd7dd3cb4a9737d35edafca323..5df121f7310c4775bb5556189ba711516e1e2bb5 100644 (file)
--- 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