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

Code cleanup in repmgr-action-standby.c

Browse Source
This commit is contained in:
Ian Barwick
2017-05-09 23:07:01 +09:00
parent 1aa6df95a9
commit c61d16def6
1 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
repmgr-action-standby.c
View File

@@ -352,7 +352,8 @@ do_standby_clone(void)
* files detected to the appropriate location. Any errors encountered * files detected to the appropriate location. Any errors encountered
* will not be treated as fatal. * will not be treated as fatal.
* *
* XXX check this won't run in Barman mode * This won't run in Barman mode as "config_files" is only populated in
* "initialise_direct_clone()", which isn't called in Barman mode.
*/ */
if (runtime_options.copy_external_config_files && config_files.entries) if (runtime_options.copy_external_config_files && config_files.entries)
{ {
@@ -1390,17 +1391,19 @@ initialise_direct_clone(void)
for (cell = config_file_options.tablespace_mapping.head; cell; cell = cell->next) for (cell = config_file_options.tablespace_mapping.head; cell; cell = cell->next)
{ {
char *old_dir_escaped = escape_string(source_conn, cell->old_dir);
initPQExpBuffer(&query); initPQExpBuffer(&query);
// XXX escape value
appendPQExpBuffer(&query, appendPQExpBuffer(&query,
"SELECT spcname " "SELECT spcname "
" FROM pg_catalog.pg_tablespace " " FROM pg_catalog.pg_tablespace "
" WHERE pg_catalog.pg_tablespace_location(oid) = '%s'", " WHERE pg_catalog.pg_tablespace_location(oid) = '%s'",
cell->old_dir); old_dir_escaped);
res = PQexec(source_conn, query.data); res = PQexec(source_conn, query.data);
termPQExpBuffer(&query); termPQExpBuffer(&query);
pfree(old_dir_escaped);
if (PQresultStatus(res) != PGRES_TUPLES_OK) if (PQresultStatus(res) != PGRES_TUPLES_OK)
{ {
@@ -1728,7 +1731,6 @@ run_basebackup(void)
/* /*
* As of 9.4, pg_basebackup only ever returns 0 or 1 * As of 9.4, pg_basebackup only ever returns 0 or 1
* XXX check for 10
*/ */
r = system(script); r = system(script);