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

repmgr: fix standby clone with barman

Browse Source 
As of Barman commit 5ff62d3255, `pg_notify`
is also excluded from Barman backups.
This commit is contained in:
Ian Barwick
2017-03-16 10:25:20 +09:00
parent 8c8e368a69
commit 1746831486
1 changed files with 5 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
repmgr.c
View File

@@ -2954,8 +2954,6 @@ do_standby_clone(void)
primary_conn = source_conn; primary_conn = source_conn;
} }
/* /*
* Sanity-check that the master node has a repmgr schema - if not * Sanity-check that the master node has a repmgr schema - if not
* present, fail with an error (unless -F/--force is used) * present, fail with an error (unless -F/--force is used)
@@ -2975,7 +2973,6 @@ do_standby_clone(void)
log_warning(_("expected repmgr schema '%s' not found on master server\n"), get_repmgr_schema()); log_warning(_("expected repmgr schema '%s' not found on master server\n"), get_repmgr_schema());
} }
/* Fetch the source's data directory */ /* Fetch the source's data directory */
if (get_pg_setting(source_conn, "data_directory", master_data_directory) == false) if (get_pg_setting(source_conn, "data_directory", master_data_directory) == false)
{ {
@@ -2997,8 +2994,6 @@ do_standby_clone(void)
log_hint(_("use -D/--data-dir to explicitly specify a data directory\n")); log_hint(_("use -D/--data-dir to explicitly specify a data directory\n"));
} }
/* /*
* Copy the source connection so that we have some default values, * Copy the source connection so that we have some default values,
* particularly stuff like passwords extracted from PGPASSFILE; * particularly stuff like passwords extracted from PGPASSFILE;
@@ -3583,6 +3578,9 @@ do_standby_clone(void)
/* /*
* We must create some PGDATA subdirectories because they are * We must create some PGDATA subdirectories because they are
* not included in the Barman backup. * 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[] = { const char* const dirs[] = {
@@ -3593,14 +3591,14 @@ do_standby_clone(void)
/* Only from 9.4 */ /* Only from 9.4 */
"pg_dynshmem", "pg_logical", "pg_logical/snapshots", "pg_logical/mappings", "pg_replslot", "pg_dynshmem", "pg_logical", "pg_logical/snapshots", "pg_logical/mappings", "pg_replslot",
/* Already in 9.3 */ /* Already in 9.3 */
"pg_serial", "pg_snapshots", "pg_stat", "pg_stat_tmp", "pg_tblspc", "pg_notify", "pg_serial", "pg_snapshots", "pg_stat", "pg_stat_tmp", "pg_tblspc",
"pg_twophase", "pg_xlog", 0 "pg_twophase", "pg_xlog", 0
}; };
const int vers[] = { const int vers[] = {
100000, 100000,
90500, 90500,
90400, 90400, 90400, 90400, 90400, 90400, 90400, 90400, 90400, 90400,
0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
0, -100000, 0 0, -100000, 0
}; };
for (i = 0; dirs[i]; i++) for (i = 0; dirs[i]; i++)