Count witness and zero-priority nodes in visibility check

This commit is contained in:
Ian Barwick
2019-03-14 11:17:51 +09:00
committed by Ian Barwick
parent fc636b1bd2
commit 39443bbcee
5 changed files with 41 additions and 31 deletions

View File

@@ -2009,7 +2009,7 @@ do_standby_promote(void)
init_replication_info(&replication_info);
if (get_replication_info(conn, &replication_info) == false)
if (get_replication_info(conn, STANDBY, &replication_info) == false)
{
log_error(_("unable to retrieve replication information from local node"));
PQfinish(conn);
@@ -3262,7 +3262,7 @@ do_standby_switchover(void)
ReplInfo replication_info;
init_replication_info(&replication_info);
if (get_replication_info(local_conn, &replication_info) == false)
if (get_replication_info(local_conn, STANDBY, &replication_info) == false)
{
log_error(_("unable to retrieve replication information from local node"));
PQfinish(local_conn);
@@ -4326,7 +4326,7 @@ do_standby_switchover(void)
for (i = 0; i < config_file_options.wal_receive_check_timeout; i++)
{
get_replication_info(local_conn, &replication_info);
get_replication_info(local_conn, STANDBY, &replication_info);
if (replication_info.last_wal_receive_lsn >= remote_last_checkpoint_lsn)
break;