ctdb/eventscripts: Print a count if killing TCP connections times out

Also update related test

Signed-off-by: Martin Schwenke <martin@meltin.net>
Reviewed-by: Amitay Isaacs <amitay@gmail.com>

diff --git a/ctdb/config/functions b/ctdb/config/functions
index 374332a6990d00684135742c38681a64d94c22e0..ec9979967ef9de47329f48b0a056e8d35383314f 100755 (executable)
--- a/ctdb/config/functions
+++ b/ctdb/config/functions
@@ -601,7 +601,7 @@ kill_tcp_connections ()
 
            _count=$(($_count + 1))
            if [ $_count -gt 3 ] ; then
-               echo "Timed out killing tcp connections for IP $_ip"
+               echo "Timed out killing tcp connections for IP $_ip ($_remaining remaining)"
                return
            fi
 

diff --git a/ctdb/tests/eventscripts/10.interface.releaseip.011.sh b/ctdb/tests/eventscripts/10.interface.releaseip.011.sh
index 17b7421b66918125fdbef661dbfc73b5935c2ff3..e1514eea8806ee4e667dddb93b3a94efd0c40eb9 100755 (executable)
--- a/ctdb/tests/eventscripts/10.interface.releaseip.011.sh
+++ b/ctdb/tests/eventscripts/10.interface.releaseip.011.sh
@@ -34,7 +34,7 @@ $out
 Waiting for 1 connections to be killed for IP ${ip}
 Waiting for 1 connections to be killed for IP ${ip}
 Waiting for 1 connections to be killed for IP ${ip}
-Timed out killing tcp connections for IP $ip
+Timed out killing tcp connections for IP $ip (1 remaining)
 EOF
 
     simple_test $dev $ip $bits