Merge pull request #45625 from Random-Liu/fix-log-line

Automatic merge from submit-queue (batch tested with PRs 45860, 45119, 44525, 45625, 44403) Make a log line more clear in kuberuntime_manager.go. Make a log in `podSandboxChanged` more clear. @yujuhong @feiskyer

Merge pull request #45625 from Random-Liu/fix-log-line
b10fd192 · Kubernetes Submit Queue · GitHub · 31cb269d · 613c42b8 · b10fd192
Commit b10fd192 authored May 16, 2017 by Kubernetes Submit Queue Committed by GitHub May 16, 2017
Hide whitespace changes
Inline Side-by-side

Showing with 5 additions and 1 deletion

kuberuntime_manager.go pkg/kubelet/kuberuntime/kuberuntime_manager.go +5 -1

No files found.
--- a/pkg/kubelet/kuberuntime/kuberuntime_manager.go
+++ b/pkg/kubelet/kuberuntime/kuberuntime_manager.go
@@ -375,7 +375,11 @@ func (m *kubeGenericRuntimeManager) podSandboxChanged(pod *v1.Pod, podStatus *ku
 	// Needs to create a new sandbox when readySandboxCount > 1 or the ready sandbox is not the latest one.
 	sandboxStatus := podStatus.SandboxStatuses[0]
-	if readySandboxCount > 1 || sandboxStatus.State != runtimeapi.PodSandboxState_SANDBOX_READY {
+	if readySandboxCount > 1 {
+		glog.V(2).Infof("More than 1 sandboxes for pod %q are ready. Need to reconcile them", format.Pod(pod))
+		return true, sandboxStatus.Metadata.Attempt + 1, sandboxStatus.Id
+	}
+	if sandboxStatus.State != runtimeapi.PodSandboxState_SANDBOX_READY {
 		glog.V(2).Infof("No ready sandbox for pod %q can be found. Need to start a new one", format.Pod(pod))
 		return true, sandboxStatus.Metadata.Attempt + 1, sandboxStatus.Id
 	}