Merge pull request #33467 from ZTE-PaaS/zhangke-patch-053

Automatic merge from submit-queue Variables should be initialized near where it would be used As inner the for-loop, it would continue before hash-value being used, so i thinks the hash value calculation should be moved below

Merge pull request #33467 from ZTE-PaaS/zhangke-patch-053
08dd5694 · Kubernetes Submit Queue · GitHub · 4d958134 · d03a73f3 · 08dd5694
Commit 08dd5694 authored Sep 27, 2016 by Kubernetes Submit Queue Committed by GitHub Sep 27, 2016
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 2 deletions

docker_manager.go pkg/kubelet/dockertools/docker_manager.go +2 -2

No files found.
--- a/pkg/kubelet/dockertools/docker_manager.go
+++ b/pkg/kubelet/dockertools/docker_manager.go
@@ -1935,7 +1935,6 @@ func (dm *DockerManager) computePodContainerChanges(pod *api.Pod, podStatus *kub

 	// check the status of the containers
 	for index, container := range pod.Spec.Containers {
-		expectedHash := kubecontainer.HashContainer(&container)

 		containerStatus := podStatus.FindContainerStatusByName(container.Name)
 		if containerStatus == nil || containerStatus.State != kubecontainer.ContainerStateRunning {
@@ -1951,7 +1950,6 @@ func (dm *DockerManager) computePodContainerChanges(pod *api.Pod, podStatus *kub
 		}

 		containerID := kubecontainer.DockerID(containerStatus.ID.ID)
-		hash := containerStatus.Hash
 		glog.V(3).Infof("pod %q container %q exists as %v", format.Pod(pod), container.Name, containerID)

 		if createPodInfraContainer {
@@ -1982,6 +1980,8 @@ func (dm *DockerManager) computePodContainerChanges(pod *api.Pod, podStatus *kub

 		// At this point, the container is running and pod infra container is good.
 		// We will look for changes and check healthiness for the container.
+		expectedHash := kubecontainer.HashContainer(&container)
+		hash := containerStatus.Hash
 		containerChanged := hash != 0 && hash != expectedHash
 		if containerChanged {
 			message := fmt.Sprintf("pod %q container %q hash changed (%d vs %d), it will be killed and re-created.", format.Pod(pod), container.Name, hash, expectedHash)