address comments

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

Hide file tree

Showing 3 changed files with 21 additions and 17 deletions.
diff --git a/pkg/mcs/scheduling/server/apis/v1/api.go b/pkg/mcs/scheduling/server/apis/v1/api.go
@@ -118,7 +118,6 @@ func NewService(srv *scheserver.Service) *Service {
 	s.RegisterSchedulersRouter()
 	s.RegisterCheckersRouter()
 	s.RegisterHotspotRouter()
-	s.RegisterRegionsRouter()
 	return s
 }
 
@@ -169,13 +168,6 @@ func (s *Service) RegisterOperatorsRouter() {
 	router.GET("/records", getOperatorRecords)
 }
 
-// RegisterRegionsRouter registers the router of the regions handler.
-func (s *Service) RegisterRegionsRouter() {
-	router := s.root.Group("regions")
-	router.GET("/:id/label/:key", getRegionLabelByKey)
-	router.GET("/:id/labels", getRegionLabels)
-}
-
 // RegisterConfigRouter registers the router of the config handler.
 func (s *Service) RegisterConfigRouter() {
 	router := s.root.Group("config")
@@ -202,9 +194,13 @@ func (s *Service) RegisterConfigRouter() {
 	placementRule.GET("/:group", getPlacementRuleByGroup)
 
 	regionLabel := router.Group("region-label")
-	regionLabel.GET("rules", getAllRegionLabelRules)
-	regionLabel.GET("rules/ids", getRegionLabelRulesByIDs)
-	regionLabel.GET("rule/:id", getRegionLabelRuleByID)
+	regionLabel.GET("/rules", getAllRegionLabelRules)
+	regionLabel.GET("/rules/ids", getRegionLabelRulesByIDs)
+	regionLabel.GET("/rule/:id", getRegionLabelRuleByID)
+
+	regions := router.Group("regions")
+	regions.GET("/:id/label/:key", getRegionLabelByKey)
+	regions.GET("/:id/labels", getRegionLabels)
 }
 
 // @Tags     admin
@@ -991,7 +987,11 @@ func getRegionLabelByKey(c *gin.Context) {
 		return
 	}
 
-	region := handler.GetRegion(id)
+	region, err := handler.GetRegion(id)
+	if err != nil {
+		c.String(http.StatusBadRequest, err.Error())
+		return
+	}
 	if region == nil {
 		c.String(http.StatusNotFound, errs.ErrRegionNotFound.FastGenByArgs().Error())
 		return
@@ -1024,7 +1024,11 @@ func getRegionLabels(c *gin.Context) {
 		return
 	}
 
-	region := handler.GetRegion(id)
+	region, err := handler.GetRegion(id)
+	if err != nil {
+		c.String(http.StatusBadRequest, err.Error())
+		return
+	}
 	if region == nil {
 		c.String(http.StatusNotFound, errs.ErrRegionNotFound.FastGenByArgs().Error())
 		return

diff --git a/pkg/schedule/handler/handler.go b/pkg/schedule/handler/handler.go
@@ -1065,12 +1065,12 @@ func (h *Handler) GetHotBuckets(regionIDs ...uint64) (HotBucketsResponse, error)
 }
 
 // GetRegion returns the region labeler.
-func (h *Handler) GetRegion(id uint64) *core.RegionInfo {
+func (h *Handler) GetRegion(id uint64) (*core.RegionInfo, error) {
 	c := h.GetCluster()
 	if c == nil {
-		return nil
+		return nil, errs.ErrNotBootstrapped.GenWithStackByArgs()
 	}
-	return c.GetRegion(id)
+	return c.GetRegion(id), nil
 }
 
 // GetRegionLabeler returns the region labeler.

diff --git a/server/api/server.go b/server/api/server.go
@@ -82,7 +82,7 @@ func NewHandler(_ context.Context, svr *server.Server) (http.Handler, apiutil.AP
 				[]string{http.MethodPost, http.MethodGet}),
 			serverapi.MicroserviceRedirectRule(
 				prefix+"/region/id",
-				scheapi.APIPathPrefix+"/regions",
+				scheapi.APIPathPrefix+"/config/regions",
 				mcs.SchedulingServiceName,
 				[]string{http.MethodGet},
 				func(r *http.Request) bool {