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

Merge branch 'pg93'

Browse Source
This commit is contained in:
Ian Barwick
2017-09-18 15:55:32 +09:00
parent 3dad337413 1197c11c59
commit e3defc507e
14 changed files with 430 additions and 284 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
repmgr-action-node.c
View File

@@ -1598,6 +1598,7 @@ do_node_rejoin(void)
t_node_info primary_node_record = T_NODE_INFO_INITIALIZER;
bool success = true;
int server_version_num = UNKNOWN_SERVER_VERSION_NUM;
/* check node is not actually running */
@@ -1646,6 +1647,12 @@ do_node_rejoin(void)
/* check provided upstream connection */
upstream_conn = establish_db_connection_by_params(&source_conninfo, true);
/* sanity-checks for 9.3 */
server_version_num = get_server_version(upstream_conn, NULL);
if (server_version_num < 90400)
check_93_config();
if (get_primary_node_record(upstream_conn, &primary_node_record) == false)
{
log_error(_("unable to retrieve primary node record"));