diff options
| author | Jeff Davis <jdavis@postgresql.org> | 2020-12-14 23:47:30 -0800 |
|---|---|---|
| committer | Jeff Davis <jdavis@postgresql.org> | 2020-12-14 23:47:30 -0800 |
| commit | a58db3aa10e62e4228aa409ba006014fa07a8ca2 (patch) | |
| tree | 5559b7308dfa6bc7fdc28d918d03576829cdbf6a | |
| parent | 9b584953e7bf91e342af87ef44606acd6206cd1c (diff) | |
| download | postgresql-a58db3aa10e62e4228aa409ba006014fa07a8ca2.tar.gz postgresql-a58db3aa10e62e4228aa409ba006014fa07a8ca2.zip | |
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 2eb19ad2936..d5c9bc31d8e 100644 --- a/src/backend/replication/walsender.c +++ b/src/backend/replication/walsender.c @@ -1719,7 +1719,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); @@ -1748,19 +1753,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) { @@ -2362,8 +2354,10 @@ WalSndLoop(WalSndSendDataCallback send_data) long sleeptime; int wakeEvents; - wakeEvents = WL_LATCH_SET | WL_EXIT_ON_PM_DEATH | WL_TIMEOUT | - WL_SOCKET_READABLE; + wakeEvents = WL_LATCH_SET | WL_EXIT_ON_PM_DEATH | WL_TIMEOUT; + + if (!streamingDoneReceiving) + wakeEvents |= WL_SOCKET_READABLE; /* * Use fresh timestamp, not last_processing, to reduce the chance |