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

Merge pull request #3666 from Shopify/change-legacy-func-name

Browse source 
rename sysctlFSFileMax to rlimitMaxNumFiles to reflect what it actually does
This commit is contained in:
Kubernetes Prow Robot 2019-01-16 02:41:03 -08:00 committed by GitHub
commit d968ee9cfd
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 5 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
internal/ingress/controller/nginx.go
View file

@ -527,7 +527,7 @@ func (n *NGINXController) OnUpdate(ingressCfg ingress.Configuration) error {
if err != nil { if err != nil {
wp = 1 wp = 1
} }
maxOpenFiles := (sysctlFSFileMax() / wp) - 1024 maxOpenFiles := (rlimitMaxNumFiles() / wp) - 1024
klog.V(3).Infof("Maximum number of open file descriptors: %d", maxOpenFiles) klog.V(3).Infof("Maximum number of open file descriptors: %d", maxOpenFiles)
if maxOpenFiles < 1024 { if maxOpenFiles < 1024 {
// this means the value of RLIMIT_NOFILE is too low. // this means the value of RLIMIT_NOFILE is too low.

5
internal/ingress/controller/util.go
View file

@ -64,9 +64,8 @@ func sysctlSomaxconn() int {
return maxConns return maxConns
} }
// sysctlFSFileMax returns the maximum number of open file descriptors (value // rlimitMaxNumFiles returns hard limit for RLIMIT_NOFILE
// of fs.file-max) or 0 in case of error. func rlimitMaxNumFiles() int {
func sysctlFSFileMax() int {
var rLimit syscall.Rlimit var rLimit syscall.Rlimit
err := syscall.Getrlimit(syscall.RLIMIT_NOFILE, &rLimit) err := syscall.Getrlimit(syscall.RLIMIT_NOFILE, &rLimit)
if err != nil { if err != nil {

4
internal/ingress/controller/util_test.go
View file

@ -20,8 +20,8 @@ import (
"testing" "testing"
) )
func TestSysctlFSFileMax(t *testing.T) { func TestRlimitMaxNumFiles(t *testing.T) {
i := sysctlFSFileMax() i := rlimitMaxNumFiles()
if i < 1 { if i < 1 {
t.Errorf("returned %v but expected > 0", i) t.Errorf("returned %v but expected > 0", i)
} }