diff options
| author | Jeff Davis <jdavis@postgresql.org> | 2020-12-14 23:49:57 -0800 |
|---|---|---|
| committer | Jeff Davis <jdavis@postgresql.org> | 2020-12-14 23:49:57 -0800 |
| commit | f10da1e9c970019ad9427cbff1f340d91c093603 (patch) | |
| tree | 786931dac2cead6702f8e2254078abc5601d141b | |
| parent | 348dd28a0df7c56e88cc83cedeb92a43db39233c (diff) | |
Revert "Cannot use WL_SOCKET_WRITEABLE without WL_SOCKET_READABLE."
This reverts commit 3a9e64aa0d96c8ffb6c682b082d0f72b1d373327.
Commit 4bad60e3 fixed the root of the problem that 3a9e64aa worked
around.
This enables proper pipelining of commands after terminating
replication, eliminating an undocumented limitation.
Discussion: https://postgr.es/m/3d57bc29-4459-578b-79cb-7641baf53c57%40iki.fi
Backpatch-through: 9.5
| -rw-r--r-- | src/backend/replication/walsender.c | 26 |
1 files changed, 10 insertions, 16 deletions
diff --git a/src/backend/replication/walsender.c b/src/backend/replication/walsender.c index f82932ffa28..f6ed80e502e 100644 --- a/src/backend/replication/walsender.c +++ b/src/backend/replication/walsender.c @@ -1440,7 +1440,12 @@ ProcessRepliesIfAny(void) last_processing = GetCurrentTimestamp(); - for (;;) + /* + * If we already received a CopyDone from the frontend, any subsequent + * message is the beginning of a new command, and should be processed in + * the main processing loop. + */ + while (!streamingDoneReceiving) { pq_startmsgread(); r = pq_getbyte_if_available(&firstchar); @@ -1469,19 +1474,6 @@ ProcessRepliesIfAny(void) proc_exit(0); } - /* - * If we already received a CopyDone from the frontend, the frontend - * should not send us anything until we've closed our end of the COPY. - * XXX: In theory, the frontend could already send the next command - * before receiving the CopyDone, but libpq doesn't currently allow - * that. - */ - if (streamingDoneReceiving && firstchar != 'X') - ereport(FATAL, - (errcode(ERRCODE_PROTOCOL_VIOLATION), - errmsg("unexpected standby message type \"%c\", after receiving CopyDone", - firstchar))); - /* Handle the very limited subset of commands expected in this phase */ switch (firstchar) { @@ -1963,8 +1955,10 @@ WalSndLoop(WalSndSendDataCallback send_data) long sleeptime; int wakeEvents; - wakeEvents = WL_LATCH_SET | WL_POSTMASTER_DEATH | WL_TIMEOUT | - WL_SOCKET_READABLE; + wakeEvents = WL_LATCH_SET | WL_POSTMASTER_DEATH | WL_TIMEOUT; + + if (!streamingDoneReceiving) + wakeEvents |= WL_SOCKET_READABLE; /* * Use fresh timestamp, not last_processed, to reduce the chance |