Don't spuriously report FD_SETSIZE exhaustion on Windows.

Starting on 2023-08-03, this intermittently terminated a "pgbench -C"
test in CI.  It could affect a high-client-count "pgbench" without "-C".
While parallel reindexdb and vacuumdb reach the same problematic check,
sufficient client count and/or connection turnover is less plausible for
them.  Given the lack of examples from the buildfarm or from manual
builds, reproducing this must entail rare operating system
configurations.  Also correct the associated error message, which was
wrong for non-Windows.  Back-patch to v12, where the pgbench check first
appeared.  While v11 vacuumdb has the problematic check, reaching it
with typical vacuumdb usage is implausible.

Reviewed by Thomas Munro.

Discussion: https://postgr.es/m/CA+hUKG+JwvTNdcyJTriy9BbtzF1veSRQ=9M_ZKFn9_LqE7Kp7Q@mail.gmail.com

diff --git a/src/bin/pgbench/pgbench.c b/src/bin/pgbench/pgbench.c
index c5e028bd88dc148f96ccb1e3eaa42c94a4f96259..d14937711f3893a8de6b9a55978a6dec77470606 100644 (file)
--- a/src/bin/pgbench/pgbench.c
+++ b/src/bin/pgbench/pgbench.c
@@ -6377,15 +6377,24 @@ clear_socket_set(socket_set *sa)
 static void
 add_socket_to_set(socket_set *sa, int fd, int idx)
 {
+       /* See connect_slot() for background on this code. */
+#ifdef WIN32
+       if (sa->fds.fd_count + 1 >= FD_SETSIZE)
+       {
+               fprintf(stderr,
+                               "too many concurrent database clients for this platform: %d\n",
+                               sa->fds.fd_count + 1);
+               exit(1);
+       }
+#else
        if (fd < 0 || fd >= FD_SETSIZE)
        {
-               /*
-                * Doing a hard exit here is a bit grotty, but it doesn't seem worth
-                * complicating the API to make it less grotty.
-                */
-               fprintf(stderr, "too many client connections for select()\n");
+               fprintf(stderr,
+                               "socket file descriptor out of range for select(): %d\n",
+                               fd);
                exit(1);
        }
+#endif
        FD_SET(fd, &sa->fds);
        if (fd > sa->maxfd)
                sa->maxfd = fd;

diff --git a/src/bin/scripts/vacuumdb.c b/src/bin/scripts/vacuumdb.c
index bff6802dd36e93d28429a99f2db6317f722caeba..97ec3ad0e992760e257e9b1f02746db529afb8f9 100644 (file)
--- a/src/bin/scripts/vacuumdb.c
+++ b/src/bin/scripts/vacuumdb.c
@@ -635,15 +635,39 @@ vacuum_one_database(const ConnParams *cparams,
                        conn = connectDatabase(cparams, progname, echo, false, true);
 
                        /*
-                        * Fail and exit immediately if trying to use a socket in an
-                        * unsupported range.  POSIX requires open(2) to use the lowest
-                        * unused file descriptor and the hint given relies on that.
+                        * POSIX defines FD_SETSIZE as the highest file descriptor
+                        * acceptable to FD_SET() and allied macros.  Windows defines it
+                        * as a ceiling on the count of file descriptors in the set, not a
+                        * ceiling on the value of each file descriptor; see
+                        * https://learn.microsoft.com/en-us/windows/win32/api/winsock2/nf-winsock2-select
+                        * and
+                        * https://learn.microsoft.com/en-us/windows/win32/api/winsock/ns-winsock-fd_set.
+                        * We can't ignore that, because Windows starts file descriptors
+                        * at a higher value, delays reuse, and skips values.  With less
+                        * than ten concurrent file descriptors, opened and closed
+                        * rapidly, one can reach file descriptor 1024.
+                        *
+                        * Doing a hard exit here is a bit grotty, but it doesn't seem
+                        * worth complicating the API to make it less grotty.
                         */
-                       if (PQsocket(conn) >= FD_SETSIZE)
+#ifdef WIN32
+                       if (i >= FD_SETSIZE)
                        {
-                               pg_log_fatal("too many jobs for this platform -- try %d", i);
+                               pg_log_fatal("too many jobs for this platform: %d", i);
                                exit(1);
                        }
+#else
+                       {
+                               int                     fd = PQsocket(conn);
+
+                               if (fd >= FD_SETSIZE)
+                               {
+                                       pg_log_fatal("socket file descriptor out of range for select(): %d",
+                                                                fd);
+                                       exit(1);
+                               }
+                       }
+#endif
 
                        init_slot(slots + i, conn);
                }