Fix garbage collection logic for matching tasks (#5355)

uber · Jul 19, 2023 · 25e69ba · 25e69ba
1 parent 497aff1
commit 25e69ba
Showing 1 changed file with 9 additions and 6 deletions.
diff --git a/service/matching/taskGC.go b/service/matching/taskGC.go
@@ -72,12 +72,15 @@ func (tgc *taskGC) tryDeleteNextBatch(ackLevel int64, ignoreTimeCond bool) {
 		return
 	}
 	tgc.lastDeleteTime = time.Now()
-	n, err := tgc.db.CompleteTasksLessThan(ackLevel, batchSize)
-	switch {
-	case err != nil:
-		return
-	case n < batchSize:
-		tgc.ackLevel = ackLevel
+	for {
+		n, err := tgc.db.CompleteTasksLessThan(ackLevel, batchSize)
+		if err != nil {
+			break
+		}
+		if n < batchSize {
+			tgc.ackLevel = ackLevel
+			break
+		}
 	}
 }