From 454aab4b738e53a5dbfca9251a7807a2ad21f87e Mon Sep 17 00:00:00 2001 From: Fujii Masao Date: Sat, 27 Jul 2024 03:05:47 +0900 Subject: [PATCH] postgres_fdw: Fix bug in connection status check. The buildfarm member "hake" reported a failure in the regression test added by commit 857df3cef7, where postgres_fdw_get_connections(true) returned unexpected results. The function postgres_fdw_get_connections(true) checks if a connection is closed by using POLLRDHUP in the requested events and calling poll(). Previously, the function only considered POLLRDHUP or 0 as valid returned events. However, poll() can also return POLLHUP, POLLERR, and/or POLLNVAL. So if any of these events were returned, postgres_fdw_get_connections(true) would report incorrect results. postgres_fdw_get_connections(true) failed to account for these return events. This commit updates postgres_fdw_get_connections(true) to correctly report a closed connection when poll() returns not only POLLRDHUP but also POLLHUP, POLLERR, or POLLNVAL. Discussion: https://postgr.es/m/fd8f6186-9e1e-4b9a-92c5-e71e3697d381@oss.nttdata.com --- contrib/postgres_fdw/connection.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/contrib/postgres_fdw/connection.c b/contrib/postgres_fdw/connection.c index 78cea232d50..12d1fec0e82 100644 --- a/contrib/postgres_fdw/connection.c +++ b/contrib/postgres_fdw/connection.c @@ -2309,7 +2309,8 @@ pgfdw_conn_check(PGconn *conn) if (result < 0) return -1; - return (input_fd.revents & POLLRDHUP) ? 1 : 0; + return (input_fd.revents & + (POLLRDHUP | POLLHUP | POLLERR | POLLNVAL)) ? 1 : 0; } #else return 0;