github/repmgr
1
0
Fork 0
mirror of https://github.com/EnterpriseDB/repmgr.git synced 2026-03-24 23:56:29 +00:00
Code Issues Packages Projects Releases 1 Wiki Activity

Change 'ignore_external_config_files' to a command line option

Browse Source 
It's only used when cloning a standby and has more in common with
--fast-checkpoint
This commit is contained in:
Ian Barwick
2015-03-23 15:24:01 +09:00
parent 3e2c9ed410
commit 0875b2aafa
6 changed files with 21 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
repmgr.c
View File

@@ -143,6 +143,7 @@ main(int argc, char **argv)
{"check-upstream-config", no_argument, NULL, 2},
{"rsync-only", no_argument, NULL, 3},
{"fast-checkpoint", no_argument, NULL, 4},
{"ignore-external-config-files", no_argument, NULL, 5},
{NULL, 0, NULL, 0}
};
@@ -268,6 +269,9 @@ main(int argc, char **argv)
case 4:
runtime_options.fast_checkpoint = true;
break;
case 5:
runtime_options.ignore_external_config_files = true;
break;
default:
{
PQExpBufferData unknown_option;
@@ -1337,7 +1341,7 @@ do_standby_clone(void)
if(strlen(master_config_file))
{
if(options.ignore_external_config_files && config_file_outside_pgdata)
if(runtime_options.ignore_external_config_files && config_file_outside_pgdata)
{
log_notice(_("standby clone: not copying master config file '%s'\n"), master_config_file);
}
@@ -1358,7 +1362,7 @@ do_standby_clone(void)
if(strlen(master_hba_file))
{
if(options.ignore_external_config_files && hba_file_outside_pgdata)
if(runtime_options.ignore_external_config_files && hba_file_outside_pgdata)
{
log_notice(_("standby clone: not copying master config file '%s'\n"), master_hba_file);
}
@@ -1379,7 +1383,7 @@ do_standby_clone(void)
if(strlen(master_ident_file))
{
if(options.ignore_external_config_files && ident_file_outside_pgdata)
if(runtime_options.ignore_external_config_files && ident_file_outside_pgdata)
{
log_notice(_("standby clone: not copying master config file '%s'\n"), master_ident_file);
}
@@ -2231,6 +2235,8 @@ help(const char *progname)
printf(_(" -r, --min-recovery-apply-delay=VALUE enable recovery time delay, value has to be a valid time atom (e.g. 5min)\n"));
printf(_(" --rsync-only use only rsync to clone a standby\n"));
printf(_(" --fast-checkpoint force fast checkpoint when cloning a standby\n"));
printf(_(" --ignore-external-config-files don't copy configuration files located outside \n" \
" the data directory when cloning a standby\n"));
printf(_(" --initdb-no-pwprompt don't require superuser password when running initdb\n"));
printf(_(" --check-upstream-config verify upstream server configuration\n"));
printf(_("\n%s performs the following node management tasks:\n\n"), progname);
@@ -2657,6 +2663,11 @@ check_parameters_for_action(const int action)
{
error_list_append(_("--fast-checkpoint can only be used when executing STANDBY CLONE"));
}
if(runtime_options.ignore_external_config_files)
{
error_list_append(_("--ignore-external-config-files can only be used when executing STANDBY CLONE"));
}
}
return;