database/postgres
1
0
Fork 0
mirror of https://github.com/postgres/postgres.git synced 2025-06-23 14:01:44 +03:00
Code Activity

Apply last revision of recovery patch

Browse Source 
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.
This commit is contained in:
Alvaro Herrera
2016-02-26 16:22:53 -03:00
parent 49148645f7
commit 74d58425c7
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/test/perl/PostgresNode.pm
View File

@ -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. parameter has_streaming => 1. This is disabled by default.
Restoring WAL segments from archives using restore_command can be enabled 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. default.
The backup is copied, leaving the original unmodified. pg_hba.conf is The backup is copied, leaving the original unmodified. pg_hba.conf is

4
src/test/recovery/t/001_stream_rep.pl
View File

@ -38,11 +38,11 @@ $node_master->psql('postgres',
my $applname_1 = $node_standby_1->name; my $applname_1 = $node_standby_1->name;
my $applname_2 = $node_standby_2->name; my $applname_2 = $node_standby_2->name;
my $caughtup_query = 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) $node_master->poll_query_until('postgres', $caughtup_query)
or die "Timed out while waiting for standby 1 to catch up"; or die "Timed out while waiting for standby 1 to catch up";
$caughtup_query = $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) $node_standby_1->poll_query_until('postgres', $caughtup_query)
or die "Timed out while waiting for standby 2 to catch up"; or die "Timed out while waiting for standby 2 to catch up";