From 68bf27631e3b613151ccef3140cc657462e77b07 Mon Sep 17 00:00:00 2001 From: JmPotato Date: Fri, 7 Jul 2023 14:25:57 +0800 Subject: [PATCH] Use time ticker Signed-off-by: JmPotato --- pkg/keyspace/tso_keyspace_group.go | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/pkg/keyspace/tso_keyspace_group.go b/pkg/keyspace/tso_keyspace_group.go index de2baf0648d0..c8df510bfbbc 100644 --- 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",