Location via proxy:   [ UP ]  
[Report a bug]   [Manage cookies]                
Skip to content

Commit 74d5842

Browse files
committed
Apply last revision of recovery patch
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.
1 parent 4914864 commit 74d5842

File tree

2 files changed

+3
-3
lines changed

2 files changed

+3
-3
lines changed

src/test/perl/PostgresNode.pm

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -474,7 +474,7 @@ Streaming replication can be enabled on this node by passing the keyword
474474
parameter has_streaming => 1. This is disabled by default.
475475
476476
Restoring WAL segments from archives using restore_command can be enabled
477-
by passiong the keyword parameter has_restoring => 1. This is disabled by
477+
by passing the keyword parameter has_restoring => 1. This is disabled by
478478
default.
479479
480480
The backup is copied, leaving the original unmodified. pg_hba.conf is

src/test/recovery/t/001_stream_rep.pl

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,11 +38,11 @@
3838
my $applname_1 = $node_standby_1->name;
3939
my $applname_2 = $node_standby_2->name;
4040
my $caughtup_query =
41-
"SELECT pg_current_xlog_location() = write_location FROM pg_stat_replication WHERE application_name = '$applname_1';";
41+
"SELECT pg_current_xlog_location() <= write_location FROM pg_stat_replication WHERE application_name = '$applname_1';";
4242
$node_master->poll_query_until('postgres', $caughtup_query)
4343
or die "Timed out while waiting for standby 1 to catch up";
4444
$caughtup_query =
45-
"SELECT pg_last_xlog_replay_location() = write_location FROM pg_stat_replication WHERE application_name = '$applname_2';";
45+
"SELECT pg_last_xlog_replay_location() <= write_location FROM pg_stat_replication WHERE application_name = '$applname_2';";
4646
$node_standby_1->poll_query_until('postgres', $caughtup_query)
4747
or die "Timed out while waiting for standby 2 to catch up";
4848

0 commit comments

Comments
 (0)