From 32430f84159a02f3f6cadd325bcac92b44e0c8dc Mon Sep 17 00:00:00 2001
From: Martin Schwenke <martin@meltin.net>
Date: Mon, 30 Apr 2018 16:01:57 +1000
Subject: [PATCH] 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>
---
 ctdb/config/ctdbd_wrapper |  9 ---------
 ctdb/doc/ctdbd.conf.5.xml | 24 ------------------------
 2 files changed, 33 deletions(-)

diff --git a/ctdb/config/ctdbd_wrapper b/ctdb/config/ctdbd_wrapper
index dca90172d26..f831afacb18 100755
--- 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 c66d1aec542..13bcc3c9848 100644
--- 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>
-- 
2.47.2