From: Martin Schwenke <martin@meltin.net>
Date: Wed, 18 Apr 2018 00:21:20 +0000 (+1000)
Subject: ctdb-daemon: Drop ctdbd --torture and --valgrinding options
X-Git-Tag: ldb-1.4.0~484
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=8a835ae175ddfb5c6b2644d576199043a145dd3d;p=thirdparty%2Fsamba.git

ctdb-daemon: Drop ctdbd --torture and --valgrinding options

These haven't been used by anyone in a long time.  --valgrinding is
less use with CTDB_VALGRINDING now gone.

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

diff --git a/ctdb/doc/ctdbd.1.xml b/ctdb/doc/ctdbd.1.xml
index e9b05c218ab..47c4007a5fb 100644
--- a/ctdb/doc/ctdbd.1.xml
+++ b/ctdb/doc/ctdbd.1.xml
@@ -397,41 +397,6 @@
     </variablelist>
   </refsect1>
 
-  <refsect1>
-    <title>DEBUGGING OPTIONS</title>
-
-    <variablelist>
-
-      <varlistentry>
-	<term>--torture</term>
-	<listitem>
-	  <para>
-	    This option is only used for development and testing of
-	    CTDB.  It adds artificial errors and failures to the
-	    common codepaths in ctdbd to verify that ctdbd can recover
-	    correctly from failures.
-	  </para>
-	  <para>
-	    <emphasis>Do not use this option</emphasis> unless you are
-	    developing and testing new functionality in CTDB.
-	  </para>
-	</listitem>
-      </varlistentry>
-
-      <varlistentry>
-	<term>--valgrinding</term>
-	<listitem>
-	  <para>
-	    This is a debugging option. This option is only used when
-	    debugging ctdbd.  This enables additional debugging
-	    capabilities and implies --nosetsched.
-	  </para>
-	</listitem>
-      </varlistentry>
-
-    </variablelist>
-  </refsect1>
-
   <refsect1>
     <title>SEE ALSO</title>
     <para>
diff --git a/ctdb/server/ctdbd.c b/ctdb/server/ctdbd.c
index 6b1d95f07c6..7bbc547c1fd 100644
--- a/ctdb/server/ctdbd.c
+++ b/ctdb/server/ctdbd.c
@@ -48,7 +48,6 @@ static struct {
 	const char *db_dir;
 	const char *db_dir_persistent;
 	const char *db_dir_state;
-	int         valgrinding;
 	int         nosetsched;
 	int         start_as_disabled;
 	int         start_as_stopped;
@@ -56,7 +55,6 @@ static struct {
 	int         no_recmaster;
 	int	    script_log_level;
 	int         max_persistent_check_errors;
-	int         torture;
 } options = {
 	.debuglevel = "NOTICE",
 	.transport = "tcp",
@@ -119,7 +117,6 @@ int main(int argc, const char *argv[])
 		{ "dbdir-persistent", 0, POPT_ARG_STRING, &options.db_dir_persistent, 0, "directory for persistent tdb files", NULL },
 		{ "dbdir-state", 0, POPT_ARG_STRING, &options.db_dir_state, 0, "directory for internal state tdb files", NULL },
 		{ "reclock", 0, POPT_ARG_STRING, &options.recovery_lock, 0, "recovery lock", "lock" },
-		{ "valgrinding", 0, POPT_ARG_NONE, &options.valgrinding, 0, "disable setscheduler SCHED_FIFO call, use mmap for tdbs", NULL },
 		{ "nosetsched", 0, POPT_ARG_NONE, &options.nosetsched, 0, "disable setscheduler SCHED_FIFO call, use mmap for tdbs", NULL },
 		{ "start-as-disabled", 0, POPT_ARG_NONE, &options.start_as_disabled, 0, "Node starts in disabled state", NULL },
 		{ "start-as-stopped", 0, POPT_ARG_NONE, &options.start_as_stopped, 0, "Node starts in stopped state", NULL },
@@ -129,7 +126,6 @@ int main(int argc, const char *argv[])
 		{ "max-persistent-check-errors", 0, POPT_ARG_INT,
 		  &options.max_persistent_check_errors, 0,
 		  "max allowed persistent check errors (default 0)", NULL },
-		{ "torture", 0, POPT_ARG_NONE, &options.torture, 0, "enable nastiness in library", NULL },
 		POPT_TABLEEND
 	};
 	int opt, ret;
@@ -189,10 +185,6 @@ int main(int argc, const char *argv[])
 		exit(1);
 	}
 
-	if (options.torture == 1) {
-		ctdb_set_flags(ctdb, CTDB_FLAG_TORTURE);
-	}
-
 	/* Log to stderr when running as interactive */
 	if (interactive) {
 		options.logging = "file:";
@@ -316,11 +308,7 @@ int main(int argc, const char *argv[])
 		exit(1);
 	}
 
-	ctdb->valgrinding = (options.valgrinding == 1);
 	ctdb->do_setsched = (options.nosetsched != 1);
-	if (ctdb->valgrinding) {
-		ctdb->do_setsched = false;
-	}
 
 	ctdb->do_checkpublicip = true;