[SCM] Samba Shared Repository - branch master updated

[Amitay Isaacs]

The branch, master has been updated
       via  fcf846a ctdb-eventscripts: Switch on dumping of stuck nfsd threads
      from  695ece2 s4: tidy up vfs smb2 in regards to using share_string_option

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master


- Log -----------------------------------------------------------------
commit fcf846a795085d24468548165d92762a628ef54d
Author: Martin Schwenke <martin at meltin.net>
Date:   Thu Feb 20 15:20:44 2014 +1100

    ctdb-eventscripts: Switch on dumping of stuck nfsd threads
    
    This feature was added quite a while ago but was not enabled by
    default.  It is a useful feature so enable it to dump stack traces of
    up to 5 stuck processes by default.
    
    This can be disabled by setting:
    
      CTDB_NFS_DUMP_STUCK_THREADS=0
    
    Signed-off-by: Martin Schwenke <martin at meltin.net>
    Reviewed-by: Amitay Isaacs <amitay at gmail.com>
    
    Autobuild-User(master): Amitay Isaacs <amitay at samba.org>
    Autobuild-Date(master): Tue Feb 25 04:06:45 CET 2014 on sn-devel-104

-----------------------------------------------------------------------

Summary of changes:
 ctdb/config/functions     |    2 +-
 ctdb/doc/ctdbd.conf.5.xml |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)


Changeset truncated at 500 lines:

diff --git a/ctdb/config/functions b/ctdb/config/functions
index 954e681..6efe60f 100755
--- a/ctdb/config/functions
+++ b/ctdb/config/functions
@@ -734,7 +734,7 @@ startstop_nfs() {
 # Dump up to the configured number of nfsd thread backtraces.
 nfs_dump_some_threads ()
 {
-    [ -n "$CTDB_NFS_DUMP_STUCK_THREADS" ] || return 0
+    [ -n "$CTDB_NFS_DUMP_STUCK_THREADS" ] || CTDB_NFS_DUMP_STUCK_THREADS=5
 
     # Optimisation to avoid running an unnecessary pidof
     [ $CTDB_NFS_DUMP_STUCK_THREADS -gt 0 ] || return 0
diff --git a/ctdb/doc/ctdbd.conf.5.xml b/ctdb/doc/ctdbd.conf.5.xml
index 37b1cf9..d80bda6 100644
--- a/ctdb/doc/ctdbd.conf.5.xml
+++ b/ctdb/doc/ctdbd.conf.5.xml
@@ -909,7 +909,7 @@ CTDB_PER_IP_ROUTING_TABLE_ID_HIGH=9000
 	      NFS during a restart.
 	    </para>
 	    <para>
-	      Default is 0.
+	      Default is 5.  Set this to 0 to disable this feature.
 	    </para>
 	  </listitem>
 	</varlistentry>


-- 
Samba Shared Repository