Use time ticker

Signed-off-by: JmPotato <[email protected]>
tikv · Jul 7, 2023 · 68bf276 · 68bf276
1 parent 90f2e8b
commit 68bf276
Showing 1 changed file with 6 additions and 1 deletion.
diff --git a/pkg/keyspace/tso_keyspace_group.go b/pkg/keyspace/tso_keyspace_group.go
@@ -1051,6 +1051,11 @@ func (m *GroupManager) MergeAllIntoDefaultKeyspaceGroup() error {
 			}
 			// Wait for the merge to finish.
 			ctx, cancel := context.WithTimeout(m.ctx, time.Minute)
+			ticker := time.NewTicker(time.Second)
+			cancel = func() {
+				cancel()
+				ticker.Stop()
+			}
 		checkLoop:
 			for {
 				select {
@@ -1061,7 +1066,7 @@ func (m *GroupManager) MergeAllIntoDefaultKeyspaceGroup() error {
 						zap.Int("merged-group-num", mergedGroupNum))
 					cancel()
 					return nil
-				case <-time.After(time.Second):
+				case <-ticker.C:
 					kg, err := m.GetKeyspaceGroupByID(utils.DefaultKeyspaceGroupID)
 					if err != nil {
 						log.Error("failed to check the default keyspace group merge state",