From 33623834b89108591a9c75b7b6f1cec613dac46c Mon Sep 17 00:00:00 2001 From: maxlaverse Date: Thu, 22 Mar 2018 17:03:04 +0100 Subject: [PATCH] Revert "Get file max from fs/file-max. (#2050)" (#2241) This reverts commit a240a231299c2f9872d506cf7cf9114b837ccbe2. --- internal/ingress/controller/util.go | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/internal/ingress/controller/util.go b/internal/ingress/controller/util.go index 56f25a308..195842679 100644 --- a/internal/ingress/controller/util.go +++ b/internal/ingress/controller/util.go @@ -17,6 +17,8 @@ limitations under the License. package controller import ( + "syscall" + "github.com/golang/glog" api "k8s.io/api/core/v1" @@ -55,12 +57,13 @@ func sysctlSomaxconn() int { // sysctlFSFileMax returns the value of fs.file-max, i.e. // maximum number of open file descriptors func sysctlFSFileMax() int { - fileMax, err := sysctl.New().GetSysctl("fs/file-max") + var rLimit syscall.Rlimit + err := syscall.Getrlimit(syscall.RLIMIT_NOFILE, &rLimit) if err != nil { - glog.Errorf("unexpected error reading system maximum number of open file descriptors (fs.file-max): %v", err) + glog.Errorf("unexpected error reading system maximum number of open file descriptors (RLIMIT_NOFILE): %v", err) // returning 0 means don't render the value return 0 } - glog.V(2).Infof("system fs.file-max=%v", fileMax) - return fileMax + glog.V(2).Infof("rlimit.max=%v", rLimit.Max) + return int(rLimit.Max) }