fix the conflict

Signed-off-by: Ryan Leung <rleungx@gmail.com>
tikv · May 30, 2022 · f3877ab · f3877ab
1 parent b32bf50
commit f3877ab
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 9 deletions.
diff --git a/server/cluster/cluster.go b/server/cluster/cluster.go
@@ -1493,13 +1493,6 @@ func (c *RaftCluster) GetComponentManager() *component.Manager {
 	return c.componentManager
 }
 
-// isPrepared if the cluster information is collected
-func (c *RaftCluster) isPrepared() bool {
-	c.RLock()
-	defer c.RUnlock()
-	return c.prepareChecker.check(c)
-}
-
 // GetStoresLoads returns load stats of all stores.
 func (c *RaftCluster) GetStoresLoads() map[uint64][]float64 {
 	c.RLock()

diff --git a/server/cluster/coordinator.go b/server/cluster/coordinator.go
@@ -620,7 +620,7 @@ func (c *coordinator) resetHotSpotMetrics() {
 }
 
 func (c *coordinator) shouldRun() bool {
-	return c.cluster.isPrepared()
+	return c.cluster.prepareChecker.check(c.cluster)
 }
 
 func (c *coordinator) addScheduler(scheduler schedule.Scheduler, args ...string) error {

diff --git a/server/cluster/coordinator_test.go b/server/cluster/coordinator_test.go
@@ -190,7 +190,7 @@ func (s *testCoordinatorSuite) TestBasic(c *C) {
 }
 
 func (s *testCoordinatorSuite) TestDispatch(c *C) {
-	tc, co, cleanup := prepare(nil, func(tc *testCluster) { tc.prepareChecker.isPrepared = true }, nil, c)
+	tc, co, cleanup := prepare(nil, func(tc *testCluster) { tc.prepareChecker.prepared = true }, nil, c)
 	defer cleanup()
 	// Transfer peer from store 4 to store 1.
 	c.Assert(tc.addRegionStore(4, 40), IsNil)