[SCM] Samba Shared Repository - branch master updated

Amitay Isaacs amitay at samba.org
Sat May 12 07:14:03 UTC 2018


The branch, master has been updated
       via  b9d01fd ctdb-scripts: Drop CTDB_SUPPRESS_COREFILE and CTDB_MAX_OPEN_FILES options
       via  7e31a13 ctdb-config: Add default ctdb.sysconfig file, update ctdb.service
       via  74230c5 ctdb-docs: Document system options and resource controls
       via  f63f905 ctdb-config: Add a default script.options file
       via  a8ccf41 ctdb-docs: Document script.options
       via  ac1c12b ctdb-scripts: Use load_script_options() in miscellaneous scripts
       via  02444e5 ctdb-scripts: Allow load_script_options() to specify an event script
       via  00f35b7 ctdb-scripts: Add global script.options configuration file
       via  31f26e9 ctdb-tests: Separate support script for 06.nfs
       via  130f37c ctdb-scripts: Don't check for CTDB_PARTIALLY_ONLINE_INTERFACES clash
       via  574af23 ctdb-scripts: Don't load CTDB configuration in onnode
       via  5d7d53b ctdb-scripts: Don't load CTDB configuration in statd-callout
       via  36e7043 ctdb-tests: Continue running if a testcase is not executable
      from  cda3b23 pysmb: Add some more documentation for conn.list

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


- Log -----------------------------------------------------------------
commit b9d01fddc651798a50c2a2bf0d596d5f9d7eb6a1
Author: Martin Schwenke <martin at meltin.net>
Date:   Tue Apr 24 14:13:35 2018 +1000

    ctdb-scripts: Drop CTDB_SUPPRESS_COREFILE and CTDB_MAX_OPEN_FILES options
    
    These should be done using features provided by the operating system.
    
    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): Sat May 12 09:13:28 CEST 2018 on sn-devel-144

commit 7e31a1382fd5eb45448042960e90885462b1452a
Author: Martin Schwenke <martin at meltin.net>
Date:   Tue Apr 24 16:35:16 2018 +1000

    ctdb-config: Add default ctdb.sysconfig file, update ctdb.service
    
    Install ctdb.sysconfig in RPM.
    
    Signed-off-by: Martin Schwenke <martin at meltin.net>
    Reviewed-by: Amitay Isaacs <amitay at gmail.com>

commit 74230c59b6a8add7310c4ec39ef315cc67156b5a
Author: Martin Schwenke <martin at meltin.net>
Date:   Tue Apr 24 14:11:23 2018 +1000

    ctdb-docs: Document system options and resource controls
    
    The existing configuration file is disappearing so these configuration
    options need a new home that is not handled by ctdbd_wrapper.
    
    Signed-off-by: Martin Schwenke <martin at meltin.net>
    Reviewed-by: Amitay Isaacs <amitay at gmail.com>

commit f63f9053efb73375247de49bd396792936cbf1a2
Author: Martin Schwenke <martin at meltin.net>
Date:   Tue Apr 24 16:33:20 2018 +1000

    ctdb-config: Add a default script.options file
    
    Include it in the RPM.
    
    Signed-off-by: Martin Schwenke <martin at meltin.net>
    Reviewed-by: Amitay Isaacs <amitay at gmail.com>

commit a8ccf41b8796df417c92b157e6c61457768d0e6c
Author: Martin Schwenke <martin at meltin.net>
Date:   Wed Apr 4 19:17:59 2018 +1000

    ctdb-docs: Document script.options
    
    Signed-off-by: Martin Schwenke <martin at meltin.net>
    Reviewed-by: Amitay Isaacs <amitay at gmail.com>

commit ac1c12b5a21ed2666478817b377acf8f5aa48644
Author: Martin Schwenke <martin at meltin.net>
Date:   Wed Apr 4 19:16:57 2018 +1000

    ctdb-scripts: Use load_script_options() in miscellaneous scripts
    
    Some of these just aim to load the generic script.options file while
    others target more specific files.
    
    For NFS configuration, always use 60.nfs.options - even for 06.nfs.
    This could be carefully documented but will change a lot before
    release so there is no need.
    
    Signed-off-by: Martin Schwenke <martin at meltin.net>
    Reviewed-by: Amitay Isaacs <amitay at gmail.com>

commit 02444e5f479f2d9705de93006916d9cd1333f21c
Author: Martin Schwenke <martin at meltin.net>
Date:   Wed Apr 4 19:06:13 2018 +1000

    ctdb-scripts: Allow load_script_options() to specify an event script
    
    This allows other scripts to use the given options for a particular
    event script.  One interesting example is that the ctdb_natgw tool
    should look for configuration in events.d/11.natgw.options.
    
    In the future this will be something like
    events/failover/11.natgw.options, so require the component to be
    specified even though it isn't yet used.
    
    Test support is also updated.
    
    Signed-off-by: Martin Schwenke <martin at meltin.net>
    Reviewed-by: Amitay Isaacs <amitay at gmail.com>

commit 00f35b7b0d0b341e2ef1c7f699f80bbf0e5dc3e0
Author: Martin Schwenke <martin at meltin.net>
Date:   Wed Apr 4 18:52:36 2018 +1000

    ctdb-scripts: Add global script.options configuration file
    
    Signed-off-by: Martin Schwenke <martin at meltin.net>
    Reviewed-by: Amitay Isaacs <amitay at gmail.com>

commit 31f26e970092adeb4e560ec21831fc83e378145f
Author: Martin Schwenke <martin at meltin.net>
Date:   Fri Apr 6 10:30:23 2018 +1000

    ctdb-tests: Separate support script for 06.nfs
    
    Including 60.nfs was too simple a hack, since we will want to do some
    magic to use the configuration from 60.nfs for 06.nfs.
    
    Signed-off-by: Martin Schwenke <martin at meltin.net>
    Reviewed-by: Amitay Isaacs <amitay at gmail.com>

commit 130f37c23f9570c4cf2d87a4bc5502569dab1179
Author: Martin Schwenke <martin at meltin.net>
Date:   Thu Apr 5 10:54:00 2018 +1000

    ctdb-scripts: Don't check for CTDB_PARTIALLY_ONLINE_INTERFACES clash
    
    Just document that NAT gateway and LVS are not compatible with this
    option.  Update the documentation to make it clear that this is a
    10.interface option.
    
    Signed-off-by: Martin Schwenke <martin at meltin.net>
    Reviewed-by: Amitay Isaacs <amitay at gmail.com>

commit 574af23e9d56ad009820e7ea103a214c115adc51
Author: Martin Schwenke <martin at meltin.net>
Date:   Thu Apr 5 16:19:23 2018 +1000

    ctdb-scripts: Don't load CTDB configuration in onnode
    
    onnode does not use any configuration options.
    
    Drop sourcing of functions file since the only function used was
    loadconfig().
    
    Signed-off-by: Martin Schwenke <martin at meltin.net>
    Reviewed-by: Amitay Isaacs <amitay at gmail.com>

commit 5d7d53b25a1e2d9bfa3b654fe268dc3f30820ede
Author: Martin Schwenke <martin at meltin.net>
Date:   Wed Apr 4 19:14:16 2018 +1000

    ctdb-scripts: Don't load CTDB configuration in statd-callout
    
    The only configuration options used by statd-callout are NFS_HOSTNAME,
    which comes from the NFS system configuration file, and
    CTDB_NFS_CALLOUT, which is exported by the 60.nfs event script.
    
    Signed-off-by: Martin Schwenke <martin at meltin.net>
    Reviewed-by: Amitay Isaacs <amitay at gmail.com>

commit 36e7043fb16ac996793545022147f696caedee9c
Author: Martin Schwenke <martin at meltin.net>
Date:   Thu Jan 11 16:17:19 2018 +1100

    ctdb-tests: Continue running if a testcase is not executable
    
    At the moment the whole test run aborts without printing a summary of
    results but inexplicably succeeds.  Instead, generate a clear failure
    for a non-executable testcase.
    
    Signed-off-by: Martin Schwenke <martin at meltin.net>
    Reviewed-by: Amitay Isaacs <amitay at gmail.com>

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

Summary of changes:
 ctdb/config/ctdb-crash-cleanup.sh                  |    2 +-
 ctdb/config/ctdb.service                           |    1 +
 ctdb/config/ctdb.sysconfig                         |   14 +
 ctdb/config/ctdbd.conf                             |    3 -
 ctdb/config/ctdbd_wrapper                          |   14 -
 ctdb/config/debug-hung-script.sh                   |    2 +-
 ctdb/config/debug_locks.sh                         |    2 +-
 ctdb/config/events.d/06.nfs                        |    2 +-
 ctdb/config/events.d/11.natgw                      |    4 -
 ctdb/config/events.d/91.lvs                        |    4 -
 ctdb/config/functions                              |   24 +-
 ctdb/config/script.options                         |   22 +
 ctdb/config/statd-callout                          |    2 -
 ...{ctdbd.conf.5.xml => ctdb-script.options.5.xml} | 1123 +++++++------------
 ctdb/doc/ctdb.7.xml                                |   12 +-
 ctdb/doc/ctdb.sysconfig.5.xml                      |  258 +++++
 ctdb/doc/ctdbd.conf.5.xml                          | 1125 --------------------
 ctdb/doc/ctdbd_wrapper.1.xml                       |    3 +
 ctdb/packaging/RPM/ctdb.spec.in                    |   12 +-
 ctdb/tests/eventscripts/06.nfs.releaseip.001.sh    |    2 +-
 ctdb/tests/eventscripts/06.nfs.releaseip.002.sh    |    2 +-
 ctdb/tests/eventscripts/06.nfs.takeip.001.sh       |    2 +-
 ctdb/tests/eventscripts/06.nfs.takeip.002.sh       |    2 +-
 ctdb/tests/eventscripts/scripts/06.nfs.sh          |    7 +-
 ctdb/tests/eventscripts/scripts/local.sh           |   19 +-
 ctdb/tests/run_tests.sh                            |   13 +-
 ctdb/tools/ctdb_lvs                                |    2 +-
 ctdb/tools/ctdb_natgw                              |    2 +-
 ctdb/tools/onnode                                  |    4 -
 ctdb/wscript                                       |    2 +
 30 files changed, 765 insertions(+), 1921 deletions(-)
 create mode 100644 ctdb/config/ctdb.sysconfig
 create mode 100644 ctdb/config/script.options
 copy ctdb/doc/{ctdbd.conf.5.xml => ctdb-script.options.5.xml} (56%)
 create mode 100644 ctdb/doc/ctdb.sysconfig.5.xml


Changeset truncated at 500 lines:

diff --git a/ctdb/config/ctdb-crash-cleanup.sh b/ctdb/config/ctdb-crash-cleanup.sh
index 8f4cc86..896a90c 100755
--- a/ctdb/config/ctdb-crash-cleanup.sh
+++ b/ctdb/config/ctdb-crash-cleanup.sh
@@ -14,7 +14,7 @@ if service ctdb status >/dev/null 2>&1 ; then
     exit 0
 fi
 
-loadconfig
+load_script_options "failover" "11.natgw"
 
 if [ ! -f "$CTDB_BASE/public_addresses" ] ; then
 	die "No public addresses file found. Can't clean up."
diff --git a/ctdb/config/ctdb.service b/ctdb/config/ctdb.service
index 627803c..675b314 100644
--- a/ctdb/config/ctdb.service
+++ b/ctdb/config/ctdb.service
@@ -6,6 +6,7 @@ After=network-online.target time-sync.target
 [Service]
 Type=forking
 LimitCORE=infinity
+LimitNOFILE=1048576
 PIDFile=/run/ctdb/ctdbd.pid
 ExecStart=/usr/sbin/ctdbd_wrapper start
 ExecStop=/usr/sbin/ctdbd_wrapper stop
diff --git a/ctdb/config/ctdb.sysconfig b/ctdb/config/ctdb.sysconfig
new file mode 100644
index 0000000..2ec0e9d
--- /dev/null
+++ b/ctdb/config/ctdb.sysconfig
@@ -0,0 +1,14 @@
+# If using SYSV init, install this as /etc/sysconfig/ctdb,
+# /etc/default/ctdb or similar
+
+# Allow 1M open files
+ulimit -n 1048576
+
+# Allow core files to be created
+ulimit -c unlimited
+
+# Useful if default detection doesn't work
+# CTDB_INIT_STYLE=debian
+
+# If ctdbd takes a long time to start
+# CTDB_STARTUP_TIMEOUT=20
diff --git a/ctdb/config/ctdbd.conf b/ctdb/config/ctdbd.conf
index 3fe5c82..57cb349 100644
--- a/ctdb/config/ctdbd.conf
+++ b/ctdb/config/ctdbd.conf
@@ -13,9 +13,6 @@
 # CTDB_MANAGES_WINBIND=yes
 # CTDB_MANAGES_NFS=yes
 
-# Raise the file descriptor limit for CTDB?
-# CTDB_MAX_OPEN_FILES=10000
-
 # Default is to use the log file below instead of syslog.
 # CTDB_LOGGING=file:/var/log/log.ctdb
 
diff --git a/ctdb/config/ctdbd_wrapper b/ctdb/config/ctdbd_wrapper
index 320e02c..e8f0a23 100755
--- a/ctdb/config/ctdbd_wrapper
+++ b/ctdb/config/ctdbd_wrapper
@@ -88,20 +88,6 @@ start()
 
     export_debug_variables
 
-    # Explicitly trying to disable core files, no other way
-    # shellcheck disable=SC2039
-    if [ "$CTDB_SUPPRESS_COREFILE" = "yes" ]; then
-	ulimit -c 0
-    else
-	ulimit -c unlimited
-    fi
-
-    # Unsupported option easily avoided by not using configuration variable
-    # shellcheck disable=SC2039
-    if [ -n "$CTDB_MAX_OPEN_FILES" ]; then
-	ulimit -n "$CTDB_MAX_OPEN_FILES"
-    fi
-
     eval "$ctdbd" "$ctdb_options" || return 1
 
     # Wait until ctdbd has started and is ready to respond to clients.
diff --git a/ctdb/config/debug-hung-script.sh b/ctdb/config/debug-hung-script.sh
index d6ff833..03d5ea2 100755
--- a/ctdb/config/debug-hung-script.sh
+++ b/ctdb/config/debug-hung-script.sh
@@ -8,7 +8,7 @@
 
 . "${CTDB_BASE}/functions"
 
-loadconfig
+load_script_options
 
 # Testing hook
 if [ -n "$CTDB_DEBUG_HUNG_SCRIPT_LOGFILE" ] ; then
diff --git a/ctdb/config/debug_locks.sh b/ctdb/config/debug_locks.sh
index e51640b..db02f0c 100755
--- a/ctdb/config/debug_locks.sh
+++ b/ctdb/config/debug_locks.sh
@@ -17,7 +17,7 @@
 CTDB_DBDIR="${CTDB_VARDIR}/volatile"
 CTDB_DBDIR_PERSISTENT="${CTDB_VARDIR}/persistent"
 
-loadconfig
+load_script_options
 
 (
     flock -n 9 || exit 1
diff --git a/ctdb/config/events.d/06.nfs b/ctdb/config/events.d/06.nfs
index 785188e..4e02906 100755
--- a/ctdb/config/events.d/06.nfs
+++ b/ctdb/config/events.d/06.nfs
@@ -8,7 +8,7 @@
 
 service_name="nfs"
 
-load_script_options
+load_script_options "service" "60.nfs"
 
 ctdb_setup_state_dir "service" "$service_name"
 
diff --git a/ctdb/config/events.d/11.natgw b/ctdb/config/events.d/11.natgw
index cf80d41..18b064a 100755
--- a/ctdb/config/events.d/11.natgw
+++ b/ctdb/config/events.d/11.natgw
@@ -47,10 +47,6 @@ natgw_check_config ()
     [ -n "$CTDB_NATGW_PRIVATE_NETWORK" ] || \
 	    die "Invalid configuration: CTDB_NATGW_PRIVATE_NETWORK not set"
 
-    if [ "$CTDB_PARTIALLY_ONLINE_INTERFACES" = "yes" ] ; then
-	    die "Invalid configuration: CTDB_PARTIALLY_ONLINE_INTERFACES=yes incompatible with NAT gateway"
-    fi
-
     # The default is to create a single default route
     [ -n "$CTDB_NATGW_STATIC_ROUTES" ] || CTDB_NATGW_STATIC_ROUTES="0.0.0.0/0"
 }
diff --git a/ctdb/config/events.d/91.lvs b/ctdb/config/events.d/91.lvs
index c70f0c1..b3d65f4 100755
--- a/ctdb/config/events.d/91.lvs
+++ b/ctdb/config/events.d/91.lvs
@@ -37,10 +37,6 @@ lvs_check_config ()
 		[ -n "$CTDB_LVS_PUBLIC_IFACE" ] || \
 			die "Invalid configuration: CTDB_LVS_PUBLIC_IFACE not set"
 	fi
-
-	if [ "$CTDB_PARTIALLY_ONLINE_INTERFACES" = "yes" ] ; then
-		die "Invalid configuration: CTDB_PARTIALLY_ONLINE_INTERFACES=yes incompatible with LVS"
-	fi
 }
 
 case "$1" in
diff --git a/ctdb/config/functions b/ctdb/config/functions
index 69b5172..f3d7c16 100755
--- a/ctdb/config/functions
+++ b/ctdb/config/functions
@@ -54,11 +54,33 @@ loadconfig() {
 	fi
 }
 
+# load_script_options [ component script ]
+#   script is an event script name relative to a component
+#   component is currently ignored
 load_script_options ()
 {
+	if [ $# -eq 2 ] ; then
+		_script="$2"
+	elif [ $# -eq 0  ] ; then
+		_script=""
+	else
+		die "usage: load_script_options [ component script ]"
+	fi
+
 	loadconfig
 
-	_options="${0%.script}.options"
+	_options="${CTDB_BASE}/script.options"
+
+	if [ -r "$_options" ] ; then
+		. "$_options"
+	fi
+
+	if [ -n "$_script" ] ; then
+		_s="${CTDB_BASE}/events.d/${_script}"
+	else
+		_s="${0%.script}"
+	fi
+	_options="${_s}.options"
 
 	if [ -r "$_options" ] ; then
 		. "$_options"
diff --git a/ctdb/config/script.options b/ctdb/config/script.options
new file mode 100644
index 0000000..0c280c5
--- /dev/null
+++ b/ctdb/config/script.options
@@ -0,0 +1,22 @@
+# For now, use script.options to demonstrate these options.  The
+# CTDB_MANAGES_* variables will go away soon.  See other *.options
+# examples for more specific examples.
+
+#
+# Samba configuration
+#
+
+# 50.samba.options
+CTDB_MANAGES_SAMBA=yes
+# CTDB_SAMBA_SKIP_SHARE_CHECK=yes
+
+# 49.winbind.options
+CTDB_MANAGES_WINBIND=yes
+
+#
+# NFS configuration
+#
+
+# 60.nfs.options
+CTDB_MANAGES_NFS=yes
+CTDB_RPCINFO_LOCALHOST="127.0.0.1"
diff --git a/ctdb/config/statd-callout b/ctdb/config/statd-callout
index 30d5477..bf18b55 100755
--- a/ctdb/config/statd-callout
+++ b/ctdb/config/statd-callout
@@ -22,8 +22,6 @@ die ()
 
 load_system_config "nfs"
 
-loadconfig
-
 [ -n "$NFS_HOSTNAME" ] || \
     die "NFS_HOSTNAME is not configured. statd-callout failed"
 
diff --git a/ctdb/doc/ctdbd.conf.5.xml b/ctdb/doc/ctdb-script.options.5.xml
similarity index 56%
copy from ctdb/doc/ctdbd.conf.5.xml
copy to ctdb/doc/ctdb-script.options.5.xml
index dc53074..22cdd37 100644
--- a/ctdb/doc/ctdbd.conf.5.xml
+++ b/ctdb/doc/ctdb-script.options.5.xml
@@ -3,485 +3,129 @@
 	PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
 	"http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd">
 
-<refentry id="ctdbd.conf.5">
+<refentry id="ctdb-script.options.5">
 
   <refmeta>
-    <refentrytitle>ctdbd.conf</refentrytitle>
+    <refentrytitle>ctdb-script.options</refentrytitle>
     <manvolnum>5</manvolnum>
     <refmiscinfo class="source">ctdb</refmiscinfo>
     <refmiscinfo class="manual">CTDB - clustered TDB database</refmiscinfo>
   </refmeta>
 
   <refnamediv>
-    <refname>ctdbd.conf</refname>
-    <refpurpose>CTDB daemon configuration file</refpurpose>
+    <refname>ctdb-script.options</refname>
+    <refpurpose>CTDB scripts configuration files</refpurpose>
   </refnamediv>
 
   <refsect1>
     <title>DESCRIPTION</title>
 
     <para>
-      This file contains CTDB configuration variables that are affect
-      the operation of CTDB.  The default location of this file is
-      <filename>/usr/local/etc/ctdb/ctdbd.conf</filename>.
-    </para>
-
-    <para>
-      This file is a shell script (see
-      <citerefentry><refentrytitle>sh</refentrytitle>
-      <manvolnum>1</manvolnum></citerefentry>) but is usually limited
-      to simple variable assignments and shell-style comments.
-    </para>
-
-    <para>
-      CTDB configuration variables are grouped into several categories below.
-    </para>
-
-    <para>
-      Variables defined in this document can also be set in a
-      distribution-specific configuration file such as
-      <filename>/etc/sysconfig/ctdb</filename> (Red Hat) or
-      <filename>/etc/default/ctdb</filename> (Debian).  However, these
-      files should be reserved for variables used by the initscript.
-      A historical alternative is
-      <filename>/usr/local/etc/ctdb/sysconfig/ctdb</filename> - this is
-      deprecated.
-    </para>
-
-  </refsect1>
-
-  <refsect1>
-    <title>
-      GLOBAL CONFIGURATION
-    </title>
-
-    <para>
-      These options may be used in the initscripts, daemon and
-      scripts.  If any of these options are required then they should
-      be set in the distribution-specific initscript configuration,
-      such as <filename>/etc/sysconfig/ctdb</filename> or
-      <filename>/etc/default/ctdb</filename>.
-    </para>
-
-    <variablelist>
-
-      <varlistentry>
-	<term>CTDB_INIT_STYLE=debian|redhat|suse</term>
-	<listitem>
-	  <para>
-	    This is the init style used by the Linux distribution (or
-	    other operating system) being used.  This is usually
-	    determined dynamically by checking the system.  This
-	    variable is used by the initscript to determine which init
-	    system primitives to use.  It is also used by some
-	    eventscripts to choose the name of initscripts for certain
-	    services, since these can vary between distributions.
-	  </para>
-	  <para>
-	    No fixed default.
-	  </para>
-	  <para>
-	    If this option needs to be changed from the calculated
-	    default for the initscript to function properly, then it
-	    must be set in the distribution-specific initscript
-	    configuration, such as
-	    <filename>/etc/sysconfig/ctdb</filename>
-	  </para>
-	</listitem>
-      </varlistentry>
-
-    </variablelist>
-  </refsect1>
-
-  <refsect1>
-    <title>
-      DAEMON CONFIGURATION
-    </title>
-
-    <para>
-      Variables in this section are processed by
-      <citerefentry><refentrytitle>ctdbd_wrapper</refentrytitle>
-      <manvolnum>1</manvolnum></citerefentry> and are converted into
-      command-line arguments to
-      <citerefentry><refentrytitle>ctdbd</refentrytitle>
-      <manvolnum>1</manvolnum></citerefentry>.  Correspondence with
-      <citerefentry><refentrytitle>ctdbd</refentrytitle>
-      <manvolnum>1</manvolnum></citerefentry> options is shown for
-      each variable.  The the documentation for the relevant options
-      for more details.
-    </para>
-
-    <para>
-      Many of these variables are also used by event scripts.
+      Each CTDB script has 2 possible locations for its configuration options:
     </para>
 
     <variablelist>
 
       <varlistentry>
-	<term>CTDB_CAPABILITY_LMASTER=yes|no</term>
-	<listitem>
-	  <para>
-	    Defaults to yes.  Corresponds to <option>--no-lmaster</option>.
-	  </para>
-	</listitem>
-      </varlistentry>
-
-      <varlistentry>
-	<term>CTDB_CAPABILITY_RECMASTER=yes|no</term>
-	<listitem>
-	  <para>
-	    Defaults to yes.  Corresponds to
-	    <option>--no-recmaster</option>.
-	  </para>
-	</listitem>
-      </varlistentry>
-
-      <varlistentry>
-	<term>CTDB_DBDIR=<parameter>DIRECTORY</parameter></term>
-	<listitem>
-	  <para>
-	    Defaults to <filename>/usr/local/var/lib/ctdb/volatile</filename>.
-	  </para>
-	  <para>
-	    Corresponds to <option>--dbdir</option>.
-	  </para>
-	</listitem>
-      </varlistentry>
-
-      <varlistentry>
-	<term>CTDB_DBDIR_PERSISTENT=<parameter>DIRECTORY</parameter></term>
-	<listitem>
-	  <para>
-	    Defaults to <filename>/usr/local/var/lib/ctdb/persistent</filename>.
-	  </para>
-	  <para>
-	    Corresponds to <option>--dbdir-persistent</option>.
-	  </para>
-	</listitem>
-      </varlistentry>
-
-      <varlistentry>
-	<term>CTDB_DBDIR_STATE=<parameter>DIRECTORY</parameter></term>
-	<listitem>
-	  <para>
-	    Defaults to <filename>/usr/local/var/lib/ctdb/state</filename>.
-	  </para>
-	  <para>
-	    Corresponds to <option>--dbdir-state</option>.
-	  </para>
-	</listitem>
-      </varlistentry>
-
-      <varlistentry>
-	<term>CTDB_DEBUG_HUNG_SCRIPT=<parameter>FILENAME</parameter></term>
-	<listitem>
-	  <para>
-	    FILENAME is a script to run to log debug information when
-	    an event script times out.
-	  </para>
-	  <para>
-	    Default is <filename>/usr/local/etc/ctdb/debug-hung-script.sh</filename>.
-	  </para>
-	</listitem>
-      </varlistentry>
-
-      <varlistentry>
-	<term>CTDB_DEBUG_HUNG_SCRIPT_STACKPAT=<parameter>REGEXP</parameter></term>
-	<listitem>
-	  <para>
-	    REGEXP specifies interesting processes for which stack
-	    traces should be logged when debugging hung eventscripts
-	    and those processes are matched in pstree output.  REGEXP
-	    is an extended regexp so choices are separated by pipes
-	    ('|').  However, REGEXP should not contain parentheses.
-	    See also <citetitle>CTDB_DEBUG_HUNG_SCRIPT</citetitle>.
-	  </para>
-	  <para>
-	    Default is "exportfs|rpcinfo".
-	  </para>
-	</listitem>
-      </varlistentry>
-
-      <varlistentry>
-	<term>CTDB_DEBUG_LOCKS=<parameter>FILENAME</parameter></term>
-	<listitem>
-	  <para>
-	    FILENAME is a script to run to log debug information when
-	    an CTDB fails to freeze databases during recovery.
-	  </para>
-	  <para>
-	    No default, usually
-	    <filename>/usr/local/etc/ctdb/debug_locks.sh</filename>.
-	  </para>
-	</listitem>
-      </varlistentry>
-
-      <varlistentry>
-	<term>CTDB_DEBUGLEVEL=<parameter>DEBUGLEVEL</parameter></term>
-	<listitem>
-	  <para>
-	    Default is NOTICE.  Corresponds to <option>-d</option> or
-	    <option>--debug</option>.
-	  </para>
-	</listitem>
-      </varlistentry>
-
-      <varlistentry>
-	<term>CTDB_LOGGING=<parameter>STRING</parameter></term>
-	<listitem>
-	  <para>
-	    STRING specifies where ctdbd will write its log. The
-	    default is
-	    file:<filename>/usr/local/var/log/log.ctdb</filename>.
-	    Corresponds to <option>--logging</option>.
-	  </para>
-	  <para>
-	    Valid values are:
-	  </para>
-	  <variablelist>
-	    <varlistentry>
-	      <term>file:<parameter>FILENAME</parameter></term>
-	      <listitem>
-		<para>
-		  FILENAME where ctdbd will write its log. This is usually
-		  <filename>/usr/local/var/log/log.ctdb</filename>.
-		</para>
-	      </listitem>
-	    </varlistentry>
-	    <varlistentry>
-	      <term>syslog<optional>:<parameter>METHOD</parameter></optional></term>
-              <listitem>
-                <para>
-		  CTDB will log to syslog.  By default this will use
-		  the syslog(3) API.


-- 
Samba Shared Repository



More information about the samba-cvs mailing list