fix test

Signed-off-by: lhy1024 <admin@liudos.us>
tikv · Nov 21, 2023 · 07e96f0 · 07e96f0
1 parent 2b06e2f
commit 07e96f0
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 7 deletions.
diff --git a/pkg/mcs/scheduling/server/apis/v1/api.go b/pkg/mcs/scheduling/server/apis/v1/api.go
@@ -1291,12 +1291,11 @@ func splitRegions(c *gin.Context) {
 		c.String(http.StatusBadRequest, "split_keys should be provided.")
 		return
 	}
-	rawSplitKeys := s.([]string)
+	rawSplitKeys := s.([]interface{})
 	if len(rawSplitKeys) < 1 {
 		c.String(http.StatusBadRequest, "empty split keys.")
 		return
 	}
-	fmt.Println(rawSplitKeys)
 	retryLimit := 5
 	if rl, ok := input["retry_limit"].(float64); ok {
 		retryLimit = int(rl)

diff --git a/pkg/schedule/handler/handler.go b/pkg/schedule/handler/handler.go
@@ -1221,14 +1221,14 @@ type SplitRegionsResponse struct {
 }
 
 // SplitRegions splits regions by split keys.
-func (h *Handler) SplitRegions(ctx context.Context, rawSplitKeys []string, retryLimit int) (*SplitRegionsResponse, error) {
+func (h *Handler) SplitRegions(ctx context.Context, rawSplitKeys []interface{}, retryLimit int) (*SplitRegionsResponse, error) {
 	co := h.GetCoordinator()
 	if co == nil {
 		return nil, errs.ErrNotBootstrapped.GenWithStackByArgs()
 	}
 	splitKeys := make([][]byte, 0, len(rawSplitKeys))
 	for _, rawKey := range rawSplitKeys {
-		key, err := hex.DecodeString(rawKey)
+		key, err := hex.DecodeString(rawKey.(string))
 		if err != nil {
 			return nil, err
 		}

diff --git a/pkg/utils/apiutil/serverapi/middleware.go b/pkg/utils/apiutil/serverapi/middleware.go
@@ -122,7 +122,9 @@ func (h *redirector) matchMicroServiceRedirectRules(r *http.Request) (bool, stri
 	// It will be helpful when matching the redirect rules "schedulers" or "schedulers/{name}"
 	r.URL.Path = strings.TrimRight(r.URL.Path, "/")
 	for _, rule := range h.microserviceRedirectRules {
-		if strings.HasPrefix(r.URL.Path, rule.matchPath) && slice.Contains(rule.matchMethods, r.Method) {
+		if h.s.IsServiceIndependent(rule.targetServiceName) &&
+			strings.HasPrefix(r.URL.Path, rule.matchPath) &&
+			slice.Contains(rule.matchMethods, r.Method) {
 			if rule.filter != nil && !rule.filter(r) {
 				continue
 			}

diff --git a/server/api/region.go b/server/api/region.go
@@ -996,7 +996,7 @@ func (h *regionsHandler) SplitRegions(w http.ResponseWriter, r *http.Request) {
 		h.rd.JSON(w, http.StatusBadRequest, "split_keys should be provided.")
 		return
 	}
-	rawSplitKeys := s.([]string)
+	rawSplitKeys := s.([]interface{})
 	if len(rawSplitKeys) < 1 {
 		h.rd.JSON(w, http.StatusBadRequest, "empty split keys.")
 		return

diff --git a/server/api/region_test.go b/server/api/region_test.go
@@ -406,7 +406,7 @@ func (suite *regionTestSuite) TestScatterRegions() {
 func (suite *regionTestSuite) TestSplitRegions() {
 	re := suite.Require()
 	r1 := core.NewTestRegionInfo(601, 13, []byte("aaa"), []byte("ggg"))
-	r1.GetMeta().Peers = append(r1.GetMeta().Peers, &metapb.Peer{Id: 5, StoreId: 13}, &metapb.Peer{Id: 6, StoreId: 13})
+	r1.GetMeta().Peers = append(r1.GetMeta().Peers, &metapb.Peer{Id: 5, StoreId: 14}, &metapb.Peer{Id: 6, StoreId: 15})
 	mustRegionHeartbeat(re, suite.svr, r1)
 	mustPutStore(re, suite.svr, 13, metapb.StoreState_Up, metapb.NodeState_Serving, []*metapb.StoreLabel{})
 	newRegionID := uint64(11)