ctdb-scripts: Drop CTDB_VALGRIND testing option

This is too inflexible for general use.  There is no use finding a new
home for this in the new configuration scheme.

Signed-off-by: Martin Schwenke <martin@meltin.net>
Reviewed-by: Amitay Isaacs <amitay@gmail.com>

diff --git a/ctdb/config/ctdbd_wrapper b/ctdb/config/ctdbd_wrapper
index dca90172d2675532dc1f52e88b31c598d593fab6..f831afacb1886dac715eb4ae62bc893e1d715576 100755 (executable)
--- a/ctdb/config/ctdbd_wrapper
+++ b/ctdb/config/ctdbd_wrapper
@@ -141,15 +141,6 @@ start()
        ulimit -n "$CTDB_MAX_OPEN_FILES"
     fi
 
-    if [ -n "$CTDB_VALGRIND" -a "$CTDB_VALGRIND" != "no" ] ; then
-       if [ "$CTDB_VALGRIND" = "yes" ] ; then
-           ctdbd="valgrind -q --log-file=/usr/local/var/log/ctdb_valgrind ${ctdbd}"
-       else
-           ctdbd="${CTDB_VALGRIND} ${ctdbd}"
-       fi
-       ctdb_options="${ctdb_options} --valgrinding"
-    fi
-
     case "$CTDB_LOGGING" in
        syslog:udp|syslog:udp-rfc5424)
            logger -t ctdbd "CTDB is being run with ${CTDB_LOGGING}.  If nothing is logged then check your syslogd configuration"

diff --git a/ctdb/doc/ctdbd.conf.5.xml b/ctdb/doc/ctdbd.conf.5.xml
index c66d1aec5420e0aedaa5ac1228ab1d27273b487a..13bcc3c9848eaa88d505b0d57f98182e40121915 100644 (file)
--- a/ctdb/doc/ctdbd.conf.5.xml
+++ b/ctdb/doc/ctdbd.conf.5.xml
@@ -1553,30 +1553,6 @@ CTDB_PER_IP_ROUTING_TABLE_ID_HIGH=9000
        </listitem>
       </varlistentry>
 
-      <varlistentry>
-       <term>CTDB_VALGRIND=yes|no|<parameter>COMMAND</parameter></term>
-       <listitem>
-         <para>
-           If "yes", this causes
-           <citerefentry><refentrytitle>ctdbd</refentrytitle>
-           <manvolnum>1</manvolnum></citerefentry> to be run under
-           <citerefentry><refentrytitle>valgrind</refentrytitle>
-           <manvolnum>1</manvolnum></citerefentry> with logs going to
-           <filename>/usr/local/var/log/ctdb_valgrind</filename>.  If neither
-           "yes" nor "no" then the value is assumed to be a COMMAND
-           (e.g. a <command>valgrind</command> variation, a
-           <citerefentry><refentrytitle>gdb</refentrytitle>
-           <manvolnum>1</manvolnum></citerefentry> command) that is
-           used in place of the default <command>valgrind</command>
-           command.  In either case, the <option>--valgrind</option>
-           option is passed to <command>ctdbd</command>.
-         </para>
-         <para>
-           Default is no.
-         </para>
-       </listitem>
-      </varlistentry>
-
       <varlistentry>
        <term>CTDB_VARDIR=<parameter>DIRECTORY</parameter></term>
        <listitem>