diff options
| author | Michael Paquier <michael@paquier.xyz> | 2019-08-26 11:14:18 +0900 |
|---|---|---|
| committer | Michael Paquier <michael@paquier.xyz> | 2019-08-26 11:14:18 +0900 |
| commit | 71d84efba714db3b8a330a54be15c4d385719ad6 (patch) | |
| tree | ed75656ab6a856695db6adad11944aeaddea888f /src/bin/scripts/reindexdb.c | |
| parent | 6338fa3e715ad1cb12e0760bf73ffc2a906098ea (diff) | |
| download | postgresql-71d84efba714db3b8a330a54be15c4d385719ad6.tar.gz postgresql-71d84efba714db3b8a330a54be15c4d385719ad6.zip | |
Fix error handling of vacuumdb and reindexdb when running out of fds
When trying to use a high number of jobs, vacuumdb (and more recently
reindexdb) has only checked for a maximum number of jobs used, causing
confusing failures when running out of file descriptors when the jobs
open connections to Postgres. This commit changes the error handling so
as we do not check anymore for a maximum number of allowed jobs when
parsing the option value with FD_SETSIZE, but check instead if a file
descriptor is within the supported range when opening the connections
for the jobs so as this is detected at the earliest time possible.
Also, improve the error message to give a hint about the number of jobs
recommended, using a wording given by the reviewers of the patch.
Reported-by: Andres Freund
Author: Michael Paquier
Reviewed-by: Andres Freund, Álvaro Herrera, Tom Lane
Discussion: https://postgr.es/m/20190818001858.ho3ev4z57fqhs7a5@alap3.anarazel.de
Backpatch-through: 9.5
Diffstat (limited to 'src/bin/scripts/reindexdb.c')
| -rw-r--r-- | src/bin/scripts/reindexdb.c | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/src/bin/scripts/reindexdb.c b/src/bin/scripts/reindexdb.c index f93f7dd5fec..f00aec15de3 100644 --- a/src/bin/scripts/reindexdb.c +++ b/src/bin/scripts/reindexdb.c @@ -153,12 +153,6 @@ main(int argc, char *argv[]) pg_log_error("number of parallel jobs must be at least 1"); exit(1); } - if (concurrentCons > ParallelSlotsMax()) - { - pg_log_error("too many parallel jobs requested (maximum: %d)", - ParallelSlotsMax()); - exit(1); - } break; case 'v': verbose = true; |