tso: fix an invalid err != nil check (#8523) (#8525)

close #8524 Use the continue label to retry the whole merge loop correctly. Signed-off-by: JmPotato <[email protected]> Co-authored-by: JmPotato <[email protected]>
tikv · Aug 14, 2024 · f3dd0b6 · f3dd0b6
1 parent 10ecdbe
commit f3dd0b6
Showing 1 changed file with 3 additions and 4 deletions.
diff --git a/pkg/tso/keyspace_group_manager.go b/pkg/tso/keyspace_group_manager.go
@@ -1302,6 +1302,7 @@ func (kgm *KeyspaceGroupManager) mergingChecker(ctx context.Context, mergeTarget
 		mergeMap[id] = struct{}{}
 	}
 
+mergeLoop:
 	for {
 		select {
 		case <-ctx.Done():
@@ -1373,15 +1374,13 @@ func (kgm *KeyspaceGroupManager) mergingChecker(ctx context.Context, mergeTarget
 					zap.Uint32("merge-id", id),
 					zap.Time("ts", ts),
 					zap.Error(err))
-				break
+				// Retry from the beginning of the loop.
+				continue mergeLoop
 			}
 			if ts.After(mergedTS) {
 				mergedTS = ts
 			}
 		}
-		if err != nil {
-			continue
-		}
 		// Update the newly merged TSO if the merged TSO is not zero.
 		if mergedTS != typeutil.ZeroTime {
 			log.Info("start to set the newly merged TSO",