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

repmgr: improve standby clone when synchronous replication in use

Browse Source 
Fixes GitHub #277
This commit is contained in:
Ian Barwick
2017-03-16 16:40:54 +09:00
parent 478407fd86
commit 0ef532dcff
4 changed files with 55 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
repmgr.c
View File

@@ -758,7 +758,7 @@ main(int argc, char **argv)
{
if (optind < argc)
{
if (runtime_options.host_param_provided == true)
if (runtime_options.host[0])
{
PQExpBufferData additional_host_arg;
initPQExpBuffer(&additional_host_arg);
@@ -2954,6 +2954,8 @@ do_standby_clone(void)
primary_conn = source_conn;
}
/*
* Sanity-check that the master node has a repmgr schema - if not
* present, fail with an error (unless -F/--force is used)
@@ -2973,6 +2975,7 @@ do_standby_clone(void)
log_warning(_("expected repmgr schema '%s' not found on master server\n"), get_repmgr_schema());
}
/* Fetch the source's data directory */
if (get_pg_setting(source_conn, "data_directory", master_data_directory) == false)
{
@@ -2994,6 +2997,8 @@ do_standby_clone(void)
log_hint(_("use -D/--data-dir to explicitly specify a data directory\n"));
}
/*
* Copy the source connection so that we have some default values,
* particularly stuff like passwords extracted from PGPASSFILE;
@@ -3017,6 +3022,18 @@ do_standby_clone(void)
strncpy(recovery_conninfo_str, upstream_node_record.conninfo_str, MAXLEN);
}
}
/* Finally, set `synchronous_commit` to `local` to avoid problems
* if synchronous commit is in use.
*/
if (primary_conn != NULL && PQstatus(primary_conn) == CONNECTION_OK)
{
if (set_config(primary_conn, "synchronous_commit", "local") == false)
{
exit(ERR_DB_QUERY);
}
}
}
if (mode == barman && PQstatus(source_conn) != CONNECTION_OK)
@@ -3578,9 +3595,6 @@ do_standby_clone(void)
/*
* We must create some PGDATA subdirectories because they are
* not included in the Barman backup.
*
* See class RsyncBackupExecutor in the Barman source (barman/backup_executor.py)
* for a definitive list of excluded directories.
*/
{
const char* const dirs[] = {
@@ -3591,14 +3605,14 @@ do_standby_clone(void)
/* Only from 9.4 */
"pg_dynshmem", "pg_logical", "pg_logical/snapshots", "pg_logical/mappings", "pg_replslot",
/* Already in 9.3 */
"pg_notify", "pg_serial", "pg_snapshots", "pg_stat", "pg_stat_tmp", "pg_tblspc",
"pg_serial", "pg_snapshots", "pg_stat", "pg_stat_tmp", "pg_tblspc",
"pg_twophase", "pg_xlog", 0
};
const int vers[] = {
100000,
90500,
90400, 90400, 90400, 90400, 90400,
0, 0, 0, 0, 0, 0,
0, 0, 0, 0, 0,
0, -100000, 0
};
for (i = 0; dirs[i]; i++)
@@ -3628,17 +3642,6 @@ do_standby_clone(void)
initPQExpBuffer(&tablespace_map);
}
/*
* From 9.1 default is to wait for a sync standby to ack, avoid that by
* turning off sync rep for this session
*/
if (set_config_bool(source_conn, "synchronous_commit", false) == false)
{
r = ERR_BAD_CONFIG;
retval = ERR_BAD_CONFIG;
goto stop_backup;
}
if (start_backup(source_conn, first_wal_segment, runtime_options.fast_checkpoint) == false)
{
r = ERR_BAD_BASEBACKUP;