github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-08-04 01:40:07 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #5157 from yifan-gu/clean_prober

Browse Source 
Adjust prober's logging verbose.
This commit is contained in:
Victor Marmol 2015-03-06 18:04:12 -08:00
commit 1866adddd3
2 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
pkg/kubelet/kubelet.go
View File

@ -1204,7 +1204,6 @@ func (kl *Kubelet) syncPod(pod *api.BoundPod, containersInPod dockertools.Docker
if !containerChanged { if !containerChanged {
result, err := kl.probeContainer(pod, podStatus, container, dockerContainer) result, err := kl.probeContainer(pod, podStatus, container, dockerContainer)
if err != nil { if err != nil {
glog.V(1).Infof("liveness/readiness probe errored: %v", err)
containersInPod.RemoveContainerWithID(containerID) containersInPod.RemoveContainerWithID(containerID)
continue continue
} }

8
pkg/kubelet/probe.go
View File

@ -45,12 +45,12 @@ func (kl *Kubelet) probeContainer(pod *api.BoundPod, status api.PodStatus, conta
// Probe liveness. // Probe liveness.
live, err := kl.probeContainerLiveness(pod, status, container, dockerContainer) live, err := kl.probeContainerLiveness(pod, status, container, dockerContainer)
if err != nil { if err != nil {
glog.V(1).Infof("liveness probe errored: %v", err) glog.V(1).Infof("Liveness probe errored: %v", err)
kl.readiness.set(dockerContainer.ID, false) kl.readiness.set(dockerContainer.ID, false)
return probe.Unknown, err return probe.Unknown, err
} }
if live != probe.Success { if live != probe.Success {
glog.V(1).Infof("liveness probe unsuccessful: %v", live) glog.V(1).Infof("Liveness probe unsuccessful: %v", live)
kl.readiness.set(dockerContainer.ID, false) kl.readiness.set(dockerContainer.ID, false)
return live, nil return live, nil
} }
@ -58,12 +58,12 @@ func (kl *Kubelet) probeContainer(pod *api.BoundPod, status api.PodStatus, conta
// Probe readiness. // Probe readiness.
ready, err := kl.probeContainerReadiness(pod, status, container, dockerContainer) ready, err := kl.probeContainerReadiness(pod, status, container, dockerContainer)
if err == nil && ready == probe.Success { if err == nil && ready == probe.Success {
glog.V(1).Infof("readiness probe successful: %v", ready) glog.V(3).Infof("Readiness probe successful: %v", ready)
kl.readiness.set(dockerContainer.ID, true) kl.readiness.set(dockerContainer.ID, true)
return probe.Success, nil return probe.Success, nil
} }
glog.V(1).Infof("readiness probe failed/errored: %v, %v", ready, err) glog.V(1).Infof("Readiness probe failed/errored: %v, %v", ready, err)
kl.readiness.set(dockerContainer.ID, false) kl.readiness.set(dockerContainer.ID, false)
containerID := dockertools.DockerID(dockerContainer.ID) containerID := dockertools.DockerID(dockerContainer.ID)