summaryrefslogtreecommitdiffstats
path: root/ctdb
diff options
context:
space:
mode:
authorMartin Schwenke <martin@meltin.net>2014-01-13 16:34:50 +1100
committerAmitay Isaacs <amitay@gmail.com>2014-01-17 17:59:34 +1100
commit50e00b3e5224d53df0f3cc882e71737f928e01cd (patch)
tree469b261dde7068845eca1abe5bfab1a19e955a14 /ctdb
parent8eb20c23476d390bb8a12ba01c9f06e7ac4a1453 (diff)
downloadsamba-50e00b3e5224d53df0f3cc882e71737f928e01cd.tar.gz
samba-50e00b3e5224d53df0f3cc882e71737f928e01cd.tar.xz
samba-50e00b3e5224d53df0f3cc882e71737f928e01cd.zip
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>
Diffstat (limited to 'ctdb')
-rwxr-xr-xctdb/config/functions2
-rwxr-xr-xctdb/tests/eventscripts/10.interface.releaseip.011.sh2
2 files changed, 2 insertions, 2 deletions
diff --git a/ctdb/config/functions b/ctdb/config/functions
index 374332a699..ec9979967e 100755
--- 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 17b7421b66..e1514eea88 100755
--- 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