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

repmgrd: don't imply primary is in recovery if it's not available

Browse Source
This commit is contained in:
Ian Barwick
2018-08-16 15:31:25 +09:00
parent 6c93388848
commit 5aeb1b0589
1 changed files with 26 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
repmgrd-physical.c
View File

@@ -1836,9 +1836,18 @@ do_upstream_standby_failover(void)
if (primary_type != RECTYPE_PRIMARY) if (primary_type != RECTYPE_PRIMARY)
{ {
log_error(_("last known primary\"%s\" (ID: %i) is in recovery, not following"), if (primary_type == RECTYPE_STANDBY)
primary_node_info.node_name, {
primary_node_info.node_id); log_error(_("last known primary \"%s\" (ID: %i) is in recovery, not following"),
primary_node_info.node_name,
primary_node_info.node_id);
}
else
{
log_error(_("unable to determine status of last known primary \"%s\" (ID: %i), not following"),
primary_node_info.node_name,
primary_node_info.node_id);
}
close_connection(&primary_conn); close_connection(&primary_conn);
monitoring_state = MS_DEGRADED; monitoring_state = MS_DEGRADED;
@@ -2415,20 +2424,26 @@ witness_follow_new_primary(int new_primary_id)
{ {
RecoveryType primary_recovery_type = get_recovery_type(upstream_conn); RecoveryType primary_recovery_type = get_recovery_type(upstream_conn);
if (primary_recovery_type == RECTYPE_PRIMARY) switch (primary_recovery_type)
{ {
new_primary_ok = true; case RECTYPE_PRIMARY:
} new_primary_ok = true;
else break;
{ case RECTYPE_STANDBY:
new_primary_ok = false; new_primary_ok = false;
log_warning(_("new primary is not in recovery")); log_warning(_("new primary is not in recovery"));
close_connection(&upstream_conn); break;
case RECTYPE_UNKNOWN:
new_primary_ok = false;
log_warning(_("unable to determine status of new primary"));
break;
} }
} }
if (new_primary_ok == false) if (new_primary_ok == false)
{ {
close_connection(&upstream_conn);
return FAILOVER_STATE_FOLLOW_FAIL; return FAILOVER_STATE_FOLLOW_FAIL;
} }