fix conflict

Signed-off-by: lhy1024 <[email protected]>
tikv · Dec 9, 2024 · 99ed2c3 · 99ed2c3
1 parent ce3d7e7
commit 99ed2c3
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 8 deletions.
diff --git a/server/cluster/cluster.go b/server/cluster/cluster.go
@@ -2570,6 +2570,6 @@ func (c *RaftCluster) UnsetServiceIndependent(name string) {
 
 // GetGlobalTSOAllocator return global tso allocator
 // It only is used for test.
-func (c *RaftCluster) GetGlobalTSOAllocator() (tso.Allocator, error) {
-	return c.tsoAllocator.GetAllocator(tso.GlobalDCLocation)
+func (c *RaftCluster) GetGlobalTSOAllocator() tso.Allocator {
+	return c.tsoAllocator.GetAllocator()
 }
diff --git a/server/server.go b/server/server.go
@@ -2100,6 +2100,6 @@ func (s *Server) SetClient(client *clientv3.Client) {
 
 // GetGlobalTSOAllocator return global tso allocator
 // It only is used for test.
-func (s *Server) GetGlobalTSOAllocator() (tso.Allocator, error) {
+func (s *Server) GetGlobalTSOAllocator() tso.Allocator {
 	return s.cluster.GetGlobalTSOAllocator()
 }
diff --git a/tests/server/cluster/cluster_test.go b/tests/server/cluster/cluster_test.go
@@ -646,8 +646,7 @@ func TestRaftClusterStartTSOJob(t *testing.T) {
 	leaderServer := tc.GetLeaderServer()
 	re.NotNil(leaderServer)
 	leaderServer.BootstrapCluster()
-	allocator, err := tc.GetServer(name).GetServer().GetGlobalTSOAllocator()
-	re.NoError(err)
+	allocator := tc.GetServer(name).GetServer().GetGlobalTSOAllocator()
 	re.True(allocator.IsInitialize())
 	tc.Destroy()
 	cancel()
@@ -661,8 +660,7 @@ func TestRaftClusterStartTSOJob(t *testing.T) {
 	err = tc.RunInitialServers()
 	re.NoError(err)
 	tc.WaitLeader()
-	allocator, err = tc.GetServer(name).GetServer().GetGlobalTSOAllocator()
-	re.NoError(err)
+	allocator = tc.GetServer(name).GetServer().GetGlobalTSOAllocator()
 	re.False(allocator.IsInitialize())
 	re.NoError(failpoint.Disable("github.com/tikv/pd/server/cluster/raftClusterReturn"))
 	tc.Destroy()
@@ -677,7 +675,7 @@ func TestRaftClusterStartTSOJob(t *testing.T) {
 	err = tc.RunInitialServers()
 	re.NoError(err)
 	tc.WaitLeader()
-	allocator, err = tc.GetServer(name).GetServer().GetGlobalTSOAllocator()
+	allocator = tc.GetServer(name).GetServer().GetGlobalTSOAllocator()
 	re.NoError(err)
 	re.False(allocator.IsInitialize())
 	re.NoError(failpoint.Disable("github.com/tikv/pd/server/cluster/raftClusterReturn"))