fix concurrency

0xPolygonHermez · Aug 13, 2024 · 783e3b6 · 783e3b6
1 parent 07510f3
commit 783e3b6
Showing 1 changed file with 11 additions and 15 deletions.
diff --git a/aggregator/aggregator.go b/aggregator/aggregator.go
@@ -198,25 +198,21 @@ func New(
 func (a *Aggregator) retrieveWitnesses() {
 	currentWorkers := 0
 	for {
-		select {
-		case <-a.ctx.Done():
-			return
-		case dbBatch := <-a.witnessRetrievalChan:
-			a.activeWitnessRetrievalWorkersMutex.Lock()
-			currentWorkers = a.activeWitnessRetrievalWorkers
-			a.activeWitnessRetrievalWorkersMutex.Unlock()
+		dbBatch := <-a.witnessRetrievalChan
+		a.activeWitnessRetrievalWorkersMutex.Lock()
+		currentWorkers = a.activeWitnessRetrievalWorkers
+		a.activeWitnessRetrievalWorkersMutex.Unlock()
 
-			for currentWorkers >= a.cfg.MaxWitnessRetrievalWorkers {
-				time.Sleep(a.cfg.RetryTime.Duration)
-				a.activeWitnessRetrievalWorkersMutex.Lock()
-				currentWorkers = a.activeWitnessRetrievalWorkers
-				a.activeWitnessRetrievalWorkersMutex.Unlock()
-			}
+		for currentWorkers >= a.cfg.MaxWitnessRetrievalWorkers {
+			time.Sleep(a.cfg.RetryTime.Duration)
 			a.activeWitnessRetrievalWorkersMutex.Lock()
-			a.activeWitnessRetrievalWorkers++
+			currentWorkers = a.activeWitnessRetrievalWorkers
 			a.activeWitnessRetrievalWorkersMutex.Unlock()
-			go a.retrieveWitness(dbBatch)
 		}
+		a.activeWitnessRetrievalWorkersMutex.Lock()
+		a.activeWitnessRetrievalWorkers++
+		a.activeWitnessRetrievalWorkersMutex.Unlock()
+		go a.retrieveWitness(dbBatch)
 	}
 }