github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-24 20:24:09 +00:00
Code Issues Projects Releases Wiki Activity

Modify waitForPodsInactive to return meaningful error message.

Browse Source
This commit is contained in:
Maciej Borsz 2018-11-06 09:48:14 +01:00
parent c0d248ad3a
commit 760f7dd24a
1 changed files with 16 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
test/e2e/framework/util.go
View File

@ -3173,15 +3173,29 @@ func DeleteResourceAndWaitForGC(c clientset.Interface, kind schema.GroupKind, ns
// and DeleteRCAndWaitForGC, because the RC controller decreases status.replicas // and DeleteRCAndWaitForGC, because the RC controller decreases status.replicas
// when the pod is inactvie. // when the pod is inactvie.
func waitForPodsInactive(ps *testutils.PodStore, interval, timeout time.Duration) error { func waitForPodsInactive(ps *testutils.PodStore, interval, timeout time.Duration) error {
return wait.PollImmediate(interval, timeout, func() (bool, error) { var activePods []*v1.Pod
err := wait.PollImmediate(interval, timeout, func() (bool, error) {
pods := ps.List() pods := ps.List()
activePods = nil
for _, pod := range pods { for _, pod := range pods {
if controller.IsPodActive(pod) { if controller.IsPodActive(pod) {
return false, nil activePods = append(activePods, pod)
} }
} }
if len(activePods) != 0 {
return false, nil
}
return true, nil return true, nil
}) })
if err == wait.ErrWaitTimeout {
for _, pod := range activePods {
Logf("Pod %q running on %q is still active", pod.ObjectMeta.Name, pod.Spec.NodeName)
}
return fmt.Errorf("there are %d active pods. E.g. %q on node %q", len(activePods), activePods[0].ObjectMeta.Name, activePods[0].Spec.NodeName)
}
return err
} }
// waitForPodsGone waits until there are no pods left in the PodStore. // waitForPodsGone waits until there are no pods left in the PodStore.