From a2eb6d67ee43c799465ea0378c83dc3ac3a24246 Mon Sep 17 00:00:00 2001 From: Adhityaa Chandrasekar Date: Wed, 4 Nov 2020 18:58:06 +0000 Subject: [PATCH] apiserver/filters test: fix data race and do not leak goroutines Signed-off-by: Adhityaa Chandrasekar --- .../pkg/server/filters/priority-and-fairness_test.go | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/staging/src/k8s.io/apiserver/pkg/server/filters/priority-and-fairness_test.go b/staging/src/k8s.io/apiserver/pkg/server/filters/priority-and-fairness_test.go index cd8787382b8..f8573c6bcc6 100644 --- a/staging/src/k8s.io/apiserver/pkg/server/filters/priority-and-fairness_test.go +++ b/staging/src/k8s.io/apiserver/pkg/server/filters/priority-and-fairness_test.go @@ -294,15 +294,17 @@ func TestApfExecuteMultipleRequests(t *testing.T) { defer cancel() StartPriorityAndFairnessWatermarkMaintenance(ctx.Done()) + var wg sync.WaitGroup + wg.Add(concurrentRequests) for i := 0; i < concurrentRequests; i++ { - var err error go func() { - err = expectHTTPGet(fmt.Sprintf("%s/api/v1/namespaces/default", server.URL), http.StatusOK) + defer wg.Done() + if err := expectHTTPGet(fmt.Sprintf("%s/api/v1/namespaces/default", server.URL), http.StatusOK); err != nil { + t.Error(err) + } }() - if err != nil { - t.Error(err) - } } + wg.Wait() checkForExpectedMetricsWithRetry(t, []string{ "apiserver_current_inflight_requests",