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

ctdb-daemon: Drop ctdbd --sloppy-start and --nopublicipcheck options

Browse Source 
CTDB_LOCAL_DAEMON_MODE=yes is used instead.

Signed-off-by: Martin Schwenke <martin@meltin.net>
Reviewed-by: Amitay Isaacs <amitay@gmail.com>
This commit is contained in:
Martin Schwenke 2018-04-05 16:25:14 +10:00 committed by Martin Schwenke
parent 5081cec49e
commit 8c43ce7494
2 changed files with 1 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -402,29 +402,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>

5
ctdb/server/ctdbd.c
View File

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