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

Enable creation of repmgr extension on BDR3 node

Browse Source
This commit is contained in:
Ian Barwick
2018-04-13 21:16:11 +09:00
committed by Ian Barwick
parent 8377704596
commit 108c3a36fb
2 changed files with 9 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
dbutils.c
View File

@@ -90,7 +90,10 @@ wrap_ddl_query(PQExpBufferData *query_buf, int replication_type, const char *fmt
if (replication_type == REPLICATION_TYPE_BDR) if (replication_type == REPLICATION_TYPE_BDR)
{ {
appendPQExpBuffer(query_buf, "SELECT bdr.bdr_replicate_ddl_command($repmgr$"); if (bdr_version_num < 3)
appendPQExpBuffer(query_buf, "SELECT bdr.bdr_replicate_ddl_command($repmgr$");
else
appendPQExpBuffer(query_buf, "SELECT bdr.replicate_ddl_command($repmgr$");
} }
va_start(arglist, fmt); va_start(arglist, fmt);
@@ -4379,9 +4382,10 @@ _is_bdr_db(PGconn *conn, PQExpBufferData *output, bool quiet)
else if (quiet == false) else if (quiet == false)
log_warning("%s", warning); log_warning("%s", warning);
} }
PQclear(res);
} }
PQclear(res);
return is_bdr_db; return is_bdr_db;
} }
@@ -4760,7 +4764,8 @@ get_all_bdr_node_records(PGconn *conn, BdrNodeInfoList *node_list)
" SELECT " BDR3_NODES_COLUMNS " SELECT " BDR3_NODES_COLUMNS
" FROM bdr.node bn " " FROM bdr.node bn "
" INNER JOIN pglogical.node_interface pni " " INNER JOIN pglogical.node_interface pni "
" ON bn.pglogical_node_id = pni.if_nodeid "); " ON bn.pglogical_node_id = pni.if_nodeid "
" ORDER BY node_name");
} }
log_verbose(LOG_DEBUG, "get_all_node_records():\n%s", query.data); log_verbose(LOG_DEBUG, "get_all_node_records():\n%s", query.data);

2
dbutils.h
View File

@@ -30,7 +30,7 @@
#define REPMGR_NODES_COLUMNS "n.node_id, n.type, n.upstream_node_id, n.node_name, n.conninfo, n.repluser, n.slot_name, n.location, n.priority, n.active, n.config_file, '' AS upstream_node_name " #define REPMGR_NODES_COLUMNS "n.node_id, n.type, n.upstream_node_id, n.node_name, n.conninfo, n.repluser, n.slot_name, n.location, n.priority, n.active, n.config_file, '' AS upstream_node_name "
#define BDR2_NODES_COLUMNS "node_sysid, node_timeline, node_dboid, node_name, node_local_dsn" #define BDR2_NODES_COLUMNS "node_sysid, node_timeline, node_dboid, node_name, node_local_dsn"
#define BDR3_NODES_COLUMNS "'', 0, 0, node_name, node_init_from_dsn" #define BDR3_NODES_COLUMNS "bn.pglogical_node_id, 0, 0, pni.if_name AS node_name, pni.if_dsn AS node_init_from_dsn"
#define ERRBUFF_SIZE 512 #define ERRBUFF_SIZE 512