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

Merge pull request #37203 from Random-Liu/fix-restart-test

Browse Source 
Automatic merge from submit-queue

Filter out non-RestartAlways mirror pod in restart test.

Fixes #37202.

> A quick fix is to filter out non-RestartAlways pods. Because either RestartNever and RestartOnFailure pods could succeed, and we can not deal with terminated mirror pods very well now.

@yujuhong @gmarek 
/cc @kubernetes/sig-node
This commit is contained in:
Kubernetes Submit Queue 2016-11-21 10:58:02 -08:00 committed by GitHub
commit ab20072189
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
test/e2e/restart.go
View File

@ -32,17 +32,17 @@ import (
. "github.com/onsi/gomega" . "github.com/onsi/gomega"
) )
func isRestartNeverMirrorPod(p *api.Pod) bool { func isNotRestartAlwaysMirrorPod(p *api.Pod) bool {
if !kubepod.IsMirrorPod(p) { if !kubepod.IsMirrorPod(p) {
return false return false
} }
return p.Spec.RestartPolicy == api.RestartPolicyNever return p.Spec.RestartPolicy != api.RestartPolicyAlways
} }
func filterIrrelevantPods(pods []*api.Pod) []*api.Pod { func filterIrrelevantPods(pods []*api.Pod) []*api.Pod {
var results []*api.Pod var results []*api.Pod
for _, p := range pods { for _, p := range pods {
if isRestartNeverMirrorPod(p) { if isNotRestartAlwaysMirrorPod(p) {
// Mirror pods with restart policy == Never will not get // Mirror pods with restart policy == Never will not get
// recreated if they are deleted after the pods have // recreated if they are deleted after the pods have
// terminated. For now, we discount such pods. // terminated. For now, we discount such pods.