github/kubernetes
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #115113 from smarterclayton/exponential_context

Browse Source 
wait: ExponentialBackoffWithContext should take context-aware fn
This commit is contained in:
Kubernetes Prow Robot
2023-01-20 07:38:15 -08:00
committed by GitHub
parent 02f893b6e2 34bfdc3635
commit b0ed87078e
4 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
test/e2e/storage/volume_metrics.go
View File

@@ -673,7 +673,7 @@ func waitForDetachAndGrabMetrics(ctx context.Context, oldMetrics *storageControl
oldDetachCount = 0
}
verifyMetricFunc := func() (bool, error) {
verifyMetricFunc := func(ctx context.Context) (bool, error) {
updatedMetrics, err := metricsGrabber.GrabFromControllerManager(ctx)
if err != nil {
@@ -821,7 +821,7 @@ func waitForPVControllerSync(ctx context.Context, metricsGrabber *e2emetrics.Gra
Factor: 1.2,
Steps: 21,
}
verifyMetricFunc := func() (bool, error) {
verifyMetricFunc := func(ctx context.Context) (bool, error) {
updatedMetrics, err := metricsGrabber.GrabFromControllerManager(ctx)
if err != nil {
framework.Logf("Error fetching controller-manager metrics")
@@ -866,7 +866,7 @@ func waitForADControllerStatesMetrics(ctx context.Context, metricsGrabber *e2eme
Factor: 1.2,
Steps: 21,
}
verifyMetricFunc := func() (bool, error) {
verifyMetricFunc := func(ctx context.Context) (bool, error) {
updatedMetrics, err := metricsGrabber.GrabFromControllerManager(ctx)
if err != nil {
e2eskipper.Skipf("Could not get controller-manager metrics - skipping")