github/repmgr
1
0
Fork 0
mirror of https://github.com/EnterpriseDB/repmgr.git synced 2026-03-26 08:36:30 +00:00
Code Issues Packages Projects Releases 1 Wiki Activity

Add option "--initdb-no-pwprompt"

Browse Source 
Previously repmgr passed the -W flag to initdb, which forced
manual input of a password; this option removes the -W flag
to make repetitive testing easier.

Conflicts:
	repmgr.c
	repmgr.h
This commit is contained in:
Ian Barwick
2014-12-24 19:07:08 +09:00
committed by Ian Barwick
parent 1d9aacfed9
commit e8bc5521a5
3 changed files with 11 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
HISTORY
View File

@@ -1,7 +1,7 @@
2.0.3 2015-??-?? 2.0.3 2015-??-??
Add option "--initdb-no-pwprompt" (Ian)
Add -S/--superuser option for witness database creation Ian) Add -S/--superuser option for witness database creation Ian)
Add -X/--fast-checkpoint option for cloning (Christoph) Add -X/--fast-checkpoint option for cloning (Christoph)
Add option "--initdb-no-pwprompt" (Ian)
2.0.2 2015-02-17 2.0.2 2015-02-17
Add "--checksum" in rsync when using "--force" (Jaime) Add "--checksum" in rsync when using "--force" (Jaime)

11
repmgr.c
View File

@@ -112,6 +112,7 @@ main(int argc, char **argv)
{"ignore-rsync-warning", no_argument, NULL, 'I'}, {"ignore-rsync-warning", no_argument, NULL, 'I'},
{"verbose", no_argument, NULL, 'v'}, {"verbose", no_argument, NULL, 'v'},
{"fast-checkpoint", no_argument, NULL, 'X'}, {"fast-checkpoint", no_argument, NULL, 'X'},
{"initdb-no-pwprompt", no_argument, NULL, 1},
{NULL, 0, NULL, 0} {NULL, 0, NULL, 0}
}; };
@@ -194,6 +195,8 @@ main(int argc, char **argv)
break; break;
case 'X': case 'X':
runtime_options.fast_checkpoint = true; runtime_options.fast_checkpoint = true;
case 1:
runtime_options.initdb_no_pwprompt = true;
break; break;
default: default:
usage(); usage();
@@ -1719,8 +1722,10 @@ do_witness_create(void)
if (!runtime_options.superuser[0]) if (!runtime_options.superuser[0])
strncpy(runtime_options.superuser, "postgres", MAXLEN); strncpy(runtime_options.superuser, "postgres", MAXLEN);
sprintf(script, "%s/pg_ctl %s -D %s init -o \"-W -U %s\"", options.pg_bindir, sprintf(script, "%s/pg_ctl %s -D %s init -o \"%s-U %s\"", options.pg_bindir,
options.pgctl_options, runtime_options.dest_dir, runtime_options.superuser); options.pgctl_options, runtime_options.dest_dir,
runtime_options.initdb_no_pwprompt ? "" : "-W ",
runtime_options.superuser);
log_info("Initialize cluster for witness: %s.\n", script); log_info("Initialize cluster for witness: %s.\n", script);
r = system(script); r = system(script);
@@ -1959,7 +1964,7 @@ help(const char *progname)
" to happen\n")); " to happen\n"));
printf(_(" -W, --wait wait for a master to appear\n")); printf(_(" -W, --wait wait for a master to appear\n"));
printf(_(" -X, --fast-checkpoint force immediate checkpoint when cloning\n")); printf(_(" -X, --fast-checkpoint force immediate checkpoint when cloning\n"));
printf(_(" --initdb-no-pwprompt don't require superuser password when running initdb\n"));
printf(_("\n%s performs some tasks like clone a node, promote it or making follow\n"), progname); printf(_("\n%s performs some tasks like clone a node, promote it or making follow\n"), progname);
printf(_("another node and then exits.\n\n")); printf(_("another node and then exits.\n\n"));
printf(_("COMMANDS:\n")); printf(_("COMMANDS:\n"));

3
repmgr.h
View File

@@ -62,6 +62,7 @@ typedef struct
bool force; bool force;
bool wait_for_master; bool wait_for_master;
bool ignore_rsync_warn; bool ignore_rsync_warn;
bool initdb_no_pwprompt;
bool fast_checkpoint; bool fast_checkpoint;
char masterport[MAXLEN]; char masterport[MAXLEN];
@@ -71,6 +72,6 @@ typedef struct
int keep_history; int keep_history;
} t_runtime_options; } t_runtime_options;
#define T_RUNTIME_OPTIONS_INITIALIZER { "", "", "", "", "", "", "", DEFAULT_WAL_KEEP_SEGMENTS, false, false, false, false, false, "", "", 0} #define T_RUNTIME_OPTIONS_INITIALIZER { "", "", "", "", "", "", "", DEFAULT_WAL_KEEP_SEGMENTS, false, false, false, false, false, false, "", "", 0}
#endif #endif