mirror of
https://github.com/postgres/postgres.git
synced 2025-06-22 02:52:08 +03:00
Make logical WAL sender report streaming state appropriately
WAL senders sending logically-decoded data fail to properly report in "streaming" state when starting up, hence as long as one extra record is not replayed, such WAL senders would remain in a "catchup" state, which is inconsistent with the physical cousin. This can be easily reproduced by for example using pg_recvlogical and restarting the upstream server. The TAP tests have been slightly modified to detect the failure and strengthened so as future tests also make sure that a node is in streaming state when waiting for its catchup. Backpatch down to 9.4 where this code has been introduced. Reported-by: Sawada Masahiko Author: Simon Riggs, Sawada Masahiko Reviewed-by: Petr Jelinek, Michael Paquier, Vaishnavi Prabakaran Discussion: https://postgr.es/m/CAD21AoB2ZbCCqOx=bgKMcLrAvs1V0ZMqzs7wBTuDySezTGtMZA@mail.gmail.com
This commit is contained in:
@ -1525,7 +1525,8 @@ also works for logical subscriptions)
|
||||
until its replication location in pg_stat_replication equals or passes the
|
||||
upstream's WAL insert point at the time this function is called. By default
|
||||
the replay_lsn is waited for, but 'mode' may be specified to wait for any of
|
||||
sent|write|flush|replay.
|
||||
sent|write|flush|replay. The connection catching up must be in a streaming
|
||||
state.
|
||||
|
||||
If there is no active replication connection from this peer, waits until
|
||||
poll_query_until timeout.
|
||||
@ -1570,7 +1571,7 @@ sub wait_for_catchup
|
||||
. $lsn_expr . " on "
|
||||
. $self->name . "\n";
|
||||
my $query =
|
||||
qq[SELECT $lsn_expr <= ${mode}_lsn FROM pg_catalog.pg_stat_replication WHERE application_name = '$standby_name';];
|
||||
qq[SELECT $lsn_expr <= ${mode}_lsn AND state = 'streaming' FROM pg_catalog.pg_stat_replication WHERE application_name = '$standby_name';];
|
||||
$self->poll_query_until('postgres', $query)
|
||||
or croak "timed out waiting for catchup";
|
||||
print "done\n";
|
||||
|
Reference in New Issue
Block a user