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

Call check_93_config() directly from check_upstream_config()

Browse Source
This commit is contained in:
Ian Barwick
2019-10-16 16:57:53 +09:00
parent de67fa2441
commit f45b9d7024
1 changed files with 5 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
repmgr-action-standby.c
View File

@@ -5091,10 +5091,7 @@ check_source_server()
} }
} }
/* disable configuration file options incompatible with 9.3 */ /* Check the source node is configured sufficiently to be able to clone from */
if (source_server_version_num < 90400)
check_93_config();
check_upstream_config(source_conn, source_server_version_num, &upstream_node_record, true); check_upstream_config(source_conn, source_server_version_num, &upstream_node_record, true);
} }
@@ -5201,8 +5198,6 @@ check_source_server_via_barman()
* Perform sanity check on upstream server configuration before starting cloning * Perform sanity check on upstream server configuration before starting cloning
* process * process
* *
* For PostreSQL 9.3, ensure check_93_config() is called before calling this.
*
* TODO: * TODO:
* - check user is qualified to perform base backup * - check user is qualified to perform base backup
*/ */
@@ -5220,6 +5215,10 @@ check_upstream_config(PGconn *conn, int server_version_num, t_node_info *upstrea
standy_clone_mode mode; standy_clone_mode mode;
bool pg_setting_ok; bool pg_setting_ok;
/* Disable configuration file options incompatible with 9.3 */
if (server_version_num < 90400)
check_93_config();
/* /*
* Detecting the intended cloning mode * Detecting the intended cloning mode
*/ */