From b4d145673bdcfa813ba23d1c956d1ec3613d7aba Mon Sep 17 00:00:00 2001 From: Martin Holst Swende Date: Mon, 11 Feb 2019 11:07:22 +0100 Subject: [PATCH 1/7] common/fdlimit: cap on MacOS file limits, fixes #18994 --- common/fdlimit/fdlimit_darwin.go | 70 ++++++++++++++++++++++++++++++++ common/fdlimit/fdlimit_unix.go | 2 +- 2 files changed, 71 insertions(+), 1 deletion(-) create mode 100644 common/fdlimit/fdlimit_darwin.go diff --git a/common/fdlimit/fdlimit_darwin.go b/common/fdlimit/fdlimit_darwin.go new file mode 100644 index 000000000000..ab92c93754a2 --- /dev/null +++ b/common/fdlimit/fdlimit_darwin.go @@ -0,0 +1,70 @@ +// Copyright 2016 The go-ethereum Authors +// This file is part of the go-ethereum library. +// +// The go-ethereum library is free software: you can redistribute it and/or modify +// it under the terms of the GNU Lesser General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// The go-ethereum library is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU Lesser General Public License for more details. +// +// You should have received a copy of the GNU Lesser General Public License +// along with the go-ethereum library. If not, see . + +// +build darwin + +package fdlimit + +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 { + // Get the current limit + var limit syscall.Rlimit + if err := syscall.Getrlimit(syscall.RLIMIT_NOFILE, &limit); err != nil { + return err + } + // Try to update the limit to the max allowance + limit.Cur = limit.Max + if limit.Cur > max { + limit.Cur = max + } + // https://developer.apple.com/library/archive/documentation/System/Conceptual/ManPages_iPhoneOS/man2/getrlimit.2.html + // + // setrlimit() now returns with errno set to EINVAL in places that histori-cally historically + // cally succeeded. It no longer accepts "rlim_cur = RLIM_INFINITY" for + // RLIM_NOFILE. Use "rlim_cur = min(OPEN_MAX, rlim_max)". + // + // OPEN_MAX is 10240 + if limit.Cur > 10240 { + limit.Cur = 10240 + } + if err := syscall.Setrlimit(syscall.RLIMIT_NOFILE, &limit); err != nil { + return err + } + return nil +} + +// Current retrieves the number of file descriptors allowed to be opened by this +// process. +func Current() (int, error) { + var limit syscall.Rlimit + if err := syscall.Getrlimit(syscall.RLIMIT_NOFILE, &limit); err != nil { + return 0, err + } + return int(limit.Cur), nil +} + +// Maximum retrieves the maximum number of file descriptors this process is +// allowed to request for itself. +func Maximum() (int, error) { + var limit syscall.Rlimit + if err := syscall.Getrlimit(syscall.RLIMIT_NOFILE, &limit); err != nil { + return 0, err + } + return int(limit.Max), nil +} diff --git a/common/fdlimit/fdlimit_unix.go b/common/fdlimit/fdlimit_unix.go index a258132353cd..06853c0a9c8f 100644 --- a/common/fdlimit/fdlimit_unix.go +++ b/common/fdlimit/fdlimit_unix.go @@ -14,7 +14,7 @@ // You should have received a copy of the GNU Lesser General Public License // along with the go-ethereum library. If not, see . -// +build linux darwin netbsd openbsd solaris +// +build linux netbsd openbsd solaris package fdlimit From db23b9547b9756a374a03815b242710eb1ad29a0 Mon Sep 17 00:00:00 2001 From: Martin Holst Swende Date: Mon, 11 Feb 2019 11:21:57 +0100 Subject: [PATCH 2/7] common/fdlimit: fix Maximum-check to respect OPEN_MAX --- common/fdlimit/fdlimit_darwin.go | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/common/fdlimit/fdlimit_darwin.go b/common/fdlimit/fdlimit_darwin.go index ab92c93754a2..d1a9f1c122e2 100644 --- a/common/fdlimit/fdlimit_darwin.go +++ b/common/fdlimit/fdlimit_darwin.go @@ -14,8 +14,6 @@ // You should have received a copy of the GNU Lesser General Public License // along with the go-ethereum library. If not, see . -// +build darwin - package fdlimit import "syscall" @@ -66,5 +64,8 @@ func Maximum() (int, error) { if err := syscall.Getrlimit(syscall.RLIMIT_NOFILE, &limit); err != nil { return 0, err } + if limit.Max > 10240 { // OPEN_MAX is 10240 + return 10240, nil + } return int(limit.Max), nil } From 75e2910312cbe5c8577886ae3c60e2286747f9f7 Mon Sep 17 00:00:00 2001 From: Martin Holst Swende Date: Mon, 11 Feb 2019 12:33:58 +0100 Subject: [PATCH 3/7] common/fdlimit: return error if OPEN_MAX is exceeded in Raise() --- common/fdlimit/fdlimit_darwin.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/common/fdlimit/fdlimit_darwin.go b/common/fdlimit/fdlimit_darwin.go index d1a9f1c122e2..e207bb7cd663 100644 --- a/common/fdlimit/fdlimit_darwin.go +++ b/common/fdlimit/fdlimit_darwin.go @@ -1,4 +1,4 @@ -// Copyright 2016 The go-ethereum Authors +// Copyright 2019 The go-ethereum Authors // This file is part of the go-ethereum library. // // The go-ethereum library is free software: you can redistribute it and/or modify @@ -39,7 +39,7 @@ func Raise(max uint64) error { // // OPEN_MAX is 10240 if limit.Cur > 10240 { - limit.Cur = 10240 + return errors.New("darwin only allows OPEN_MAX (10240) open files") } if err := syscall.Setrlimit(syscall.RLIMIT_NOFILE, &limit); err != nil { return err From 389825d6a2b3d16f99d3dfba5f3dbb4516fdd7dc Mon Sep 17 00:00:00 2001 From: Martin Holst Swende Date: Mon, 11 Feb 2019 17:00:20 +0100 Subject: [PATCH 4/7] common/fdlimit: goimports --- common/fdlimit/fdlimit_darwin.go | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/common/fdlimit/fdlimit_darwin.go b/common/fdlimit/fdlimit_darwin.go index e207bb7cd663..be50873a85f1 100644 --- a/common/fdlimit/fdlimit_darwin.go +++ b/common/fdlimit/fdlimit_darwin.go @@ -16,7 +16,10 @@ package fdlimit -import "syscall" +import ( + "errors" + "syscall" +) // Raise tries to maximize the file descriptor allowance of this process // to the maximum hard-limit allowed by the OS. From 22135028f064a4329c059fc31de5378fd1f1e2c4 Mon Sep 17 00:00:00 2001 From: Martin Holst Swende Date: Mon, 11 Feb 2019 17:24:00 +0100 Subject: [PATCH 5/7] common/fdlimit: check value after setting fdlimit --- cmd/utils/flags.go | 6 ++- common/fdlimit/fdlimit_darwin.go | 74 ------------------------------- common/fdlimit/fdlimit_freebsd.go | 11 +++-- common/fdlimit/fdlimit_test.go | 2 +- common/fdlimit/fdlimit_unix.go | 15 ++++--- common/fdlimit/fdlimit_windows.go | 4 +- 6 files changed, 24 insertions(+), 88 deletions(-) delete mode 100644 common/fdlimit/fdlimit_darwin.go diff --git a/cmd/utils/flags.go b/cmd/utils/flags.go index bf20abe81874..4abc6e0203c0 100644 --- a/cmd/utils/flags.go +++ b/cmd/utils/flags.go @@ -950,10 +950,12 @@ func makeDatabaseHandles() int { if err != nil { Fatalf("Failed to retrieve file descriptor allowance: %v", err) } - if err := fdlimit.Raise(uint64(limit)); err != nil { + if u64limit, err := fdlimit.Raise(uint64(limit)); err != nil { Fatalf("Failed to raise file descriptor allowance: %v", err) + return 0 // Make the compiler happy + } else { + return int(u64limit / 2) // Leave half for networking and other stuff } - return limit / 2 // Leave half for networking and other stuff } // MakeAddress converts an account specified directly as a hex encoded string or diff --git a/common/fdlimit/fdlimit_darwin.go b/common/fdlimit/fdlimit_darwin.go deleted file mode 100644 index be50873a85f1..000000000000 --- a/common/fdlimit/fdlimit_darwin.go +++ /dev/null @@ -1,74 +0,0 @@ -// Copyright 2019 The go-ethereum Authors -// This file is part of the go-ethereum library. -// -// The go-ethereum library is free software: you can redistribute it and/or modify -// it under the terms of the GNU Lesser General Public License as published by -// the Free Software Foundation, either version 3 of the License, or -// (at your option) any later version. -// -// The go-ethereum library is distributed in the hope that it will be useful, -// but WITHOUT ANY WARRANTY; without even the implied warranty of -// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -// GNU Lesser General Public License for more details. -// -// You should have received a copy of the GNU Lesser General Public License -// along with the go-ethereum library. If not, see . - -package fdlimit - -import ( - "errors" - "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 { - // Get the current limit - var limit syscall.Rlimit - if err := syscall.Getrlimit(syscall.RLIMIT_NOFILE, &limit); err != nil { - return err - } - // Try to update the limit to the max allowance - limit.Cur = limit.Max - if limit.Cur > max { - limit.Cur = max - } - // https://developer.apple.com/library/archive/documentation/System/Conceptual/ManPages_iPhoneOS/man2/getrlimit.2.html - // - // setrlimit() now returns with errno set to EINVAL in places that histori-cally historically - // cally succeeded. It no longer accepts "rlim_cur = RLIM_INFINITY" for - // RLIM_NOFILE. Use "rlim_cur = min(OPEN_MAX, rlim_max)". - // - // OPEN_MAX is 10240 - if limit.Cur > 10240 { - return errors.New("darwin only allows OPEN_MAX (10240) open files") - } - if err := syscall.Setrlimit(syscall.RLIMIT_NOFILE, &limit); err != nil { - return err - } - return nil -} - -// Current retrieves the number of file descriptors allowed to be opened by this -// process. -func Current() (int, error) { - var limit syscall.Rlimit - if err := syscall.Getrlimit(syscall.RLIMIT_NOFILE, &limit); err != nil { - return 0, err - } - return int(limit.Cur), nil -} - -// Maximum retrieves the maximum number of file descriptors this process is -// allowed to request for itself. -func Maximum() (int, error) { - var limit syscall.Rlimit - if err := syscall.Getrlimit(syscall.RLIMIT_NOFILE, &limit); err != nil { - return 0, err - } - if limit.Max > 10240 { // OPEN_MAX is 10240 - return 10240, nil - } - return int(limit.Max), nil -} diff --git a/common/fdlimit/fdlimit_freebsd.go b/common/fdlimit/fdlimit_freebsd.go index c126b0c26583..5da4342379fa 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 a9ee9ab36a9b..21362b8463a3 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 06853c0a9c8f..09ed31ef4d1a 100644 --- a/common/fdlimit/fdlimit_unix.go +++ b/common/fdlimit/fdlimit_unix.go @@ -14,7 +14,7 @@ // You should have received a copy of the GNU Lesser General Public License // along with the go-ethereum library. If not, see . -// +build linux netbsd openbsd solaris +// +build linux darwin netbsd openbsd solaris package fdlimit @@ -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 + } + // Find out what it landed on + 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 863c58bedfab..c9904cc8c25e 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 From 79c6d99e0e840ccb6c9086db738777cb452b9a65 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?P=C3=A9ter=20Szil=C3=A1gyi?= Date: Tue, 12 Feb 2019 11:48:26 +0200 Subject: [PATCH 6/7] common/fdlimit: make comment a bit more descriptive --- common/fdlimit/fdlimit_unix.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/common/fdlimit/fdlimit_unix.go b/common/fdlimit/fdlimit_unix.go index 09ed31ef4d1a..670112751554 100644 --- a/common/fdlimit/fdlimit_unix.go +++ b/common/fdlimit/fdlimit_unix.go @@ -37,7 +37,7 @@ func Raise(max uint64) (uint64, error) { if err := syscall.Setrlimit(syscall.RLIMIT_NOFILE, &limit); err != nil { return 0, err } - // Find out what it landed on + // 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 } From 5e7f3526eba079b0ebc5d602714ddc907ae0c57e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?P=C3=A9ter=20Szil=C3=A1gyi?= Date: Tue, 12 Feb 2019 11:52:00 +0200 Subject: [PATCH 7/7] cmd/utils: make fdlimit happy path a bit cleaner --- cmd/utils/flags.go | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/cmd/utils/flags.go b/cmd/utils/flags.go index 4abc6e0203c0..339609cf4ede 100644 --- a/cmd/utils/flags.go +++ b/cmd/utils/flags.go @@ -950,12 +950,11 @@ func makeDatabaseHandles() int { if err != nil { Fatalf("Failed to retrieve file descriptor allowance: %v", err) } - if u64limit, err := fdlimit.Raise(uint64(limit)); err != nil { + raised, err := fdlimit.Raise(uint64(limit)) + if err != nil { Fatalf("Failed to raise file descriptor allowance: %v", err) - return 0 // Make the compiler happy - } else { - return int(u64limit / 2) // Leave half for networking and other stuff } + return int(raised / 2) // Leave half for networking and other stuff } // MakeAddress converts an account specified directly as a hex encoded string or