Skip to content

Commit 3e644dc

Browse files
committed
On Windows, close the client socket explicitly during backend shutdown.
It turns out that this is necessary to keep Winsock from dropping any not-yet-sent data, such as an error message explaining the reason for process termination. It's pretty weird that the implicit close done by the kernel acts differently from an explicit close, but it's hard to argue with experimental results. Independently submitted by Alexander Lakhin and Lars Kanis (comments by me, though). Back-patch to all supported branches. Discussion: https://postgr.es/m/90b34057-4176-7bb0-0dbb-9822a5f6425b@greiz-reinsdorf.de Discussion: https://postgr.es/m/16678-253e48d34dc0c376@postgresql.org
1 parent b6e5256 commit 3e644dc

File tree

1 file changed

+20
-7
lines changed

1 file changed

+20
-7
lines changed

src/backend/libpq/pqcomm.c

Lines changed: 20 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -286,15 +286,28 @@ socket_close(int code, Datum arg)
286286
secure_close(MyProcPort);
287287

288288
/*
289-
* Formerly we did an explicit close() here, but it seems better to
290-
* leave the socket open until the process dies. This allows clients
291-
* to perform a "synchronous close" if they care --- wait till the
292-
* transport layer reports connection closure, and you can be sure the
293-
* backend has exited.
289+
* On most platforms, we leave the socket open until the process dies.
290+
* This allows clients to perform a "synchronous close" if they care
291+
* --- wait till the transport layer reports connection closure, and
292+
* you can be sure the backend has exited. Saves a kernel call, too.
294293
*
295-
* We do set sock to PGINVALID_SOCKET to prevent any further I/O,
296-
* though.
294+
* However, that does not work on Windows: if the kernel closes the
295+
* socket it will invoke an "abortive shutdown" that discards any data
296+
* not yet sent to the client. (This is a flat-out violation of the
297+
* TCP RFCs, but count on Microsoft not to care about that.) To get
298+
* the spec-compliant "graceful shutdown" behavior, we must invoke
299+
* closesocket() explicitly.
300+
*
301+
* This code runs late enough during process shutdown that we should
302+
* have finished all externally-visible shutdown activities, so that
303+
* in principle it's good enough to act as a synchronous close on
304+
* Windows too. But it's a lot more fragile than the other way.
297305
*/
306+
#ifdef WIN32
307+
closesocket(MyProcPort->sock);
308+
#endif
309+
310+
/* In any case, set sock to PGINVALID_SOCKET to prevent further I/O */
298311
MyProcPort->sock = PGINVALID_SOCKET;
299312
}
300313
}

0 commit comments

Comments
 (0)