tso: fix checkTSOSplit to finish split correctly (tikv#6652)

ref tikv#6232 Fix `checkTSOSplit` to finish split correctly. Signed-off-by: JmPotato <[email protected]> Co-authored-by: ti-chi-bot[bot] <108142056+ti-chi-bot[bot]@users.noreply.github.com>
rleungx · Aug 2, 2023 · e9f4726 · e9f4726
1 parent 35785c3
commit e9f4726
Showing 1 changed file with 14 additions and 6 deletions.
diff --git a/pkg/tso/keyspace_group_manager.go b/pkg/tso/keyspace_group_manager.go
@@ -837,23 +837,31 @@ func (kgm *KeyspaceGroupManager) checkTSOSplit(
 	if err != nil {
 		return err
 	}
+	// If the split source TSO is not greater than the newly split TSO, we don't need to do anything.
 	if tsoutil.CompareTimestamp(&splitSourceTSO, &splitTSO) <= 0 {
-		log.Debug("the split source TSO is not greater than the newly split TSO",
+		log.Info("the split source tso is less than the newly split tso",
 			zap.Int64("split-source-tso-physical", splitSourceTSO.Physical),
 			zap.Int64("split-source-tso-logical", splitSourceTSO.Logical),
 			zap.Int64("split-tso-physical", splitTSO.Physical),
-			zap.Int64("split-tso-logical", splitTSO.Logical),
-		)
-		return nil
+			zap.Int64("split-tso-logical", splitTSO.Logical))
+		// Finish the split state directly.
+		return kgm.finishSplitKeyspaceGroup(keyspaceGroupID)
 	}
 	// If the split source TSO is greater than the newly split TSO, we need to update the split
 	// TSO to make sure the following TSO will be greater than the split keyspaces ever had
 	// in the past.
-	splitSourceTSO.Physical += 1
-	err = splitAllocator.SetTSO(tsoutil.GenerateTS(&splitSourceTSO), true, true)
+	err = splitAllocator.SetTSO(tsoutil.GenerateTS(&pdpb.Timestamp{
+		Physical: splitSourceTSO.Physical + 1,
+		Logical:  splitSourceTSO.Logical,
+	}), true, true)
 	if err != nil {
 		return err
 	}
+	log.Info("the split source tso is greater than the newly split tso",
+		zap.Int64("split-source-tso-physical", splitSourceTSO.Physical),
+		zap.Int64("split-source-tso-logical", splitSourceTSO.Logical),
+		zap.Int64("split-tso-physical", splitTSO.Physical),
+		zap.Int64("split-tso-logical", splitTSO.Logical))
 	// Finish the split state.
 	return kgm.finishSplitKeyspaceGroup(keyspaceGroupID)
 }