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

e2e_node: eviction: Include names of pending-eviction pods in error

Browse Source
This commit is contained in:
Danielle Lancashire 2021-08-12 17:44:57 +02:00
parent b5c2d3b389
commit 7b91337068
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
test/e2e_node/eviction_test.go
View File

@ -658,6 +658,7 @@ func verifyEvictionOrdering(f *framework.Framework, testSpecs []podEvictSpec) er
ginkgo.By("checking eviction ordering and ensuring important pods don't fail") ginkgo.By("checking eviction ordering and ensuring important pods don't fail")
done := true done := true
pendingPods := []string{}
for _, priorityPodSpec := range testSpecs { for _, priorityPodSpec := range testSpecs {
var priorityPod v1.Pod var priorityPod v1.Pod
for _, p := range updatedPods { for _, p := range updatedPods {
@ -700,13 +701,14 @@ func verifyEvictionOrdering(f *framework.Framework, testSpecs []podEvictSpec) er
// If a pod that is not evictionPriority 0 has not been evicted, we are not done // If a pod that is not evictionPriority 0 has not been evicted, we are not done
if priorityPodSpec.evictionPriority != 0 && priorityPod.Status.Phase != v1.PodFailed { if priorityPodSpec.evictionPriority != 0 && priorityPod.Status.Phase != v1.PodFailed {
pendingPods = append(pendingPods, priorityPod.ObjectMeta.Name)
done = false done = false
} }
} }
if done { if done {
return nil return nil
} }
return fmt.Errorf("pods that should be evicted are still running") return fmt.Errorf("pods that should be evicted are still running: %#v", pendingPods)
} }
func verifyEvictionEvents(f *framework.Framework, testSpecs []podEvictSpec, expectedStarvedResource v1.ResourceName) { func verifyEvictionEvents(f *framework.Framework, testSpecs []podEvictSpec, expectedStarvedResource v1.ResourceName) {