From 74d58425c70f9f7f1cb5d7f428ceaa1b56aa081d Mon Sep 17 00:00:00 2001 From: Alvaro Herrera Date: Fri, 26 Feb 2016 16:22:53 -0300 Subject: [PATCH] Apply last revision of recovery patch MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit I applied the previous-to-last revision of Michaël's submitted patch instead of the last; these two tweaks pointed out by Craig were left out of the previous commit by accident. --- src/test/perl/PostgresNode.pm | 2 +- src/test/recovery/t/001_stream_rep.pl | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/test/perl/PostgresNode.pm b/src/test/perl/PostgresNode.pm index 1561de50c43..a8e6f0c3bbf 100644 --- a/src/test/perl/PostgresNode.pm +++ b/src/test/perl/PostgresNode.pm @@ -474,7 +474,7 @@ Streaming replication can be enabled on this node by passing the keyword parameter has_streaming => 1. This is disabled by default. Restoring WAL segments from archives using restore_command can be enabled -by passiong the keyword parameter has_restoring => 1. This is disabled by +by passing the keyword parameter has_restoring => 1. This is disabled by default. The backup is copied, leaving the original unmodified. pg_hba.conf is diff --git a/src/test/recovery/t/001_stream_rep.pl b/src/test/recovery/t/001_stream_rep.pl index 50dfc0815c7..7dcca65374d 100644 --- a/src/test/recovery/t/001_stream_rep.pl +++ b/src/test/recovery/t/001_stream_rep.pl @@ -38,11 +38,11 @@ $node_master->psql('postgres', my $applname_1 = $node_standby_1->name; my $applname_2 = $node_standby_2->name; my $caughtup_query = -"SELECT pg_current_xlog_location() = write_location FROM pg_stat_replication WHERE application_name = '$applname_1';"; +"SELECT pg_current_xlog_location() <= write_location FROM pg_stat_replication WHERE application_name = '$applname_1';"; $node_master->poll_query_until('postgres', $caughtup_query) or die "Timed out while waiting for standby 1 to catch up"; $caughtup_query = -"SELECT pg_last_xlog_replay_location() = write_location FROM pg_stat_replication WHERE application_name = '$applname_2';"; +"SELECT pg_last_xlog_replay_location() <= write_location FROM pg_stat_replication WHERE application_name = '$applname_2';"; $node_standby_1->poll_query_until('postgres', $caughtup_query) or die "Timed out while waiting for standby 2 to catch up"; -- 2.39.5