scottk/kubernetes
1
0
Fork 0
mirror of https://github.com/optim-enterprises-bv/kubernetes.git synced 2025-11-03 19:58:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

optimize killPod() and syncPod() functions

Browse Source 
make sure that one of the two arguments must be non-nil: runningPod, status ,just like the function note says
and judge the return value in syncPod() function before setting podKilled
This commit is contained in:
NickrenREN
2017-01-09 20:28:37 +08:00
parent c478d72827
commit b40e575076
2 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
pkg/kubelet/kubelet.go
View File

@@ -1463,9 +1463,10 @@ func (kl *Kubelet) syncPod(o syncPodOptions) error {
// exists or the pod is running for the first time // exists or the pod is running for the first time
podKilled := false podKilled := false
if !pcm.Exists(pod) && !firstSync { if !pcm.Exists(pod) && !firstSync {
kl.killPod(pod, nil, podStatus, nil) if err := kl.killPod(pod, nil, podStatus, nil); err == nil {
podKilled = true podKilled = true
} }
}
// Create and Update pod's Cgroups // Create and Update pod's Cgroups
// Don't create cgroups for run once pod if it was killed above // Don't create cgroups for run once pod if it was killed above
// The current policy is not to restart the run once pods when // The current policy is not to restart the run once pods when

2
pkg/kubelet/kubelet_pods.go
View File

@@ -645,6 +645,8 @@ func (kl *Kubelet) killPod(pod *v1.Pod, runningPod *kubecontainer.Pod, status *k
p = *runningPod p = *runningPod
} else if status != nil { } else if status != nil {
p = kubecontainer.ConvertPodStatusToRunningPod(kl.GetRuntime().Type(), status) p = kubecontainer.ConvertPodStatusToRunningPod(kl.GetRuntime().Type(), status)
} else {
return fmt.Errorf("one of the two arguments must be non-nil: runningPod, status")
} }
// 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