From ec67f83305f188dd9753a0d9f731314de973f9ab Mon Sep 17 00:00:00 2001 From: Manuel de Brito Fontes Date: Thu, 26 Jan 2017 00:10:33 -0300 Subject: [PATCH] Refactoring sysctlFSFileMax helper --- controllers/nginx/pkg/cmd/controller/utils.go | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/controllers/nginx/pkg/cmd/controller/utils.go b/controllers/nginx/pkg/cmd/controller/utils.go index c6e1979f94..3a3b048234 100644 --- a/controllers/nginx/pkg/cmd/controller/utils.go +++ b/controllers/nginx/pkg/cmd/controller/utils.go @@ -20,6 +20,7 @@ import ( "io/ioutil" "os" "os/exec" + "syscall" "k8s.io/kubernetes/pkg/util/sysctl" @@ -42,14 +43,14 @@ func sysctlSomaxconn() int { // sysctlFSFileMax returns the value of fs.file-max, i.e. // maximum number of open file descriptors func sysctlFSFileMax() int { - maxConns, 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 } - - return maxConns + return int(rLimit.Max) } func diff(b1, b2 []byte) ([]byte, error) {