*: make TestConcurrentlyReset stable (#8082)

close #6898 Signed-off-by: Ryan Leung <[email protected]> Co-authored-by: ti-chi-bot[bot] <108142056+ti-chi-bot[bot]@users.noreply.github.com>
tikv · Apr 18, 2024 · ad5ba18 · ad5ba18
1 parent 956684a
commit ad5ba18
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/server/api/admin_test.go b/server/api/admin_test.go
@@ -181,7 +181,7 @@ func (suite *adminTestSuite) TestPersistFile() {
 
 func makeTS(offset time.Duration) uint64 {
 	physical := time.Now().Add(offset).UnixNano() / int64(time.Millisecond)
-	return uint64(physical << 18)
+	return uint64(physical) << 18
 }
 
 func (suite *adminTestSuite) TestResetTS() {

diff --git a/tests/integrations/tso/server_test.go b/tests/integrations/tso/server_test.go
@@ -152,12 +152,12 @@ func (suite *tsoServerTestSuite) TestConcurrentlyReset() {
 	for i := 0; i < 2; i++ {
 		go func() {
 			defer wg.Done()
-			for j := 0; j <= 100; j++ {
+			for j := 0; j <= 50; j++ {
 				// Get a copy of now then call base.add, because now is shared by all goroutines
 				// and now.add() will add to itself which isn't atomic and multi-goroutine safe.
 				base := now
-				physical := base.Add(time.Duration(2*j)*time.Minute).UnixNano() / int64(time.Millisecond)
-				ts := uint64(physical << 18)
+				physical := base.Add(time.Duration(j)*time.Minute).UnixNano() / int64(time.Millisecond)
+				ts := uint64(physical) << 18
 				suite.resetTS(ts, false, false)
 			}
 		}()