DevFW-CICD/ingress-nginx-helm
12
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Refactoring sysctlFSFileMax helper

Browse source
This commit is contained in:
Manuel de Brito Fontes 2017-01-26 00:10:33 -03:00
parent 0f7102a356
commit ec67f83305
1 changed files with 5 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
controllers/nginx/pkg/cmd/controller/utils.go
View file

@ -20,6 +20,7 @@ import (
"io/ioutil" "io/ioutil"
"os" "os"
"os/exec" "os/exec"
"syscall"
"k8s.io/kubernetes/pkg/util/sysctl" "k8s.io/kubernetes/pkg/util/sysctl"
@ -42,14 +43,14 @@ func sysctlSomaxconn() int {
// sysctlFSFileMax returns the value of fs.file-max, i.e. // sysctlFSFileMax returns the value of fs.file-max, i.e.
// maximum number of open file descriptors // maximum number of open file descriptors
func sysctlFSFileMax() int { 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 { 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 // returning 0 means don't render the value
return 0 return 0
} }
return int(rLimit.Max)
return maxConns
} }
func diff(b1, b2 []byte) ([]byte, error) { func diff(b1, b2 []byte) ([]byte, error) {