github/kubernetes
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Move rlimit to it's own pkg

Browse Source
This commit is contained in:
Harry Zhang
2016-07-03 07:18:03 -04:00
parent b7a387c8f5
commit 94c6994ab3
5 changed files with 56 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
cmd/kubelet/app/server.go
View File

@@ -71,6 +71,7 @@ import (
nodeutil "k8s.io/kubernetes/pkg/util/node"
"k8s.io/kubernetes/pkg/util/oom"
"k8s.io/kubernetes/pkg/util/resourcecontainer"
"k8s.io/kubernetes/pkg/util/rlimit"
"k8s.io/kubernetes/pkg/util/runtime"
"k8s.io/kubernetes/pkg/util/wait"
"k8s.io/kubernetes/pkg/version"
@@ -688,7 +689,7 @@ func RunKubelet(kcfg *KubeletConfig) error {
return fmt.Errorf("failed to create kubelet: %v", err)
}
resourcecontainer.ApplyRLimitForSelf(kcfg.MaxOpenFiles)
rlimit.RlimitNumFiles(kcfg.MaxOpenFiles)
// TODO(dawnchen): remove this once we deprecated old debian containervm images.
// This is a workaround for issue: https://github.com/opencontainers/runc/issues/726

4
pkg/util/resourcecontainer/resource_container_linux.go
View File

@@ -43,7 +43,3 @@ func RunInResourceContainer(containerName string) error {
return manager.Apply(os.Getpid())
}
func ApplyRLimitForSelf(maxOpenFiles uint64) {
syscall.Setrlimit(syscall.RLIMIT_NOFILE, &syscall.Rlimit{Max: maxOpenFiles, Cur: maxOpenFiles})
}

4
pkg/util/resourcecontainer/resource_container_unsupported.go
View File

@@ -25,7 +25,3 @@ import (
func RunInResourceContainer(containerName string) error {
return errors.New("resource-only containers unsupported in this platform")
}
func ApplyRLimitForSelf(maxOpenFiles uint64) error {
return errors.New("SetRLimit unsupported in this platform")
}

27
pkg/util/rlimit/rlimit_linux.go Normal file
View File

@@ -0,0 +1,27 @@
// +build linux
/*
Copyright 2016 The Kubernetes Authors All rights reserved.
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
You may obtain a copy of the License at
http://www.apache.org/licenses/LICENSE-2.0
Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
*/
package rlimit
import (
"syscall"
)
func RlimitNumFiles(maxOpenFiles uint64) {
syscall.Setrlimit(syscall.RLIMIT_NOFILE, &syscall.Rlimit{Max: maxOpenFiles, Cur: maxOpenFiles})
}

27
pkg/util/rlimit/rlimit_unsupported.go Normal file
View File

@@ -0,0 +1,27 @@
// +build !linux
/*
Copyright 2016 The Kubernetes Authors All rights reserved.
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
You may obtain a copy of the License at
http://www.apache.org/licenses/LICENSE-2.0
Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
*/
package rlimit
import (
"errors"
)
func RlimitNumFiles(maxOpenFiles uint64) error {
return errors.New("SetRLimit unsupported in this platform")
}