sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-01-11 05:18:09 +03:00
Code

eventscripts: Minor cleanups for killtcp/tickle functions

Browse Source 
Signed-off-by: Martin Schwenke <martin@meltin.net>

(This used to be ctdb commit 25ef4f655f1efc833deb5e244f9fff461e92f439)
This commit is contained in:
Martin Schwenke 2013-05-06 16:23:25 +10:00 committed by Amitay Isaacs
parent 189a5c003c
commit 29a3823e40
1 changed files with 17 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
ctdb/config/functions
View File

@ -584,17 +584,17 @@ ctdb_check_command ()
################################################
# kill off any TCP connections with the given IP
################################################
kill_tcp_connections() {
_IP="$1"
kill_tcp_connections ()
{
_ip="$1"
_oneway=false
if [ "$2" = "oneway" ] ; then
_oneway=true
fi
_killcount=0
get_tcp_connections_for_ip "$_IP" | {
get_tcp_connections_for_ip "$_ip" | {
_killcount=0
_failed=false
while read dest src; do
@ -610,27 +610,27 @@ kill_tcp_connections() {
ctdb killtcp $dest $src >/dev/null 2>&1 || _failed=true
fi
_killcount=`expr $_killcount + 1`
_killcount=$(($_killcount + 1))
done
if $_failed ; then
echo "Failed to send killtcp control"
return
fi
[ $_killcount -gt 0 ] || {
return;
}
if [ $_killcount -eq 0 ] ; then
return
fi
_count=0
while : ; do
if [ -z "$(get_tcp_connections_for_ip $_IP)" ] ; then
echo "killed $_killcount TCP connections to released IP $_IP"
if [ -z "$(get_tcp_connections_for_ip $_ip)" ] ; then
echo "Killed $_killcount TCP connections to released IP $_ip"
return
fi
_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"
return
fi
@ -642,7 +642,7 @@ kill_tcp_connections() {
##################################################################
# kill off the local end for any TCP connections with the given IP
##################################################################
kill_tcp_connections_local_only()
kill_tcp_connections_local_only ()
{
kill_tcp_connections "$1" "oneway"
}
@ -650,10 +650,11 @@ kill_tcp_connections_local_only()
##################################################################
# tickle any TCP connections with the given IP
##################################################################
tickle_tcp_connections() {
_IP="$1"
tickle_tcp_connections ()
{
_ip="$1"
get_tcp_connections_for_ip "$_IP" |
get_tcp_connections_for_ip "$_ip" |
{
_failed=false