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: ensure primary connection is reset if same as upstream

Browse Source 
Addresses GitHub #633.
This commit is contained in:
Ian Barwick
2020-05-22 10:36:56 +09:00
parent a0d3fae7ab
commit cf60844c45
3 changed files with 42 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
repmgrd-physical.c
View File

@@ -1442,9 +1442,20 @@ monitor_streaming_standby(void)
while (true) while (true)
{ {
bool upstream_check_result;
log_verbose(LOG_DEBUG, "checking %s", upstream_node_info.conninfo); log_verbose(LOG_DEBUG, "checking %s", upstream_node_info.conninfo);
if (check_upstream_connection(&upstream_conn, upstream_node_info.conninfo) == true) if (upstream_node_info.type == PRIMARY)
{
upstream_check_result = check_upstream_connection(&upstream_conn, upstream_node_info.conninfo, &primary_conn);
}
else
{
upstream_check_result = check_upstream_connection(&upstream_conn, upstream_node_info.conninfo, NULL);
}
if (upstream_check_result == true)
{ {
set_upstream_last_seen(local_conn, upstream_node_info.node_id); set_upstream_last_seen(local_conn, upstream_node_info.node_id);
} }
@@ -1655,6 +1666,7 @@ monitor_streaming_standby(void)
if (monitoring_state == MS_DEGRADED) if (monitoring_state == MS_DEGRADED)
{ {
int degraded_monitoring_elapsed = calculate_elapsed(degraded_monitoring_start); int degraded_monitoring_elapsed = calculate_elapsed(degraded_monitoring_start);
bool upstream_check_result;
if (config_file_options.degraded_monitoring_timeout > 0 if (config_file_options.degraded_monitoring_timeout > 0
&& degraded_monitoring_elapsed > config_file_options.degraded_monitoring_timeout) && degraded_monitoring_elapsed > config_file_options.degraded_monitoring_timeout)
@@ -1684,7 +1696,17 @@ monitor_streaming_standby(void)
upstream_node_info.node_id, upstream_node_info.node_id,
degraded_monitoring_elapsed); degraded_monitoring_elapsed);
if (check_upstream_connection(&upstream_conn, upstream_node_info.conninfo) == true)
if (upstream_node_info.type == PRIMARY)
{
upstream_check_result = check_upstream_connection(&upstream_conn, upstream_node_info.conninfo, &primary_conn);
}
else
{
upstream_check_result = check_upstream_connection(&upstream_conn, upstream_node_info.conninfo, NULL);
}
if (upstream_check_result == true)
{ {
if (config_file_options.connection_check_type != CHECK_QUERY) if (config_file_options.connection_check_type != CHECK_QUERY)
upstream_conn = establish_db_connection(upstream_node_info.conninfo, false); upstream_conn = establish_db_connection(upstream_node_info.conninfo, false);
@@ -2301,7 +2323,7 @@ monitor_streaming_witness(void)
while (true) while (true)
{ {
if (check_upstream_connection(&primary_conn, upstream_node_info.conninfo) == true) if (check_upstream_connection(&primary_conn, upstream_node_info.conninfo, NULL) == true)
{ {
set_upstream_last_seen(local_conn, upstream_node_info.node_id); set_upstream_last_seen(local_conn, upstream_node_info.node_id);
} }
@@ -2401,7 +2423,7 @@ monitor_streaming_witness(void)
upstream_node_info.node_id, upstream_node_info.node_id,
degraded_monitoring_elapsed); degraded_monitoring_elapsed);
if (check_upstream_connection(&primary_conn, upstream_node_info.conninfo) == true) if (check_upstream_connection(&primary_conn, upstream_node_info.conninfo, NULL) == true)
{ {
if (config_file_options.connection_check_type != CHECK_QUERY) if (config_file_options.connection_check_type != CHECK_QUERY)
primary_conn = establish_db_connection(upstream_node_info.conninfo, false); primary_conn = establish_db_connection(upstream_node_info.conninfo, false);

17
repmgrd.c
View File

@@ -808,12 +808,11 @@ show_help(void)
bool bool
check_upstream_connection(PGconn **conn, const char *conninfo) check_upstream_connection(PGconn **conn, const char *conninfo, PGconn **paired_conn)
{ {
/* Check the connection status twice in case it changes after reset */ /* Check the connection status twice in case it changes after reset */
bool twice = false; bool twice = false;
log_debug("connection check type is \"%s\"", log_debug("connection check type is \"%s\"",
print_connection_check_type(config_file_options.connection_check_type)); print_connection_check_type(config_file_options.connection_check_type));
/* /*
@@ -862,7 +861,15 @@ check_upstream_connection(PGconn **conn, const char *conninfo)
*conn = PQconnectdb(conninfo); *conn = PQconnectdb(conninfo);
if (PQstatus(*conn) == CONNECTION_OK) if (PQstatus(*conn) == CONNECTION_OK)
{
if (paired_conn != NULL)
{
log_debug("resetting paired connection");
*paired_conn = *conn;
}
return true; return true;
}
return false; return false;
} }
@@ -913,6 +920,12 @@ check_upstream_connection(PGconn **conn, const char *conninfo)
} }
} }
if (paired_conn != NULL)
{
log_debug("resetting paired connection");
*paired_conn = *conn;
}
return true; return true;
} }

2
repmgrd.h
View File

@@ -22,7 +22,7 @@ extern PGconn *local_conn;
extern bool startup_event_logged; extern bool startup_event_logged;
extern char pid_file[MAXPGPATH]; extern char pid_file[MAXPGPATH];
bool check_upstream_connection(PGconn **conn, const char *conninfo); bool check_upstream_connection(PGconn **conn, const char *conninfo, PGconn **paired_conn);
void try_reconnect(PGconn **conn, t_node_info *node_info); void try_reconnect(PGconn **conn, t_node_info *node_info);
int calculate_elapsed(instr_time start_time); int calculate_elapsed(instr_time start_time);