Location via proxy:   [ UP ]  
[Report a bug]   [Manage cookies]                
Skip to content

Commit df27d76

Browse files
committed
Disconnect if socket cannot be put into non-blocking mode
Commit 387da18 moved the code to put socket into non-blocking mode from socket_set_nonblocking() into the one-time initialization function, pq_init(). In socket_set_nonblocking(), there indeed was a risk of recursion on failure like the comment said, but in pq_init(), ERROR or FATAL is fine. There's even another elog(FATAL) just after this, if setting FD_CLOEXEC fails. Note that COMMERROR merely logged the error, it did not close the connection, so if putting the socket to non-blocking mode failed we would use the connection anyway. You might not immediately notice, because most socket operations in a regular backend wait for the socket to become readable/writable anyway. But e.g. replication will be quite broken. Backpatch to all supported versions. Discussion: https://www.postgresql.org/message-id/d40a5cd0-2722-40c5-8755-12e9e811fa3c@iki.fi
1 parent 80db5a3 commit df27d76

File tree

1 file changed

+1
-5
lines changed

1 file changed

+1
-5
lines changed

src/backend/libpq/pqcomm.c

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -209,14 +209,10 @@ pq_init(void)
209209
* nonblocking mode and use latches to implement blocking semantics if
210210
* needed. That allows us to provide safely interruptible reads and
211211
* writes.
212-
*
213-
* Use COMMERROR on failure, because ERROR would try to send the error to
214-
* the client, which might require changing the mode again, leading to
215-
* infinite recursion.
216212
*/
217213
#ifndef WIN32
218214
if (!pg_set_noblock(MyProcPort->sock))
219-
ereport(COMMERROR,
215+
ereport(FATAL,
220216
(errmsg("could not set socket to nonblocking mode: %m")));
221217
#endif
222218

0 commit comments

Comments
 (0)