Merge pull request #86752 from SataQiu/fix-kubelet-20191231

Add error handler for rlimit.RlimitNumFiles
This commit is contained in:
Kubernetes Prow Robot 2020-04-01 22:14:38 -07:00 committed by GitHub
commit ad4bd386eb
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 5 additions and 3 deletions

View File

@ -1112,7 +1112,9 @@ func RunKubelet(kubeServer *options.KubeletServer, kubeDeps *kubelet.Dependencie
} }
podCfg := kubeDeps.PodConfig podCfg := kubeDeps.PodConfig
rlimit.RlimitNumFiles(uint64(kubeServer.MaxOpenFiles)) if err := rlimit.RlimitNumFiles(uint64(kubeServer.MaxOpenFiles)); err != nil {
klog.Errorf("Failed to set rlimit on max file handles: %v", err)
}
// process pods and exit. // process pods and exit.
if runOnce { if runOnce {

View File

@ -22,6 +22,6 @@ import (
"golang.org/x/sys/unix" "golang.org/x/sys/unix"
) )
func RlimitNumFiles(maxOpenFiles uint64) { func RlimitNumFiles(maxOpenFiles uint64) error {
unix.Setrlimit(unix.RLIMIT_NOFILE, &unix.Rlimit{Max: maxOpenFiles, Cur: maxOpenFiles}) return unix.Setrlimit(unix.RLIMIT_NOFILE, &unix.Rlimit{Max: maxOpenFiles, Cur: maxOpenFiles})
} }