diff options
| author | Martin Schwenke <martin@meltin.net> | 2018-04-05 16:25:14 +1000 |
|---|---|---|
| committer | Martin Schwenke <martins@samba.org> | 2018-05-01 13:31:18 +0200 |
| commit | 8c43ce74948e0b218e19f677670238490dd93d69 (patch) | |
| tree | 26fe1d843e1034b3c5bb17f851cf6569eaf3fe84 | |
| parent | 5081cec49e33031c117e8fa6c876e186fade0904 (diff) | |
| download | samba-8c43ce74948e0b218e19f677670238490dd93d69.tar.gz | |
ctdb-daemon: Drop ctdbd --sloppy-start and --nopublicipcheck options
CTDB_LOCAL_DAEMON_MODE=yes is used instead.
Signed-off-by: Martin Schwenke <martin@meltin.net>
Reviewed-by: Amitay Isaacs <amitay@gmail.com>
| -rw-r--r-- | ctdb/doc/ctdbd.1.xml | 23 | ||||
| -rw-r--r-- | ctdb/server/ctdbd.c | 5 |
2 files changed, 1 insertions, 27 deletions
diff --git a/ctdb/doc/ctdbd.1.xml b/ctdb/doc/ctdbd.1.xml index 71f23a94ea2..e9b05c218ab 100644 --- a/ctdb/doc/ctdbd.1.xml +++ b/ctdb/doc/ctdbd.1.xml @@ -403,29 +403,6 @@ <variablelist> <varlistentry> - <term>--nopublicipcheck</term> - <listitem> - <para> - This option is used when testing with multiple local - daemons on a single machine. It disables checks related - to public IP addresses. - </para> - </listitem> - </varlistentry> - - <varlistentry> - <term>--sloppy-start</term> - <listitem> - <para> - This is debugging option. This speeds up the initial - recovery during startup at the expense of some consistency - checking. <emphasis>Don't use this option in - production</emphasis>. - </para> - </listitem> - </varlistentry> - - <varlistentry> <term>--torture</term> <listitem> <para> diff --git a/ctdb/server/ctdbd.c b/ctdb/server/ctdbd.c index 9c9e84e686c..6b1d95f07c6 100644 --- a/ctdb/server/ctdbd.c +++ b/ctdb/server/ctdbd.c @@ -55,7 +55,6 @@ static struct { int no_lmaster; int no_recmaster; int script_log_level; - int no_publicipcheck; int max_persistent_check_errors; int torture; } options = { @@ -127,11 +126,9 @@ int main(int argc, const char *argv[]) { "no-lmaster", 0, POPT_ARG_NONE, &options.no_lmaster, 0, "disable lmaster role on this node", NULL }, { "no-recmaster", 0, POPT_ARG_NONE, &options.no_recmaster, 0, "disable recmaster role on this node", NULL }, { "script-log-level", 0, POPT_ARG_INT, &options.script_log_level, 0, "log level of event script output", NULL }, - { "nopublicipcheck", 0, POPT_ARG_NONE, &options.no_publicipcheck, 0, "don't check we have/don't have the correct public ip addresses", NULL }, { "max-persistent-check-errors", 0, POPT_ARG_INT, &options.max_persistent_check_errors, 0, "max allowed persistent check errors (default 0)", NULL }, - { "sloppy-start", 0, POPT_ARG_NONE, &fast_start, 0, "Do not perform full recovery on start", NULL }, { "torture", 0, POPT_ARG_NONE, &options.torture, 0, "enable nastiness in library", NULL }, POPT_TABLEEND }; @@ -325,7 +322,7 @@ int main(int argc, const char *argv[]) ctdb->do_setsched = false; } - ctdb->do_checkpublicip = (options.no_publicipcheck == 0); + ctdb->do_checkpublicip = true; t = getenv("CTDB_TEST_MODE"); if (t != NULL) { |