diff options
| author | Martin Schwenke <martin@meltin.net> | 2018-04-30 16:01:57 +1000 |
|---|---|---|
| committer | Martin Schwenke <martins@samba.org> | 2018-05-01 13:31:18 +0200 |
| commit | 32430f84159a02f3f6cadd325bcac92b44e0c8dc (patch) | |
| tree | 82e02e77a5a1bb816f426aa1c13a3771204dbb4a | |
| parent | 8c43ce74948e0b218e19f677670238490dd93d69 (diff) | |
| download | samba-32430f84159a02f3f6cadd325bcac92b44e0c8dc.tar.gz | |
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>
| -rwxr-xr-x | ctdb/config/ctdbd_wrapper | 9 | ||||
| -rw-r--r-- | ctdb/doc/ctdbd.conf.5.xml | 24 |
2 files changed, 0 insertions, 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 @@ -1554,30 +1554,6 @@ CTDB_PER_IP_ROUTING_TABLE_ID_HIGH=9000 </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> <para> |