ctdb-scripts: Use ctdb_killtcp helper to kill connections

ctdb_killtcp will take up to 5 seconds to kill connections, so don't
wait in a loop.  Just check if there are remaining connections on
completion and log a message either way.

Also add a test stub.

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

2 files changed, 10 insertions, 4 deletions

diff --git a/ctdb/tests/eventscripts/10.interface.releaseip.011.sh b/ctdb/tests/eventscripts/10.interface.releaseip.011.sh
index e1514eea880..6203b97e2f5 100755
--- a/ctdb/tests/eventscripts/10.interface.releaseip.011.sh
+++ b/ctdb/tests/eventscripts/10.interface.releaseip.011.sh
@@ -31,10 +31,7 @@ while read dev ip bits ; do
     ok <<EOF
 Killing TCP connection 10.254.254.1:43210 ${ip}:445
 $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 (1 remaining)
+Failed to kill TCP connections for IP 10.0.0.3 (1/11 remaining)
 EOF
 
     simple_test $dev $ip $bits
diff --git a/ctdb/tests/eventscripts/stubs/ctdb_killtcp b/ctdb/tests/eventscripts/stubs/ctdb_killtcp
new file mode 100755
index 00000000000..cb5b6e57374
--- /dev/null
+++ b/ctdb/tests/eventscripts/stubs/ctdb_killtcp
@@ -0,0 +1,9 @@
+#!/bin/sh
+
+# Only supports reading from stdin
+
+iface="$1"  # ignored
+
+while read src dst ; do
+	sed -i -e "/^${dst} ${src}\$/d" "$FAKE_NETSTAT_TCP_ESTABLISHED_FILE"
+done