ctdb killtcp no longer takes a <numrst> argument to control how many

times to try the reset.

the reset retry attempt is now handled inside the daemon

update the 60.nfs script and remove this parameter that is no longer
used

(This used to be ctdb commit 30fb09b8b9a989e5cfe86b6daf2dcd2487013344)

diff --git a/ctdb/config/events.d/60.nfs b/ctdb/config/events.d/60.nfs
index 7f0710c4006d817fc77c6f7f7dfdd969bb235060..5e917aa9908d2abdb8e5e8fa7510b4790d2e6800 100755 (executable)
--- a/ctdb/config/events.d/60.nfs
+++ b/ctdb/config/events.d/60.nfs
@@ -70,8 +70,8 @@ case $cmd in
                        srcport=`echo $src | cut -d: -f2`
                        destip=`echo $dest | cut -d: -f1`
                        destport=`echo $dest | cut -d: -f2`
-                       ctdb killtcp $srcip:$srcport $destip:$destport 1 >/dev/null 2>&1 
-#                      ctdb killtcp $destip:$destport $srcip:$srcport 1 >/dev/null 2>&1
+                       ctdb killtcp $srcip:$srcport $destip:$destport >/dev/null 2>&1 
+#                      ctdb killtcp $destip:$destport $srcip:$srcport >/dev/null 2>&1
                done
        } > /dev/null 2>&1
 
@@ -84,8 +84,8 @@ case $cmd in
                        srcport=`echo $src | cut -d: -f2`
                        destip=`echo $dest | cut -d: -f1`
                        destport=`echo $dest | cut -d: -f2`
-                       ctdb killtcp $srcip:$srcport $destip:$destport 1 >/dev/null 2>&1 
-                       ctdb killtcp $destip:$destport $srcip:$srcport 1 >/dev/null 2>&1
+                       ctdb killtcp $srcip:$srcport $destip:$destport >/dev/null 2>&1 
+                       ctdb killtcp $destip:$destport $srcip:$srcport >/dev/null 2>&1
                done
        } > /dev/null 2>&1
        /bin/rm -f /etc/ctdb/state/nfs/restart