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

check_primary_status(): handle case where recovery type unknown

Browse Source
This commit is contained in:
Ian Barwick
2019-03-18 16:16:54 +09:00
parent 39df55c39c
commit 426759ca8e
1 changed files with 19 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
repmgrd-physical.c
View File

@@ -477,9 +477,17 @@ check_primary_status(int degraded_monitoring_elapsed)
PGconn *new_primary_conn;
RecordStatus record_status;
bool resume_monitoring = true;
RecoveryType recovery_type = get_recovery_type(local_conn);
if (recovery_type == RECTYPE_UNKNOWN)
{
log_warning(_("unable to determine node recovery status"));
/* "true" to indicate repmgrd should continue monitoring in degraded state */
return true;
}
/* node is still primary - resume monitoring */
if (get_recovery_type(local_conn) == RECTYPE_PRIMARY)
if (recovery_type == RECTYPE_PRIMARY)
{
if (degraded_monitoring_elapsed != NO_DEGRADED_MONITORING_ELAPSED)
{
@@ -530,7 +538,16 @@ check_primary_status(int degraded_monitoring_elapsed)
if (PQstatus(new_primary_conn) != CONNECTION_OK)
{
close_connection(&new_primary_conn);
log_warning(_("unable to connect to new primary node %i"), primary_node_id);
if (primary_node_id == UNKNOWN_NODE_ID)
{
log_warning(_("unable to determine a new primary node"));
}
else
{
log_warning(_("unable to connect to new primary node %i"), primary_node_id);
}
/* "true" to indicate repmgrd should continue monitoring in degraded state */
return true;
}