git.postgresql.org Git - postgresql.git/commitdiff

diff --git a/src/backend/replication/logical/worker.c b/src/backend/replication/logical/worker.c

index 8c7fad8f74108d6a9f6540f07207c15d12eb57c3..d29c0c5a559f433493c5ee54f45a2764135a96e7 100644 (file)

--- a/src/backend/replication/logical/worker.c

+++ b/src/backend/replication/logical/worker.c

bool requestReply = false;

/*

- * Check if time since last receive from standby has reached the

+ * Check if time since last receive from primary has reached the

* configured limit.

*/

if (wal_receiver_timeout > 0)

diff --git a/src/backend/replication/walreceiver.c b/src/backend/replication/walreceiver.c

index 87c3ea450e944d521bec5d44cc5696bd6272aa72..9621c8d0efe2f1e4fa770465f0a89a82530c4075 100644 (file)

--- a/src/backend/replication/walreceiver.c

+++ b/src/backend/replication/walreceiver.c

bool requestReply = false;

/*

- * Check if time since last receive from standby has

+ * Check if time since last receive from primary has

* reached the configured limit.

*/

if (wal_receiver_timeout > 0)

diff --git a/src/test/perl/PostgresNode.pm b/src/test/perl/PostgresNode.pm

index ebcaeb44fec507fe014726c7d0efb77319bb1b62..014f0fcda6c03425131e7a72f66a30df48e75d11 100644 (file)

--- a/src/test/perl/PostgresNode.pm

+++ b/src/test/perl/PostgresNode.pm

=item on_error_stop => 1

By default, the B<psql> method invokes the B<psql> program with ON_ERROR_STOP=1

-set, so SQL execution is stopped at the first error and exit code 2 is

+set, so SQL execution is stopped at the first error and exit code 3 is

returned. Set B<on_error_stop> to 0 to ignore errors instead.

=item on_error_die => 0

diff --git a/src/test/recovery/t/020_archive_status.pl b/src/test/recovery/t/020_archive_status.pl

index eb5c04c4115843d3b47d366f08f2aa418dbcff4e..27d63d3cbfcc2e62d6558868b4a79ce048316b38 100644 (file)

--- a/src/test/recovery/t/020_archive_status.pl

+++ b/src/test/recovery/t/020_archive_status.pl

# that all segments needed are restored from the archives.

$standby1->poll_query_until('postgres',

qq{ SELECT pg_wal_lsn_diff(pg_last_wal_replay_lsn(), '$primary_lsn') >= 0 }

-) or die "Timed out while waiting for xlog replay on standby2";

+) or die "Timed out while waiting for xlog replay on standby1";

$standby1->safe_psql('postgres', q{CHECKPOINT});