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

cluster show: warn if unable to connect to witness's upstream

Browse Source 
Fix also applies to "daemon status".
This commit is contained in:
Ian Barwick
2019-05-21 12:35:49 +09:00
parent 2326c384c0
commit e6195edbca
1 changed files with 35 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
repmgr-client.c
View File

@@ -2268,7 +2268,7 @@ format_node_status(t_node_info *node_info, PQExpBufferData *node_status, PQExpBu
} }
else if (remote_node_rec.type == WITNESS) else if (remote_node_rec.type == WITNESS)
{ {
/* unlikely to happen */ /* no upstream - unlikely to happen */
if (remote_node_rec.upstream_node_id == NO_UPSTREAM_NODE) if (remote_node_rec.upstream_node_id == NO_UPSTREAM_NODE)
{ {
appendPQExpBufferStr(upstream, "! "); appendPQExpBufferStr(upstream, "! ");
@@ -2277,6 +2277,7 @@ format_node_status(t_node_info *node_info, PQExpBufferData *node_status, PQExpBu
node_info->node_name, node_info->node_name,
node_info->node_id); node_info->node_id);
} }
/* mismatch between reported upstream and upstream in local node's metadata */
else if(node_info->upstream_node_id != remote_node_rec.upstream_node_id) else if(node_info->upstream_node_id != remote_node_rec.upstream_node_id)
{ {
appendPQExpBufferStr(upstream, "! "); appendPQExpBufferStr(upstream, "! ");
@@ -2291,6 +2292,39 @@ format_node_status(t_node_info *node_info, PQExpBufferData *node_status, PQExpBu
node_info->upstream_node_name); node_info->upstream_node_name);
} }
} }
else
{
t_node_info upstream_node_rec = T_NODE_INFO_INITIALIZER;
RecordStatus upstream_node_rec_found = get_node_record(node_info->conn,
node_info->upstream_node_id,
&upstream_node_rec);
if (upstream_node_rec_found != RECORD_FOUND)
{
appendPQExpBufferStr(upstream, "? ");
item_list_append_format(warnings,
"unable to find record for upstream node ID %i",
node_info->upstream_node_id);
}
else
{
PGconn *upstream_conn = establish_db_connection_quiet(upstream_node_rec.conninfo);
if (PQstatus(upstream_conn) != CONNECTION_OK)
{
appendPQExpBufferStr(upstream, "? ");
item_list_append_format(warnings,
"unable to connect to node \"%s\" (ID: %i)'s upstream node \"%s\" (ID: %i)",
node_info->node_name,
node_info->node_id,
upstream_node_rec.node_name,
upstream_node_rec.node_id);
}
PQfinish(upstream_conn);
}
}
appendPQExpBufferStr(upstream, appendPQExpBufferStr(upstream,
remote_node_rec.upstream_node_name); remote_node_rec.upstream_node_name);