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

repmgrd: remove duplicate local record check in BDR mode

Browse Source
This commit is contained in:
Ian Barwick
2018-03-06 12:31:07 +09:00
parent 9c72c0d66e
commit ed1bcb159e
2 changed files with 15 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
repmgrd-bdr.c
View File

@@ -121,23 +121,6 @@ monitor_bdr(void)
exit(ERR_BAD_CONFIG); exit(ERR_BAD_CONFIG);
} }
/* Retrieve record for this node from the local database */
record_status = get_node_record(local_conn, config_file_options.node_id, &local_node_info);
/*
* Terminate if we can't find the local node record. This is a
* "fix-the-config" situation, not a lot else we can do.
*/
if (record_status != RECORD_FOUND)
{
log_error(_("unable to retrieve record for local node (ID: %i), terminating"),
local_node_info.node_id);
log_hint(_("check that \"repmgr bdr register\" was executed for this node"));
PQfinish(local_conn);
exit(ERR_BAD_CONFIG);
}
if (local_node_info.active == false) if (local_node_info.active == false)
{ {
log_error(_("local node (ID: %i) is marked as inactive in repmgr"), log_error(_("local node (ID: %i) is marked as inactive in repmgr"),

16
repmgrd.c
View File

@@ -354,10 +354,24 @@ main(int argc, char **argv)
/* Retrieve record for this node from the local database */ /* Retrieve record for this node from the local database */
record_status = get_node_record(local_conn, config_file_options.node_id, &local_node_info); record_status = get_node_record(local_conn, config_file_options.node_id, &local_node_info);
/*
* Terminate if we can't find the local node record. This is a
* "fix-the-config" situation, not a lot else we can do.
*/
if (record_status != RECORD_FOUND) if (record_status != RECORD_FOUND)
{ {
log_error(_("no metadata record found for this node - terminating")); log_error(_("no metadata record found for this node - terminating"));
log_hint(_("check that 'repmgr (primary|standby) register' was executed for this node"));
switch (config_file_options.replication_type)
{
case REPLICATION_TYPE_PHYSICAL:
log_hint(_("check that 'repmgr (primary|standby) register' was executed for this node"));
break;
case REPLICATION_TYPE_BDR:
log_hint(_("check that 'repmgr bdr register' was executed for this node"));
break;
}
PQfinish(local_conn); PQfinish(local_conn);
terminate(ERR_BAD_CONFIG); terminate(ERR_BAD_CONFIG);