sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-03-27 22:50:26 +03:00
Code

ctdb-scripts: Drop configuration variable CTDB_NFS_DUMP_STUCK_THREADS

Browse Source 
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>
This commit is contained in:
Martin Schwenke 2015-07-13 14:54:07 +10:00 committed by Amitay Isaacs
parent f3a4c4f10b
commit a3a443dcf4
6 changed files with 2 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
ctdb/config/functions
View File

@ -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 ()

14
ctdb/doc/ctdbd.conf.5.xml
View File

@ -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>

4
ctdb/tests/eventscripts/60.nfs.monitor.113.sh
View File

@ -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"

4
ctdb/tests/eventscripts/60.nfs.monitor.114.sh
View File

@ -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"

1
ctdb/tests/eventscripts/60.nfs.monitor.143.sh
View File

@ -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"

1
ctdb/tests/eventscripts/scripts/local.sh
View File

@ -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_*'