From 1c9513e7701581263af1e55482fc04a1157b7fcc Mon Sep 17 00:00:00 2001 From: Jakob Borg Date: Sat, 15 Aug 2015 15:20:58 +0200 Subject: [PATCH] Increase open file (fd) limit if possible This will decrease the risk of running out of file descriptors for the database and other bad things, which could otherwise potentially happen if we're serving lots of requests and scanning in parallel, etc. Windows doesn't have a per process open file limit like Unix so we don't need to worry about it there. --- cmd/syncthing/main.go | 5 ++++ lib/osutil/rlimit_unix.go | 47 ++++++++++++++++++++++++++++++++++++ lib/osutil/rlimit_windows.go | 17 +++++++++++++ 3 files changed, 69 insertions(+) create mode 100644 lib/osutil/rlimit_unix.go create mode 100644 lib/osutil/rlimit_windows.go diff --git a/cmd/syncthing/main.go b/cmd/syncthing/main.go index 26c329273..b5c45794b 100644 --- a/cmd/syncthing/main.go +++ b/cmd/syncthing/main.go @@ -454,6 +454,11 @@ func syncthingMain() { runtime.GOMAXPROCS(runtime.NumCPU()) } + // Attempt to increase the limit on number of open files to the maximum + // allowed, in case we have many peers. We don't really care enough to + // report the error if there is one. + osutil.MaximizeOpenFileLimit() + // Ensure that that we have a certificate and key. cert, err := tls.LoadX509KeyPair(locations[locCertFile], locations[locKeyFile]) if err != nil { diff --git a/lib/osutil/rlimit_unix.go b/lib/osutil/rlimit_unix.go new file mode 100644 index 000000000..85147a8c7 --- /dev/null +++ b/lib/osutil/rlimit_unix.go @@ -0,0 +1,47 @@ +// Copyright (C) 2015 The Syncthing Authors. +// +// This Source Code Form is subject to the terms of the Mozilla Public +// License, v. 2.0. If a copy of the MPL was not distributed with this file, +// You can obtain one at http://mozilla.org/MPL/2.0/. + +// +build !windows + +package osutil + +import "syscall" + +// MaximizeOpenFileLimit tries to set the resoure limit RLIMIT_NOFILE (number +// of open file descriptors) to the max (hard limit), if the current (soft +// limit) is below the max. Returns the new (though possibly unchanged) limit, +// or an error if it was could not be changed. +func MaximizeOpenFileLimit() (int, error) { + // Get the current limit on number of open files. + var lim syscall.Rlimit + if err := syscall.Getrlimit(syscall.RLIMIT_NOFILE, &lim); err != nil { + return 0, err + } + + // If we're already at max, there's no need to try to raise the limit. + if lim.Cur >= lim.Max { + return int(lim.Cur), nil + } + + // Try to increase the limit to the max. + oldLimit := lim.Cur + lim.Cur = lim.Max + if err := syscall.Setrlimit(syscall.RLIMIT_NOFILE, &lim); err != nil { + return int(oldLimit), err + } + + // If the set succeeded, perform a new get to see what happened. We might + // have gotten a value lower than the one in lim.Max, if lim.Max was + // something that indiciated "unlimited" (i.e. intmax). + if err := syscall.Getrlimit(syscall.RLIMIT_NOFILE, &lim); err != nil { + // We don't really know the correct value here since Getrlimit + // mysteriously failed after working once... Shouldn't ever happen, I + // think. + return 0, err + } + + return int(lim.Cur), nil +} diff --git a/lib/osutil/rlimit_windows.go b/lib/osutil/rlimit_windows.go new file mode 100644 index 000000000..df1c78c5d --- /dev/null +++ b/lib/osutil/rlimit_windows.go @@ -0,0 +1,17 @@ +// Copyright (C) 2015 The Syncthing Authors. +// +// This Source Code Form is subject to the terms of the Mozilla Public +// License, v. 2.0. If a copy of the MPL was not distributed with this file, +// You can obtain one at http://mozilla.org/MPL/2.0/. + +// +build windows + +package osutil + +import ( + "errors" +) + +func MaximizeOpenFileLimit() (int, error) { + return 0, errors.New("not relevant on Windows") +}