ctdb-scripts: Drop configuration variable CTDB_NFS_DUMP_STUCK_THREADS

This is now handled by passing the desired number of threads to the
command specified in the dump_stuck_threads variable in .check files.

Remove unused function nfs_dump_some_threads().

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 0f4a169be0fabd041d7efe2c9fd8d59431403265..6f972711d2547409796d05330a000c19e5debea0 100755 (executable)
--- a/ctdb/config/functions
+++ b/ctdb/config/functions
@@ -699,17 +699,6 @@ nfs_update_lock_info ()
     fi
 }
 
-# Dump up to the configured number of nfsd thread backtraces.
-nfs_dump_some_threads ()
-{
-    _prog="${1:-nfsd}"
-
-    _num="${CTDB_NFS_DUMP_STUCK_THREADS:-5}"
-    [ $_num -gt 0 ] || return 0
-
-    program_stack_traces "$_prog" $_num
-}
-
 ########################################################
 
 add_ip_to_iface ()

diff --git a/ctdb/doc/ctdbd.conf.5.xml b/ctdb/doc/ctdbd.conf.5.xml
index ed2e1843e6197194f42d1b7cef3fcd8ca3b4d350..1d6982feff740e93a47a9e260c3d7114c900ee12 100644 (file)
--- a/ctdb/doc/ctdbd.conf.5.xml
+++ b/ctdb/doc/ctdbd.conf.5.xml
@@ -1029,20 +1029,6 @@ CTDB_PER_IP_ROUTING_TABLE_ID_HIGH=9000
          </listitem>
        </varlistentry>
 
-       <varlistentry>
-         <term>CTDB_NFS_DUMP_STUCK_THREADS=<parameter>NUM</parameter></term>
-         <listitem>
-           <para>
-             NUM is the number of NFS kernel server threads to dump
-             stack traces for if some are still alive after stopping
-             NFS during a restart.
-           </para>
-           <para>
-             Default is 5.  Set this to 0 to disable this feature.
-           </para>
-         </listitem>
-       </varlistentry>
-
        <varlistentry>
          <term>CTDB_NFS_SKIP_SHARE_CHECK=yes|no</term>
          <listitem>

diff --git a/ctdb/tests/eventscripts/60.nfs.monitor.113.sh b/ctdb/tests/eventscripts/60.nfs.monitor.113.sh
index dae9db3f8ed8c860912990d497a688e2d1f913c2..68ade385aea5fa7f45d7899b1542dfaca16f6086 100755 (executable)
--- a/ctdb/tests/eventscripts/60.nfs.monitor.113.sh
+++ b/ctdb/tests/eventscripts/60.nfs.monitor.113.sh
@@ -2,14 +2,12 @@
 
 . "${TEST_SCRIPTS_DIR}/unit.sh"
 
-define_test "knfsd down, 10 iterations, dump 5 threads, none hung"
+define_test "knfsd down, 10 iterations, no hung threads"
 
 # knfsd fails and attempts to restart it fail.
 setup_nfs
 rpc_services_down "nfs"
 
-# Additionally, any hung threads should have stack traces dumped.
-CTDB_NFS_DUMP_STUCK_THREADS=5
 nfs_setup_fake_threads "nfsd"
 
 nfs_iterate_test 10 "nfs"

diff --git a/ctdb/tests/eventscripts/60.nfs.monitor.114.sh b/ctdb/tests/eventscripts/60.nfs.monitor.114.sh
index 00f30c5d7403c133e746e47fd9b6c31a284ebc0e..94de41fb73f99915930a4804fece066dcdf893cf 100755 (executable)
--- a/ctdb/tests/eventscripts/60.nfs.monitor.114.sh
+++ b/ctdb/tests/eventscripts/60.nfs.monitor.114.sh
@@ -2,14 +2,12 @@
 
 . "${TEST_SCRIPTS_DIR}/unit.sh"
 
-define_test "knfsd down, 10 iterations, dump 5 threads, 3 hung"
+define_test "knfsd down, 10 iterations, 3 hung threads"
 
 # knfsd fails and attempts to restart it fail.
 setup_nfs
 rpc_services_down "nfs"
 
-# Additionally, any hung threads should have stack traces dumped.
-CTDB_NFS_DUMP_STUCK_THREADS=5
 nfs_setup_fake_threads "nfsd" 1001 1002 1003
 
 nfs_iterate_test 10 "nfs"

diff --git a/ctdb/tests/eventscripts/60.nfs.monitor.143.sh b/ctdb/tests/eventscripts/60.nfs.monitor.143.sh
index 34a4c80e49cc3bdef44c5f8640b814f43cae1616..2e7f3cfce82d205e014d8b400bf0fa7f3a467c22 100755 (executable)
--- a/ctdb/tests/eventscripts/60.nfs.monitor.143.sh
+++ b/ctdb/tests/eventscripts/60.nfs.monitor.143.sh
@@ -8,7 +8,6 @@ define_test "statd down, 2 iterations, stuck process"
 
 setup_nfs
 rpc_services_down "status"
-CTDB_NFS_DUMP_STUCK_THREADS=2
 nfs_setup_fake_threads "rpc.status" 1001
 
 nfs_iterate_test 2 "status"

diff --git a/ctdb/tests/eventscripts/scripts/local.sh b/ctdb/tests/eventscripts/scripts/local.sh
index b9c08a8946e8f3395ab523b7318ddfef934cc195..8ac6894e6efa19f270ffc365c5172e2606e51ee7 100644 (file)
--- a/ctdb/tests/eventscripts/scripts/local.sh
+++ b/ctdb/tests/eventscripts/scripts/local.sh
@@ -790,7 +790,6 @@ setup_nfs ()
     export CTDB_NFS_SKIP_SHARE_CHECK="no"
 
     export RPCNFSDCOUNT
-    export CTDB_NFS_DUMP_STUCK_THREADS
 
     # Reset the failcounts for nfs services.
     eventscript_call eval rm -f '$ctdb_fail_dir/nfs_*'