sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-01-21 18:04:06 +03:00
Code

ctdb-daemon: Drop ctdbd --pidfile option

Browse Source 
Use environment variables for test-only options.

Signed-off-by: Martin Schwenke <martin@meltin.net>
Reviewed-by: Amitay Isaacs <amitay@gmail.com>
This commit is contained in:
Martin Schwenke 2018-03-05 21:27:22 +11:00 committed by Amitay Isaacs
parent 0ee7b8a669
commit 32fade2f13
2 changed files with 0 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
ctdb/doc/ctdbd.1.xml
View File

@ -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>

1
ctdb/server/ctdbd.c
View File

@ -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 },