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

Fix flaky HPA e2e tests by not failing on context cancelled (#117669)

Browse Source 
* Fix flaky HPA e2e tests by not failing on context cancelled

Consume requests are sent during test execution in a loop in a separate goroutine. Once the test completes, it is expected that a consumption request may be pending. Cancelling the request during cleanup should not cause test failures.

Tests started being flaky since #112923 introduced passing test context that gets cancelled during cleanup.

* Use PollUntilContextTimeout and restructure error ignoring logic
This commit is contained in:
Piotr Betkier 2023-05-02 14:42:12 +02:00 committed by GitHub
parent f51dad586d
commit d952437921
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 22 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
test/e2e/framework/autoscaling/autoscaling_utils.go
View File

@ -354,10 +354,7 @@ func (rc *ResourceConsumer) makeConsumeCustomMetric(ctx context.Context) {
} }
func (rc *ResourceConsumer) sendConsumeCPURequest(ctx context.Context, millicores int) { func (rc *ResourceConsumer) sendConsumeCPURequest(ctx context.Context, millicores int) {
ctx, cancel := context.WithTimeout(ctx, framework.SingleCallTimeout) err := wait.PollUntilContextTimeout(ctx, serviceInitializationInterval, serviceInitializationTimeout, true, func(ctx context.Context) (bool, error) {
defer cancel()
err := wait.PollImmediateWithContext(ctx, serviceInitializationInterval, serviceInitializationTimeout, func(ctx context.Context) (bool, error) {
proxyRequest, err := e2eservice.GetServicesProxyRequest(rc.clientSet, rc.clientSet.CoreV1().RESTClient().Post()) proxyRequest, err := e2eservice.GetServicesProxyRequest(rc.clientSet, rc.clientSet.CoreV1().RESTClient().Post())
framework.ExpectNoError(err) framework.ExpectNoError(err)
req := proxyRequest.Namespace(rc.nsName). req := proxyRequest.Namespace(rc.nsName).
@ -375,15 +372,18 @@ func (rc *ResourceConsumer) sendConsumeCPURequest(ctx context.Context, millicore
return true, nil return true, nil
}) })
// Test has already finished (ctx got canceled), so don't fail on err from PollUntilContextTimeout
// which is a side-effect to context cancelling from the cleanup task.
if ctx.Err() != nil {
return
}
framework.ExpectNoError(err) framework.ExpectNoError(err)
} }
// sendConsumeMemRequest sends POST request for memory consumption // sendConsumeMemRequest sends POST request for memory consumption
func (rc *ResourceConsumer) sendConsumeMemRequest(ctx context.Context, megabytes int) { func (rc *ResourceConsumer) sendConsumeMemRequest(ctx context.Context, megabytes int) {
ctx, cancel := context.WithTimeout(ctx, framework.SingleCallTimeout) err := wait.PollUntilContextTimeout(ctx, serviceInitializationInterval, serviceInitializationTimeout, true, func(ctx context.Context) (bool, error) {
defer cancel()
err := wait.PollImmediateWithContext(ctx, serviceInitializationInterval, serviceInitializationTimeout, func(ctx context.Context) (bool, error) {
proxyRequest, err := e2eservice.GetServicesProxyRequest(rc.clientSet, rc.clientSet.CoreV1().RESTClient().Post()) proxyRequest, err := e2eservice.GetServicesProxyRequest(rc.clientSet, rc.clientSet.CoreV1().RESTClient().Post())
framework.ExpectNoError(err) framework.ExpectNoError(err)
req := proxyRequest.Namespace(rc.nsName). req := proxyRequest.Namespace(rc.nsName).
@ -401,15 +401,18 @@ func (rc *ResourceConsumer) sendConsumeMemRequest(ctx context.Context, megabytes
return true, nil return true, nil
}) })
// Test has already finished (ctx got canceled), so don't fail on err from PollUntilContextTimeout
// which is a side-effect to context cancelling from the cleanup task.
if ctx.Err() != nil {
return
}
framework.ExpectNoError(err) framework.ExpectNoError(err)
} }
// sendConsumeCustomMetric sends POST request for custom metric consumption // sendConsumeCustomMetric sends POST request for custom metric consumption
func (rc *ResourceConsumer) sendConsumeCustomMetric(ctx context.Context, delta int) { func (rc *ResourceConsumer) sendConsumeCustomMetric(ctx context.Context, delta int) {
ctx, cancel := context.WithTimeout(ctx, framework.SingleCallTimeout) err := wait.PollUntilContextTimeout(ctx, serviceInitializationInterval, serviceInitializationTimeout, true, func(ctx context.Context) (bool, error) {
defer cancel()
err := wait.PollImmediateWithContext(ctx, serviceInitializationInterval, serviceInitializationTimeout, func(ctx context.Context) (bool, error) {
proxyRequest, err := e2eservice.GetServicesProxyRequest(rc.clientSet, rc.clientSet.CoreV1().RESTClient().Post()) proxyRequest, err := e2eservice.GetServicesProxyRequest(rc.clientSet, rc.clientSet.CoreV1().RESTClient().Post())
framework.ExpectNoError(err) framework.ExpectNoError(err)
req := proxyRequest.Namespace(rc.nsName). req := proxyRequest.Namespace(rc.nsName).
@ -427,6 +430,13 @@ func (rc *ResourceConsumer) sendConsumeCustomMetric(ctx context.Context, delta i
} }
return true, nil return true, nil
}) })
// Test has already finished (ctx got canceled), so don't fail on err from PollUntilContextTimeout
// which is a side-effect to context cancelling from the cleanup task.
if ctx.Err() != nil {
return
}
framework.ExpectNoError(err) framework.ExpectNoError(err)
} }