From 32fade2f13af44865d9131644c650a346ecd3473 Mon Sep 17 00:00:00 2001 From: Martin Schwenke Date: Mon, 5 Mar 2018 21:27:22 +1100 Subject: [PATCH] ctdb-daemon: Drop ctdbd --pidfile option Use environment variables for test-only options. Signed-off-by: Martin Schwenke Reviewed-by: Amitay Isaacs --- ctdb/doc/ctdbd.1.xml | 14 -------------- ctdb/server/ctdbd.c | 1 - 2 files changed, 15 deletions(-) diff --git a/ctdb/doc/ctdbd.1.xml b/ctdb/doc/ctdbd.1.xml index 849bd10a193..dfd8dec0d35 100644 --- a/ctdb/doc/ctdbd.1.xml +++ b/ctdb/doc/ctdbd.1.xml @@ -315,20 +315,6 @@ - - --pidfile=FILENAME - - - FILENAME for file containing process ID of main CTDB - daemon. This file is automatically created and removed by - CTDB. - - - The default is to not create a PID file. - - - - --public_addresses=FILENAME diff --git a/ctdb/server/ctdbd.c b/ctdb/server/ctdbd.c index 9341f77d0ea..c2b16f41d33 100644 --- 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 },