From 02f3444334457d3f87884a07cf7e1fe405225427 Mon Sep 17 00:00:00 2001 From: lhy1024 Date: Fri, 10 Nov 2023 17:41:57 +0800 Subject: [PATCH] fix conflict Signed-off-by: lhy1024 --- pkg/mcs/scheduling/server/apis/v1/api.go | 6 ------ tests/server/api/rule_test.go | 3 +-- 2 files changed, 1 insertion(+), 8 deletions(-) diff --git a/pkg/mcs/scheduling/server/apis/v1/api.go b/pkg/mcs/scheduling/server/apis/v1/api.go index 83d1e3bcfcd..114b9222487 100644 --- 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 index 3ee3357e031..dd88504f40e 100644 --- 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) {