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

Fix "standby clone" in Barman mode with --no-upstream-connection

Browse Source 
"--upstream-node-id", if provided, was not being passed through to
the SQL query executed via the Barman server.

Also modified the query to select the primary node if "--upstream-node-id"
is not provided.

Note: this is a very niche use case.
This commit is contained in:
Ian Barwick
2018-02-07 16:34:01 +09:00
parent 56710f4819
commit 76cc11b786
1 changed files with 11 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
repmgr-action-standby.c
View File

@@ -237,6 +237,9 @@ do_standby_clone(void)
*/ */
check_source_server(); check_source_server();
} }
else {
upstream_node_id = runtime_options.upstream_node_id;
}
/* /*
* if --upstream-conninfo was supplied, use that (will overwrite value set * if --upstream-conninfo was supplied, use that (will overwrite value set
@@ -3344,8 +3347,14 @@ check_source_server_via_barman()
"repmgr database conninfo string on barman server: %s", "repmgr database conninfo string on barman server: %s",
repmgr_conninfo_buf.data); repmgr_conninfo_buf.data);
/* XXX check this works in all cases */ if (upstream_node_id == UNKNOWN_NODE_ID)
maxlen_snprintf(where_condition, "node_id=%i", upstream_node_id); {
maxlen_snprintf(where_condition, "type='primary' AND active IS TRUE");
}
else
{
maxlen_snprintf(where_condition, "node_id=%i", upstream_node_id);
}
initPQExpBuffer(&command_output); initPQExpBuffer(&command_output);
maxlen_snprintf(buf, maxlen_snprintf(buf,