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

fix readiness probe

Browse Source
This commit is contained in:
Mike Danese 2015-04-01 16:40:31 -07:00
parent 412a836bf7
commit 32c7de290c
2 changed files with 28 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
pkg/kubelet/probe.go
View File

@ -66,10 +66,14 @@ func (kl *Kubelet) probeContainer(pod *api.Pod, status api.PodStatus, container
ref, ok := kl.containerRefManager.GetRef(containerID) ref, ok := kl.containerRefManager.GetRef(containerID)
if !ok { if !ok {
glog.Warningf("No ref for pod '%v' - '%v'", containerID, container.Name) glog.Warningf("No ref for pod '%v' - '%v'", containerID, container.Name)
} else { return probe.Success, err
kl.recorder.Eventf(ref, "unhealthy", "Liveness Probe Failed %v - %v", containerID, container.Name)
} }
return ready, err
if ready != probe.Success {
kl.recorder.Eventf(ref, "unhealthy", "Readiness Probe Failed %v - %v", containerID, container.Name)
}
return probe.Success, nil
} }
// probeContainerLiveness probes the liveness of a container. // probeContainerLiveness probes the liveness of a container.

42
pkg/kubelet/probe_test.go
View File

@ -256,26 +256,14 @@ func TestProbeContainer(t *testing.T) {
testContainer: api.Container{ testContainer: api.Container{
ReadinessProbe: &api.Probe{InitialDelaySeconds: 100}, ReadinessProbe: &api.Probe{InitialDelaySeconds: 100},
}, },
expectedResult: probe.Failure, expectedResult: probe.Success,
expectedReadiness: false, expectedReadiness: false,
}, },
{ {
testContainer: api.Container{ testContainer: api.Container{
ReadinessProbe: &api.Probe{InitialDelaySeconds: -100}, ReadinessProbe: &api.Probe{InitialDelaySeconds: -100},
}, },
expectedResult: probe.Unknown, expectedResult: probe.Success,
expectedReadiness: false,
},
{
testContainer: api.Container{
ReadinessProbe: &api.Probe{
InitialDelaySeconds: -100,
Handler: api.Handler{
Exec: &api.ExecAction{},
},
},
},
expectedResult: probe.Failure,
expectedReadiness: false, expectedReadiness: false,
}, },
{ {
@ -299,8 +287,8 @@ func TestProbeContainer(t *testing.T) {
}, },
}, },
}, },
expectedResult: probe.Unknown, expectedResult: probe.Success,
expectedReadiness: false, expectedReadiness: true,
}, },
{ {
testContainer: api.Container{ testContainer: api.Container{
@ -311,9 +299,21 @@ func TestProbeContainer(t *testing.T) {
}, },
}, },
}, },
expectError: true, expectedResult: probe.Success,
expectedResult: probe.Unknown, expectedReadiness: true,
expectedReadiness: false, },
{
testContainer: api.Container{
ReadinessProbe: &api.Probe{
InitialDelaySeconds: -100,
Handler: api.Handler{
Exec: &api.ExecAction{},
},
},
},
expectError: false,
expectedResult: probe.Success,
expectedReadiness: true,
}, },
// Both LivenessProbe and ReadinessProbe. // Both LivenessProbe and ReadinessProbe.
{ {
@ -321,7 +321,7 @@ func TestProbeContainer(t *testing.T) {
LivenessProbe: &api.Probe{InitialDelaySeconds: 100}, LivenessProbe: &api.Probe{InitialDelaySeconds: 100},
ReadinessProbe: &api.Probe{InitialDelaySeconds: 100}, ReadinessProbe: &api.Probe{InitialDelaySeconds: 100},
}, },
expectedResult: probe.Failure, expectedResult: probe.Success,
expectedReadiness: false, expectedReadiness: false,
}, },
{ {
@ -329,7 +329,7 @@ func TestProbeContainer(t *testing.T) {
LivenessProbe: &api.Probe{InitialDelaySeconds: 100}, LivenessProbe: &api.Probe{InitialDelaySeconds: 100},
ReadinessProbe: &api.Probe{InitialDelaySeconds: -100}, ReadinessProbe: &api.Probe{InitialDelaySeconds: -100},
}, },
expectedResult: probe.Unknown, expectedResult: probe.Success,
expectedReadiness: false, expectedReadiness: false,
}, },
{ {