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

cluster show: don't display witness node timeline ID

Browse Source 
The witness node is not part of the replication cluster, so its timeline
ID is not of any relevance.
This commit is contained in:
Ian Barwick
2020-02-25 10:33:54 +09:00
parent 3b03edebb6
commit 76af2d9e08
3 changed files with 36 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
repmgr-action-cluster.c
View File

@@ -206,7 +206,8 @@ do_cluster_show(void)
else
{
/* NOP on pre-9.6 servers */
cell->node_info->replication_info->timeline_id = get_node_timeline(cell->node_info->conn);
cell->node_info->replication_info->timeline_id = get_node_timeline(cell->node_info->conn,
cell->node_info->replication_info->timeline_id_str);
}
initPQExpBuffer(&node_status);
@@ -244,18 +245,13 @@ do_cluster_show(void)
headers_show[SHOW_LOCATION].cur_length = strlen(cell->node_info->location);
if (cell->node_info->replication_info->timeline_id == UNKNOWN_TIMELINE_ID)
/* Format timeline ID */
if (cell->node_info->type == WITNESS)
{
/* display "?" */
headers_show[SHOW_TIMELINE_ID].cur_length = 1;
}
else
{
initPQExpBuffer(&buf);
appendPQExpBuffer(&buf, "%i", cell->node_info->replication_info->timeline_id);
headers_show[SHOW_TIMELINE_ID].cur_length = strlen(buf.data);
termPQExpBuffer(&buf);
/* The witness node's timeline ID is irrelevant */
strncpy(cell->node_info->replication_info->timeline_id_str, _("n/a"), MAXLEN);
}
headers_show[SHOW_TIMELINE_ID].cur_length = strlen(cell->node_info->replication_info->timeline_id_str);
headers_show[SHOW_CONNINFO].cur_length = strlen(cell->node_info->conninfo);
@@ -322,10 +318,7 @@ do_cluster_show(void)
if (headers_show[SHOW_TIMELINE_ID].display == true)
{
if (cell->node_info->replication_info->timeline_id == UNKNOWN_TIMELINE_ID)
printf("| %-*c ", headers_show[SHOW_TIMELINE_ID].max_length, '?');
else
printf("| %-*i ", headers_show[SHOW_TIMELINE_ID].max_length, (int)cell->node_info->replication_info->timeline_id);
printf("| %-*s ", headers_show[SHOW_TIMELINE_ID].max_length, cell->node_info->replication_info->timeline_id_str);
}
if (headers_show[SHOW_CONNINFO].display == true)