Fixed TAP test for Postgres 9.6

This commit is contained in:
Andrew Kane
2021-04-20 14:55:52 -07:00
parent a3d946f3bf
commit 4eb7228502
2 changed files with 10 additions and 4 deletions

View File

@@ -23,5 +23,4 @@ jobs:
export PG_CONFIG=`which pg_config`
sudo --preserve-env=PG_CONFIG make install
- run: make installcheck
- if: ${{ matrix.postgres != 9.6 }}
run: make prove_installcheck
- run: make prove_installcheck

View File

@@ -17,8 +17,15 @@ sub test_index_replay
# Wait for replica to catch up
my $applname = $node_replica->name;
my $caughtup_query =
"SELECT pg_current_wal_lsn() <= write_lsn FROM pg_stat_replication WHERE application_name = '$applname';";
my $caughtup_query;
my $server_version_num = $node_primary->safe_psql("postgres", "SHOW server_version_num");
if ($server_version_num >= 100000) {
$caughtup_query = "SELECT pg_current_wal_lsn() <= write_lsn FROM pg_stat_replication WHERE application_name = '$applname';";
} else {
$caughtup_query = "SELECT pg_current_xlog_location() <= write_location FROM pg_stat_replication WHERE application_name = '$applname';";
}
$node_primary->poll_query_until('postgres', $caughtup_query)
or die "Timed out while waiting for replica 1 to catch up";