fix conflict

Signed-off-by: lhy1024 <[email protected]>
lhy1024 · Nov 10, 2023 · 02f3444 · 02f3444
1 parent 1dc633c
commit 02f3444
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 8 deletions.
diff --git a/pkg/mcs/scheduling/server/apis/v1/api.go b/pkg/mcs/scheduling/server/apis/v1/api.go
@@ -119,7 +119,6 @@ func NewService(srv *scheserver.Service) *Service {
 	s.RegisterCheckersRouter()
 	s.RegisterHotspotRouter()
 	s.RegisterRegionsRouter()
-	s.RegisterRegionLabelRouter()
 	return s
 }
 
@@ -177,11 +176,6 @@ func (s *Service) RegisterRegionsRouter() {
 	router.GET("/:id/labels", getRegionLabels)
 }
 
-// RegisterRegionLabelRouter registers the router of the region label handler.
-func (s *Service) RegisterRegionLabelRouter() {
-
-}
-
 // RegisterConfigRouter registers the router of the config handler.
 func (s *Service) RegisterConfigRouter() {
 	router := s.root.Group("config")

diff --git a/tests/server/api/rule_test.go b/tests/server/api/rule_test.go
@@ -990,8 +990,7 @@ func (suite *regionRuleTestSuite) TestRegionPlacementRule() {
 		},
 	}
 	env := tests.NewSchedulingTestEnvironment(suite.T(), opts...)
-	// FIXME: enable this test in two modes after we support region label forward.
-	env.RunTestInPDMode(suite.checkRegionPlacementRule)
+	env.RunTestInTwoModes(suite.checkRegionPlacementRule)
 }
 
 func (suite *regionRuleTestSuite) checkRegionPlacementRule(cluster *tests.TestCluster) {