ctdb-daemon: Drop ctdbd --pidfile option

Use environment variables for test-only options.

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 849bd10a19332ffdf20c02f1ac4db0578bd34720..dfd8dec0d353f0fb159752ee15d29e56b8ca6558 100644 (file)
--- a/ctdb/doc/ctdbd.1.xml
+++ b/ctdb/doc/ctdbd.1.xml
@@ -315,20 +315,6 @@
        </listitem>
       </varlistentry>
 
-      <varlistentry>
-       <term>--pidfile=<parameter>FILENAME</parameter></term>
-       <listitem>
-         <para>
-           FILENAME for file containing process ID of main CTDB
-           daemon.  This file is automatically created and removed by
-           CTDB.
-         </para>
-         <para>
-           The default is to not create a PID file.
-         </para>
-       </listitem>
-      </varlistentry>
-
       <varlistentry>
        <term>--public_addresses=<parameter>FILENAME</parameter></term>
        <listitem>

diff --git a/ctdb/server/ctdbd.c b/ctdb/server/ctdbd.c
index 9341f77d0eab404d8f70f8c0cd18ecf522c92a6f..c2b16f41d333512c33dbc6ea7b492581a9644b56 100644 (file)
--- a/ctdb/server/ctdbd.c
+++ b/ctdb/server/ctdbd.c
@@ -135,7 +135,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" },
-               { "pidfile", 0, POPT_ARG_STRING, &ctdbd_pidfile, 0, "location of PID file", "filename" },
                { "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 },