github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-28 05:57:25 +00:00
Code Issues Projects Releases Wiki Activity

reset resultRun to 0 on pod restart

Browse Source
This commit is contained in:
Tony Han 2018-04-19 21:46:47 +08:00
parent b1357da473
commit b49e07846f
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pkg/kubelet/prober/worker.go
View File

@ -240,7 +240,7 @@ func (w *worker) doProbe() (keepGoing bool) {
// chance of hitting #21751, where running `docker exec` when a // chance of hitting #21751, where running `docker exec` when a
// container is being stopped may lead to corrupted container state. // container is being stopped may lead to corrupted container state.
w.onHold = true w.onHold = true
w.resultRun = 1 w.resultRun = 0
} }
return true return true

10
pkg/kubelet/prober/worker_test.go
View File

@ -352,7 +352,7 @@ func TestResultRunOnLivenessCheckFailure(t *testing.T) {
expectContinue(t, w, w.doProbe(), msg) expectContinue(t, w, w.doProbe(), msg)
expectResult(t, w, results.Success, msg) expectResult(t, w, results.Success, msg)
if w.resultRun != 1 { if w.resultRun != 1 {
t.Errorf("Prober resultRun should 1") t.Errorf("Prober resultRun should be 1")
} }
m.prober.exec = fakeExecProber{probe.Failure, nil} m.prober.exec = fakeExecProber{probe.Failure, nil}
@ -360,7 +360,7 @@ func TestResultRunOnLivenessCheckFailure(t *testing.T) {
expectContinue(t, w, w.doProbe(), msg) expectContinue(t, w, w.doProbe(), msg)
expectResult(t, w, results.Success, msg) expectResult(t, w, results.Success, msg)
if w.resultRun != 1 { if w.resultRun != 1 {
t.Errorf("Prober resultRun should 1") t.Errorf("Prober resultRun should be 1")
} }
m.prober.exec = fakeExecProber{probe.Failure, nil} m.prober.exec = fakeExecProber{probe.Failure, nil}
@ -372,13 +372,13 @@ func TestResultRunOnLivenessCheckFailure(t *testing.T) {
} }
// Exceeding FailureThreshold should cause resultRun to // Exceeding FailureThreshold should cause resultRun to
// reset to 1 so that the probe on the restarted pod // reset to 0 so that the probe on the restarted pod
// also gets FailureThreshold attempts to succeed. // also gets FailureThreshold attempts to succeed.
m.prober.exec = fakeExecProber{probe.Failure, nil} m.prober.exec = fakeExecProber{probe.Failure, nil}
msg = "3rd probe failure, result failure" msg = "3rd probe failure, result failure"
expectContinue(t, w, w.doProbe(), msg) expectContinue(t, w, w.doProbe(), msg)
expectResult(t, w, results.Failure, msg) expectResult(t, w, results.Failure, msg)
if w.resultRun != 1 { if w.resultRun != 0 {
t.Errorf("Prober resultRun should be reset to 1") t.Errorf("Prober resultRun should be reset to 0")
} }
} }