The branch, master has been updated via b742c49... s3-docs: Add more verbose description of "log writeable files on exit". via 775f1ed... s3-docs: Add more verbose description of "ctdb locktime warn threshold". via 4c0f760... s3-docs: Add more verbose description of "username map cache time". from a785b43... s3-docs: Remove older documentation of smb2 parameters.
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master - Log ----------------------------------------------------------------- commit b742c4952e1df7a898a73330e9c01a8f48a557b4 Author: Volker Lendecke <v...@samba.org> Date: Mon Jul 19 12:47:09 2010 +0200 s3-docs: Add more verbose description of "log writeable files on exit". commit 775f1ed045666f30e2b45512b30ed8e9a0df322a Author: Volker Lendecke <v...@samba.org> Date: Mon Jul 19 12:35:58 2010 +0200 s3-docs: Add more verbose description of "ctdb locktime warn threshold". commit 4c0f760edfa9ccdfe0340af46c27e388457ae9af Author: Volker Lendecke <v...@samba.org> Date: Mon Jul 19 12:22:05 2010 +0200 s3-docs: Add more verbose description of "username map cache time". ----------------------------------------------------------------------- Summary of changes: .../smbdotconf/misc/ctdblocktimewarnthreshold.xml | 26 ++++++++++++++----- .../smbdotconf/misc/logwriteablefilesonexit.xml | 15 ++++++++--- .../smbdotconf/security/usernamemapcachetime.xml | 23 ++++++++++++----- 3 files changed, 46 insertions(+), 18 deletions(-) Changeset truncated at 500 lines: diff --git a/docs-xml/smbdotconf/misc/ctdblocktimewarnthreshold.xml b/docs-xml/smbdotconf/misc/ctdblocktimewarnthreshold.xml index 149d8d6..a3289a9 100644 --- a/docs-xml/smbdotconf/misc/ctdblocktimewarnthreshold.xml +++ b/docs-xml/smbdotconf/misc/ctdblocktimewarnthreshold.xml @@ -4,13 +4,25 @@ advanced="1" xmlns:samba="http://www.samba.org/samba/DTD/samba-doc"> <description> - <para>In a cluster, ctdb is very unhappy if tdb database locks - are held for extended periods of time. This parameter adds a - warning threshold in milliseconds. If Samba holds a lock for - longer that ctdb locktime warn threshold milliseconds, a debug - level 0 message is printed when the lock is released. This is - mainly a debugging aid for post-mortem analysis.</para> - <para>If this parameter is set to 0, no message is printed.</para> + + <para> + In a cluster environment using Samba and ctdb it is critical + that locks on central ctdb-hosted databases like locking.tdb + are not held for long. With the current Samba architecture + it happens that Samba takes a lock and while holding that + lock makes file system calls into the shared cluster file + system. This option makes Samba warn if it detects that it + has held locks for the specified number of milliseconds. If + this happens, <emphasis>smbd</emphasis> will emit a debug level 0 + message into its logs and potentially into syslog. The most likely + reason for such a log message is that an operation of the cluster + file system Samba exports is taking longer than expected. + The messages are meant as a debugging aid for potential + cluster problems. + </para> + + <para>The default value of 0 disables this logging.</para> + </description> <value type="default">0</value> </samba:parameter> diff --git a/docs-xml/smbdotconf/misc/logwriteablefilesonexit.xml b/docs-xml/smbdotconf/misc/logwriteablefilesonexit.xml index 1c75457..9d2b750 100644 --- a/docs-xml/smbdotconf/misc/logwriteablefilesonexit.xml +++ b/docs-xml/smbdotconf/misc/logwriteablefilesonexit.xml @@ -5,10 +5,17 @@ xmlns:samba="http://www.samba.org/samba/DTD/samba-doc"> <description> <para> - This boolean option controls whether at exit time the server - dumps a list of files with debug level 0 that were still open - for write. This is an administrative aid to find the files - that were potentially corrupt if the network connection died. + When the network connection between a CIFS client and Samba + dies, Samba has no option but to simply shut down the server + side of the network connection. If this happens, there is a + risk of data corruption because the Windows client did not + complete all write operations that the Windows application + requested. Setting this option to "yes" makes smbd log with + a level 0 message a list of all files that have been opened + for writing when the network connection died. Those are the + files that are potentially corrupted. It is meant as an aid + for the administrator to give him a list of files to do + consistency checks on. </para> </description> diff --git a/docs-xml/smbdotconf/security/usernamemapcachetime.xml b/docs-xml/smbdotconf/security/usernamemapcachetime.xml index 5461cb1..4361b18 100644 --- a/docs-xml/smbdotconf/security/usernamemapcachetime.xml +++ b/docs-xml/smbdotconf/security/usernamemapcachetime.xml @@ -4,13 +4,22 @@ type="integer" xmlns:samba="http://www.samba.org/samba/DTD/samba-doc"> <description> - <para>This option controls if and how long the result of the - <smbconfoption name="username map"/> and - <smbconfoption name="username map script"/> across smbds in gencache. - If set to non-zero, it denotes the number of seconds the output of - both mappings will be cached.</para> - <para>This option is mainly useful for heavy-weight - <smbconfoption name="username map script"/> scripts.</para> + <para> + Mapping usernames with the <smbconfoption name="username map"/> + or <smbconfoption name="username map script"/> + features of Samba can be relatively expensive. + During login of a user, the mapping is done several times. + In particular, calling the <smbconfoption name="username map script"/> + can slow down logins if external databases have to be queried from + the script being called. + </para> + + <para> + The parameter <smbconfoption name="username map cache time"/> + controls a mapping cache. It specifies the number of seconds a + mapping from the username map file or script is to be efficiently cached. + The default of 0 means no caching is done. + </para> </description> <value type="default">0</value> -- Samba Shared Repository