aboutsummaryrefslogtreecommitdiffstats
path: root/common
diff options
context:
space:
mode:
authorMartin Holst Swende <martin@swende.se>2019-02-12 18:29:05 +0800
committerPéter Szilágyi <peterke@gmail.com>2019-02-19 16:57:49 +0800
commit048b463b301b1ac61be187d7195665d4ad31f51f (patch)
tree88d6920fafd764c1a9a879d4dca04fadfb2239d7 /common
parent9f5fb15097198ea20aaae31983a7101ac0679eaa (diff)
downloadgo-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')
-rw-r--r--common/fdlimit/fdlimit_freebsd.go11
-rw-r--r--common/fdlimit/fdlimit_test.go2
-rw-r--r--common/fdlimit/fdlimit_unix.go13
-rw-r--r--common/fdlimit/fdlimit_windows.go4
4 files changed, 19 insertions, 11 deletions
diff --git a/common/fdlimit/fdlimit_freebsd.go b/common/fdlimit/fdlimit_freebsd.go
index c126b0c26..5da434237 100644
--- a/common/fdlimit/fdlimit_freebsd.go
+++ b/common/fdlimit/fdlimit_freebsd.go
@@ -26,11 +26,11 @@ import "syscall"
// 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) {
// Get the current limit
var limit syscall.Rlimit
if err := syscall.Getrlimit(syscall.RLIMIT_NOFILE, &limit); err != nil {
- return err
+ return 0, err
}
// Try to update the limit to the max allowance
limit.Cur = limit.Max
@@ -38,9 +38,12 @@ func Raise(max uint64) error {
limit.Cur = int64(max)
}
if err := syscall.Setrlimit(syscall.RLIMIT_NOFILE, &limit); err != nil {
- return err
+ return 0, err
+ }
+ if err := syscall.Getrlimit(syscall.RLIMIT_NOFILE, &limit); err != nil {
+ return 0, err
}
- return nil
+ return limit.Cur, nil
}
// Current retrieves the number of file descriptors allowed to be opened by this
diff --git a/common/fdlimit/fdlimit_test.go b/common/fdlimit/fdlimit_test.go
index a9ee9ab36..21362b846 100644
--- a/common/fdlimit/fdlimit_test.go
+++ b/common/fdlimit/fdlimit_test.go
@@ -36,7 +36,7 @@ func TestFileDescriptorLimits(t *testing.T) {
if limit, err := Current(); err != nil || limit <= 0 {
t.Fatalf("failed to retrieve file descriptor limit (%d): %v", limit, err)
}
- if err := Raise(uint64(target)); err != nil {
+ if _, err := Raise(uint64(target)); err != nil {
t.Fatalf("failed to raise file allowance")
}
if limit, err := Current(); err != nil || limit < target {
diff --git a/common/fdlimit/fdlimit_unix.go b/common/fdlimit/fdlimit_unix.go
index a25813235..670112751 100644
--- a/common/fdlimit/fdlimit_unix.go
+++ b/common/fdlimit/fdlimit_unix.go
@@ -22,11 +22,12 @@ import "syscall"
// 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 {
+// Returns the size it was set to (may differ from the desired 'max')
+func Raise(max uint64) (uint64, error) {
// Get the current limit
var limit syscall.Rlimit
if err := syscall.Getrlimit(syscall.RLIMIT_NOFILE, &limit); err != nil {
- return err
+ return 0, err
}
// Try to update the limit to the max allowance
limit.Cur = limit.Max
@@ -34,9 +35,13 @@ func Raise(max uint64) error {
limit.Cur = max
}
if err := syscall.Setrlimit(syscall.RLIMIT_NOFILE, &limit); err != nil {
- return err
+ return 0, err
+ }
+ // MacOS can silently apply further caps, so retrieve the actually set limit
+ if err := syscall.Getrlimit(syscall.RLIMIT_NOFILE, &limit); err != nil {
+ return 0, err
}
- return nil
+ return limit.Cur, nil
}
// Current retrieves the number of file descriptors allowed to be opened by this
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