提交 8ec38611 作者: Steven Allen

raise default fd limit to 8192

fixes #6247

Really, we need a global _resource_ manager service that can sum requests from
the datastore, libp2p, etc. for more file descriptors. However, we don't have
that.

License: MIT
Signed-off-by: 's avatarSteven Allen <steven@stebalien.com>
上级 2385cccb
package util package util
import ( import (
"errors"
"fmt" "fmt"
"os" "os"
"strconv" "strconv"
...@@ -21,26 +20,25 @@ var ( ...@@ -21,26 +20,25 @@ var (
setLimit func(uint64, uint64) error setLimit func(uint64, uint64) error
) )
// maxFds is the maximum number of file descriptors that go-ipfs // minimum file descriptor limit before we complain
// can use. The default value is 2048. This can be overwritten by the const minFds = 2048
// IPFS_FD_MAX env variable
var maxFds = uint64(2048)
// setMaxFds sets the maxFds value from IPFS_FD_MAX // default max file descriptor limit.
// env variable if it's present on the system const maxFds = 8192
func setMaxFds() {
// userMaxFDs returns the value of IPFS_FD_MAX
func userMaxFDs() uint64 {
// check if the IPFS_FD_MAX is set up and if it does // check if the IPFS_FD_MAX is set up and if it does
// not have a valid fds number notify the user // not have a valid fds number notify the user
if val := os.Getenv("IPFS_FD_MAX"); val != "" { if val := os.Getenv("IPFS_FD_MAX"); val != "" {
fds, err := strconv.ParseUint(val, 10, 64) fds, err := strconv.ParseUint(val, 10, 64)
if err != nil { if err != nil {
log.Errorf("bad value for IPFS_FD_MAX: %s", err) log.Errorf("bad value for IPFS_FD_MAX: %s", err)
return return 0
} }
return fds
maxFds = fds
} }
return 0
} }
// ManageFdLimit raise the current max file descriptor count // ManageFdLimit raise the current max file descriptor count
...@@ -50,7 +48,12 @@ func ManageFdLimit() (changed bool, newLimit uint64, err error) { ...@@ -50,7 +48,12 @@ func ManageFdLimit() (changed bool, newLimit uint64, err error) {
return false, 0, nil return false, 0, nil
} }
setMaxFds() targetLimit := uint64(maxFds)
userLimit := userMaxFDs()
if userLimit > 0 {
targetLimit = userLimit
}
soft, hard, err := getLimit() soft, hard, err := getLimit()
if err != nil { if err != nil {
return false, 0, err return false, 0, err
...@@ -65,23 +68,47 @@ func ManageFdLimit() (changed bool, newLimit uint64, err error) { ...@@ -65,23 +68,47 @@ func ManageFdLimit() (changed bool, newLimit uint64, err error) {
// the hard limit acts as a ceiling for the soft limit // the hard limit acts as a ceiling for the soft limit
// an unprivileged process may only set it's soft limit to a // an unprivileged process may only set it's soft limit to a
// alue in the range from 0 up to the hard limit // alue in the range from 0 up to the hard limit
if err = setLimit(maxFds, maxFds); err != nil { err = setLimit(targetLimit, targetLimit)
if err != syscall.EPERM { switch err {
return false, 0, fmt.Errorf("error setting: ulimit: %s", err) case nil:
newLimit = targetLimit
case syscall.EPERM:
// lower limit if necessary.
if targetLimit > hard {
targetLimit = hard
} }
// the process does not have permission so we should only // the process does not have permission so we should only
// set the soft value // set the soft value
if maxFds > hard { err = setLimit(targetLimit, hard)
return false, 0, errors.New( if err != nil {
"cannot set rlimit, IPFS_FD_MAX is larger than the hard limit", err = fmt.Errorf("error setting ulimit wihout hard limit: %s", err)
break
}
newLimit = targetLimit
// Warn on lowered limit.
if newLimit < userLimit {
err = fmt.Errorf(
"failed to raise ulimit to IPFS_FD_MAX (%d): set to %d",
userLimit,
newLimit,
) )
break
} }
if err = setLimit(maxFds, hard); err != nil { if userLimit == 0 && newLimit < minFds {
return false, 0, fmt.Errorf("error setting ulimit wihout hard limit: %s", err) err = fmt.Errorf(
"failed to raise ulimit to minimum %d: set to %d",
minFds,
newLimit,
)
break
} }
default:
err = fmt.Errorf("error setting: ulimit: %s", err)
} }
return true, maxFds, nil return newLimit > 0, newLimit, err
} }
Markdown 格式
0%
您添加了 0 到此讨论。请谨慎行事。
请先完成此评论的编辑!
注册 或者 后发表评论