Fix race in ramping arrival rate

originally discussed in this comment grafana/k6#1957 (comment)
APITeamLimited · May 21, 2021 · a3cb336 · a3cb336
1 parent 9ed27f8
commit a3cb336
Showing 1 changed file with 2 additions and 1 deletion.
diff --git a/lib/executor/ramping_arrival_rate.go b/lib/executor/ramping_arrival_rate.go
@@ -336,10 +336,11 @@ func (varr RampingArrivalRate) Run(parentCtx context.Context, out chan<- stats.S
 	vusPool := newActiveVUPool()
 
 	defer func() ***REMOVED***
-		vusPool.Close()
 		// Make sure all VUs aren't executing iterations anymore, for the cancel()
 		// below to deactivate them.
 		<-returnedVUs
+		// first close the vusPool so we wait for the gracefulShutdown
+		vusPool.Close()
 		cancel()
 		activeVUsWg.Wait()
 	***REMOVED***()