diff options
author | Martin Holst Swende <martin@swende.se> | 2019-02-12 18:29:05 +0800 |
---|---|---|
committer | Péter Szilágyi <peterke@gmail.com> | 2019-02-19 16:57:49 +0800 |
commit | 048b463b301b1ac61be187d7195665d4ad31f51f (patch) | |
tree | 88d6920fafd764c1a9a879d4dca04fadfb2239d7 /common/fdlimit/fdlimit_windows.go | |
parent | 9f5fb15097198ea20aaae31983a7101ac0679eaa (diff) | |
download | go-tangerine-048b463b301b1ac61be187d7195665d4ad31f51f.tar go-tangerine-048b463b301b1ac61be187d7195665d4ad31f51f.tar.gz go-tangerine-048b463b301b1ac61be187d7195665d4ad31f51f.tar.bz2 go-tangerine-048b463b301b1ac61be187d7195665d4ad31f51f.tar.lz go-tangerine-048b463b301b1ac61be187d7195665d4ad31f51f.tar.xz go-tangerine-048b463b301b1ac61be187d7195665d4ad31f51f.tar.zst go-tangerine-048b463b301b1ac61be187d7195665d4ad31f51f.zip |
common/fdlimit: cap on MacOS file limits, fixes #18994 (#19035)
* common/fdlimit: cap on MacOS file limits, fixes #18994
* common/fdlimit: fix Maximum-check to respect OPEN_MAX
* common/fdlimit: return error if OPEN_MAX is exceeded in Raise()
* common/fdlimit: goimports
* common/fdlimit: check value after setting fdlimit
* common/fdlimit: make comment a bit more descriptive
* cmd/utils: make fdlimit happy path a bit cleaner
(cherry picked from commit f48da43bae183a04a23d298cb1790d2f8d2cec51)
Diffstat (limited to 'common/fdlimit/fdlimit_windows.go')
-rw-r--r-- | common/fdlimit/fdlimit_windows.go | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/common/fdlimit/fdlimit_windows.go b/common/fdlimit/fdlimit_windows.go index 863c58bed..c9904cc8c 100644 --- a/common/fdlimit/fdlimit_windows.go +++ b/common/fdlimit/fdlimit_windows.go @@ -20,7 +20,7 @@ import "errors" // Raise tries to maximize the file descriptor allowance of this process // to the maximum hard-limit allowed by the OS. -func Raise(max uint64) error { +func Raise(max uint64) (uint64, error) { // This method is NOP by design: // * Linux/Darwin counterparts need to manually increase per process limits // * On Windows Go uses the CreateFile API, which is limited to 16K files, non @@ -30,7 +30,7 @@ func Raise(max uint64) error { if max > 16384 { return errors.New("file descriptor limit (16384) reached") } - return nil + return max, nil } // Current retrieves the number of file descriptors allowed to be opened by this |