github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-08-03 17:30:00 +00:00
Code Issues Projects Releases Wiki Activity

optimize if-else of setupNode of container_manager_linix

Browse Source
This commit is contained in:
Ke Zhang 2016-08-26 10:30:39 +08:00
parent 1c9332ab51
commit 86163979f4
1 changed files with 1 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkg/kubelet/cm/container_manager_linux.go
View File

@ -308,10 +308,8 @@ func (cm *containerManagerImpl) setupNode() error {
if cm.ContainerRuntime == "docker" { if cm.ContainerRuntime == "docker" {
if cm.RuntimeCgroupsName != "" { if cm.RuntimeCgroupsName != "" {
cont := newSystemCgroups(cm.RuntimeCgroupsName) cont := newSystemCgroups(cm.RuntimeCgroupsName)
info, err := cm.cadvisorInterface.MachineInfo()
var capacity = api.ResourceList{} var capacity = api.ResourceList{}
if err != nil { if info, err := cm.cadvisorInterface.MachineInfo(); err == nil {
} else {
capacity = cadvisor.CapacityFromMachineInfo(info) capacity = cadvisor.CapacityFromMachineInfo(info)
} }
memoryLimit := (int64(capacity.Memory().Value() * DockerMemoryLimitThresholdPercent / 100)) memoryLimit := (int64(capacity.Memory().Value() * DockerMemoryLimitThresholdPercent / 100))