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

Ensure witness node sets last upstream seen time

Browse Source
This commit is contained in:
Ian Barwick
2019-03-14 10:53:12 +09:00
committed by Ian Barwick
parent 048bad1c88
commit fc636b1bd2
5 changed files with 27 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
repmgrd-physical.c
View File

@@ -1612,7 +1612,11 @@ monitor_streaming_witness(void)
while (true)
{
if (check_upstream_connection(&upstream_conn, upstream_node_info.conninfo) == false)
if (check_upstream_connection(&primary_conn, upstream_node_info.conninfo) == true)
{
set_upstream_last_seen(local_conn);
}
else
{
if (upstream_node_info.node_status == NODE_STATUS_UP)
{
@@ -3440,6 +3444,7 @@ do_election(NodeInfoList *sibling_nodes)
}
}
/* don't interrogate a witness server */
if (cell->node_info->type == WITNESS)
{
@@ -3503,12 +3508,12 @@ do_election(NodeInfoList *sibling_nodes)
* configurable.
*/
if (sibling_replication_info.upstream_last_seen >= 0 && sibling_replication_info.upstream_last_seen < (config_file_options.monitor_interval_secs * 2))
{
nodes_with_primary_still_visible++;
log_notice(_("node %i last saw primary node %i second(s) ago, considering primary still visible"),
cell->node_info->node_id, sibling_replication_info.upstream_last_seen);
cell->node_info->node_id,
sibling_replication_info.upstream_last_seen);
appendPQExpBuffer(&nodes_with_primary_visible,
" - node \"%s\" (ID: %i): %i second(s) ago\n",
cell->node_info->node_name,
@@ -3518,8 +3523,10 @@ do_election(NodeInfoList *sibling_nodes)
else
{
log_info(_("node %i last saw primary node %i second(s) ago"),
cell->node_info->node_id, sibling_replication_info.upstream_last_seen);
cell->node_info->node_id,
sibling_replication_info.upstream_last_seen);
}
/* get node's last receive LSN - if "higher" than current winner, current node is candidate */
cell->node_info->last_wal_receive_lsn = sibling_replication_info.last_wal_receive_lsn;