Merge pull request #7035 from smarterclayton/turn_down_kubelet_for_what

Tone down kubelet logs for already run containers
This commit is contained in:
Victor Marmol 2015-04-20 08:05:25 -07:00
commit cf27de61c6

View File

@ -1002,14 +1002,14 @@ func shouldContainerBeRestarted(container *api.Container, pod *api.Pod, podStatu
// Check RestartPolicy for dead container. // Check RestartPolicy for dead container.
if len(resultStatus) > 0 { if len(resultStatus) > 0 {
if pod.Spec.RestartPolicy == api.RestartPolicyNever { if pod.Spec.RestartPolicy == api.RestartPolicyNever {
glog.Infof("Already ran container %q of pod %q, do nothing", container.Name, podFullName) glog.V(4).Infof("Already ran container %q of pod %q, do nothing", container.Name, podFullName)
return false return false
} }
if pod.Spec.RestartPolicy == api.RestartPolicyOnFailure { if pod.Spec.RestartPolicy == api.RestartPolicyOnFailure {
// Check the exit code of last run. Note: This assumes the result is sorted // Check the exit code of last run. Note: This assumes the result is sorted
// by the created time in reverse order. // by the created time in reverse order.
if resultStatus[0].State.Termination.ExitCode == 0 { if resultStatus[0].State.Termination.ExitCode == 0 {
glog.Infof("Already successfully ran container %q of pod %q, do nothing", container.Name, podFullName) glog.V(4).Infof("Already successfully ran container %q of pod %q, do nothing", container.Name, podFullName)
return false return false
} }
} }
@ -1264,7 +1264,7 @@ func (kl *Kubelet) syncPod(pod *api.Pod, mirrorPod *api.Pod, runningPod kubecont
if err != nil { if err != nil {
glog.Errorf("Couldn't make a ref to pod %q: '%v'", podFullName, err) glog.Errorf("Couldn't make a ref to pod %q: '%v'", podFullName, err)
} }
glog.Infof("Creating pod infra container for %q", podFullName) glog.V(4).Infof("Creating pod infra container for %q", podFullName)
podInfraContainerID, err = kl.createPodInfraContainer(pod) podInfraContainerID, err = kl.createPodInfraContainer(pod)
// Call the networking plugin // Call the networking plugin