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

test: Bump timeout for runPausePod

Browse Source 
The `runPausePod` timeout was 1 minute previously which appears to be
too short and timing out in some tests.

Switch to `f.Timeouts.PodStartShort` which is the common timeout used to wait
for pods to start which defaults to 5min.

Also refactor to remove `runPausePodWithoutTimeout` and instead rely on
`runPausePod` since we do not make the timeout customizable directly
(it can be changed via the test framework if desired).

Signed-off-by: David Porter <david@porter.me>
This commit is contained in:
David Porter 2023-01-30 14:08:42 -08:00
parent 0cb1eabbf0
commit 71719a6036
2 changed files with 5 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
test/e2e/scheduling/predicates.go
View File

@ -952,12 +952,8 @@ func createPausePod(ctx context.Context, f *framework.Framework, conf pausePodCo
} }
func runPausePod(ctx context.Context, f *framework.Framework, conf pausePodConfig) *v1.Pod { func runPausePod(ctx context.Context, f *framework.Framework, conf pausePodConfig) *v1.Pod {
return runPausePodWithTimeout(ctx, f, conf, framework.PollShortTimeout)
}
func runPausePodWithTimeout(ctx context.Context, f *framework.Framework, conf pausePodConfig, timeout time.Duration) *v1.Pod {
pod := createPausePod(ctx, f, conf) pod := createPausePod(ctx, f, conf)
framework.ExpectNoError(e2epod.WaitTimeoutForPodRunningInNamespace(ctx, f.ClientSet, pod.Name, pod.Namespace, timeout)) framework.ExpectNoError(e2epod.WaitTimeoutForPodRunningInNamespace(ctx, f.ClientSet, pod.Name, pod.Namespace, f.Timeouts.PodStartShort))
pod, err := f.ClientSet.CoreV1().Pods(pod.Namespace).Get(ctx, conf.Name, metav1.GetOptions{}) pod, err := f.ClientSet.CoreV1().Pods(pod.Namespace).Get(ctx, conf.Name, metav1.GetOptions{})
framework.ExpectNoError(err) framework.ExpectNoError(err)
return pod return pod

8
test/e2e/scheduling/preemption.go
View File

@ -192,14 +192,14 @@ var _ = SIGDescribe("SchedulerPreemption [Serial]", func() {
ginkgo.By("Run a high priority pod that has same requirements as that of lower priority pod") ginkgo.By("Run a high priority pod that has same requirements as that of lower priority pod")
// Create a high priority pod and make sure it is scheduled on the same node as the low priority pod. // Create a high priority pod and make sure it is scheduled on the same node as the low priority pod.
runPausePodWithTimeout(ctx, f, pausePodConfig{ runPausePod(ctx, f, pausePodConfig{
Name: "preemptor-pod", Name: "preemptor-pod",
PriorityClassName: highPriorityClassName, PriorityClassName: highPriorityClassName,
Resources: &v1.ResourceRequirements{ Resources: &v1.ResourceRequirements{
Requests: podRes, Requests: podRes,
Limits: podRes, Limits: podRes,
}, },
}, framework.PodStartShortTimeout) })
preemptedPod, err := cs.CoreV1().Pods(pods[0].Namespace).Get(ctx, pods[0].Name, metav1.GetOptions{}) preemptedPod, err := cs.CoreV1().Pods(pods[0].Namespace).Get(ctx, pods[0].Name, metav1.GetOptions{})
podPreempted := (err != nil && apierrors.IsNotFound(err)) || podPreempted := (err != nil && apierrors.IsNotFound(err)) ||
@ -290,7 +290,7 @@ var _ = SIGDescribe("SchedulerPreemption [Serial]", func() {
framework.Failf("Error cleanup pod `%s/%s`: %v", metav1.NamespaceSystem, "critical-pod", err) framework.Failf("Error cleanup pod `%s/%s`: %v", metav1.NamespaceSystem, "critical-pod", err)
} }
}() }()
runPausePodWithTimeout(ctx, f, pausePodConfig{ runPausePod(ctx, f, pausePodConfig{
Name: "critical-pod", Name: "critical-pod",
Namespace: metav1.NamespaceSystem, Namespace: metav1.NamespaceSystem,
PriorityClassName: scheduling.SystemClusterCritical, PriorityClassName: scheduling.SystemClusterCritical,
@ -298,7 +298,7 @@ var _ = SIGDescribe("SchedulerPreemption [Serial]", func() {
Requests: podRes, Requests: podRes,
Limits: podRes, Limits: podRes,
}, },
}, framework.PodStartShortTimeout) })
defer func() { defer func() {
// Clean-up the critical pod // Clean-up the critical pod