Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commit5d76c80

Browse files
committed
Fix error handling of vacuumdb when running out of fds
When trying to use a high number of jobs, vacuumdb has only checked fora maximum number of jobs used, causing confusing failures when runningout of file descriptors when the jobs open connections to Postgres.This commit changes the error handling so as we do not check anymore fora maximum number of allowed jobs when parsing the option value withFD_SETSIZE, but check instead if a file descriptor is within thesupported range when opening the connections for the jobs so as this isdetected at the earliest time possible.Also, improve the error message to give a hint about the number of jobsrecommended, using a wording given by the reviewers of the patch.Reported-by: Andres FreundAuthor: Michael PaquierReviewed-by: Andres Freund, Álvaro Herrera, Tom LaneDiscussion:https://postgr.es/m/20190818001858.ho3ev4z57fqhs7a5@alap3.anarazel.deBackpatch-through: 9.5
1 parent5fc7b1e commit5d76c80

File tree

1 file changed

+14
-6
lines changed

1 file changed

+14
-6
lines changed

‎src/bin/scripts/vacuumdb.c

Lines changed: 14 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -200,12 +200,6 @@ main(int argc, char *argv[])
200200
progname);
201201
exit(1);
202202
}
203-
if (concurrentCons>FD_SETSIZE-1)
204-
{
205-
fprintf(stderr,_("%s: too many parallel jobs requested (maximum: %d)\n"),
206-
progname,FD_SETSIZE-1);
207-
exit(1);
208-
}
209203
break;
210204
case2:
211205
maintenance_db=pg_strdup(optarg);
@@ -442,6 +436,20 @@ vacuum_one_database(const char *dbname, vacuumingOptions *vacopts,
442436
{
443437
conn=connectDatabase(dbname,host,port,username,prompt_password,
444438
progname,echo, false, true);
439+
440+
/*
441+
* Fail and exit immediately if trying to use a socket in an
442+
* unsupported range. POSIX requires open(2) to use the lowest
443+
* unused file descriptor and the hint given relies on that.
444+
*/
445+
if (PQsocket(conn) >=FD_SETSIZE)
446+
{
447+
fprintf(stderr,
448+
_("%s: too many jobs for this platform -- try %d"),
449+
progname,i);
450+
exit(1);
451+
}
452+
445453
init_slot(slots+i,conn);
446454
}
447455
}

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp