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

Clarify handling of tablespace_map file.

Browse Source
This commit is contained in:
Ian Barwick
2016-05-30 10:48:08 +09:00
parent d7e85f7565
commit 3bcea46c3b
1 changed files with 16 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
repmgr.c
View File

@@ -1697,7 +1697,7 @@ do_standby_clone(void)
goto stop_backup; goto stop_backup;
} }
/* Handle tablespaces */ /* Copy tablespaces and, if required, remap to a new location */
sqlquery_snprintf(sqlquery, sqlquery_snprintf(sqlquery,
" SELECT oid, pg_tablespace_location(oid) AS spclocation " " SELECT oid, pg_tablespace_location(oid) AS spclocation "
@@ -1734,7 +1734,6 @@ do_standby_clone(void)
appendPQExpBuffer(&tblspc_dir_src, "%s", PQgetvalue(res, i, 1)); appendPQExpBuffer(&tblspc_dir_src, "%s", PQgetvalue(res, i, 1));
/* Check if tablespace path matches one of the provided tablespace mappings */ /* Check if tablespace path matches one of the provided tablespace mappings */
if (options.tablespace_mapping.head != NULL) if (options.tablespace_mapping.head != NULL)
{ {
for (cell = options.tablespace_mapping.head; cell; cell = cell->next) for (cell = options.tablespace_mapping.head; cell; cell = cell->next)
@@ -1778,14 +1777,14 @@ do_standby_clone(void)
} }
/* /*
* If valid tablespace mappings were provided, arrange for the affected * If a valid mapping was provide for this tablespace, arrange for it to
* tablespaces to be remapped * be remapped
* (if no tablespace mappings were provided, non-default tablespaces * (if no tablespace mappings was provided, the link will be copied as-is
* will be copied as-is by pg_basebackup or rsync) * by pg_basebackup or rsync and no action is required)
*/ */
if (mapping_found == true) if (mapping_found == true)
{ {
/* 9.5 and later - create a tablespace_map file */ /* 9.5 and later - append to the tablespace_map file */
if (server_version_num >= 90500) if (server_version_num >= 90500)
{ {
tablespace_map_rewrite = true; tablespace_map_rewrite = true;
@@ -1829,6 +1828,13 @@ do_standby_clone(void)
PQclear(res); PQclear(res);
/*
* For 9.5 and later, if tablespace remapping was requested, we'll need
* to rewrite the tablespace map file ourselves.
* The tablespace map file is read on startup and any links created by
* the backend; we could do this ourselves like for pre-9.5 servers, but
* it's better to rely on functionality the backend provides.
*/
if (server_version_num >= 90500 && tablespace_map_rewrite == true) if (server_version_num >= 90500 && tablespace_map_rewrite == true)
{ {
PQExpBufferData tablespace_map_filename; PQExpBufferData tablespace_map_filename;
@@ -1841,7 +1847,9 @@ do_standby_clone(void)
/* Unlink any existing file (it should be there, but we don't care if it isn't) */ /* Unlink any existing file (it should be there, but we don't care if it isn't) */
if (unlink(tablespace_map_filename.data) < 0 && errno != ENOENT) if (unlink(tablespace_map_filename.data) < 0 && errno != ENOENT)
{ {
log_err(_("unable to remove tablespace_map file %s\n"), tablespace_map_filename.data); log_err(_("unable to remove tablespace_map file %s: %s\n"),
tablespace_map_filename.data,
strerror(errno));
r = retval = ERR_BAD_BASEBACKUP; r = retval = ERR_BAD_BASEBACKUP;
goto stop_backup; goto stop_backup;