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

record ReduceCPULimits result err info if possible

Browse Source 
record ReduceCPULimits result err info if possible
This commit is contained in:
NickrenREN 2016-12-23 09:51:44 +08:00
parent 8ffada6699
commit a62da3e22b
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
pkg/kubelet/kubelet_pods.go
View File

@ -649,13 +649,13 @@ func (kl *Kubelet) killPod(pod *v1.Pod, runningPod *kubecontainer.Pod, status *k
// cache the pod cgroup Name for reducing the cpu resource limits of the pod cgroup once the pod is killed // cache the pod cgroup Name for reducing the cpu resource limits of the pod cgroup once the pod is killed
pcm := kl.containerManager.NewPodContainerManager() pcm := kl.containerManager.NewPodContainerManager()
var podCgroup cm.CgroupName var podCgroup cm.CgroupName
reduceCpuLimts := true reduceCpuLimits := true
if pod != nil { if pod != nil {
podCgroup, _ = pcm.GetPodContainerName(pod) podCgroup, _ = pcm.GetPodContainerName(pod)
} else { } else {
// If the pod is nil then cgroup limit must have already // If the pod is nil then cgroup limit must have already
// been decreased earlier // been decreased earlier
reduceCpuLimts = false reduceCpuLimits = false
} }
// Call the container runtime KillPod method which stops all running containers of the pod // Call the container runtime KillPod method which stops all running containers of the pod
@ -670,8 +670,10 @@ func (kl *Kubelet) killPod(pod *v1.Pod, runningPod *kubecontainer.Pod, status *k
// Hence we only reduce the cpu resource limits of the pod's cgroup // Hence we only reduce the cpu resource limits of the pod's cgroup
// and defer the responsibilty of destroying the pod's cgroup to the // and defer the responsibilty of destroying the pod's cgroup to the
// cleanup method and the housekeeping loop. // cleanup method and the housekeeping loop.
if reduceCpuLimts { if reduceCpuLimits {
pcm.ReduceCPULimits(podCgroup) if err := pcm.ReduceCPULimits(podCgroup); err != nil {
glog.Warningf("Failed to reduce the CPU values to the minimum amount of shares: %v", err)
}
} }
return nil return nil
} }