fix: fix api error and handle compatibility with lower version tidb c…

…luster
pingcap · Mar 14, 2024 · a86edef · a86edef
1 parent 58bb67b
commit a86edef
Show file tree

Hide file tree

Showing 7 changed files with 361 additions and 342 deletions.
diff --git a/pkg/apiserver/clusterinfo/service.go b/pkg/apiserver/clusterinfo/service.go
@@ -9,6 +9,7 @@ import (
 	"context"
 	"fmt"
 	"net/http"
+	"strings"
 	"sync"
 	"time"
 
@@ -167,7 +168,12 @@ func (s *Service) getTiProxyTopology(c *gin.Context) {
 func (s *Service) getTSOTopology(c *gin.Context) {
 	instances, err := topology.FetchTSOTopology(s.lifecycleCtx, s.params.PDClient)
 	if err != nil {
-		rest.Error(c, err)
+		// TODO: refine later
+		if strings.Contains(err.Error(), "status code 404") {
+			rest.Error(c, rest.ErrNotFound.Wrap(err, "api not found"))
+		} else {
+			rest.Error(c, err)
+		}
 		return
 	}
 	c.JSON(http.StatusOK, instances)
@@ -182,7 +188,12 @@ func (s *Service) getTSOTopology(c *gin.Context) {
 func (s *Service) getSchedulingTopology(c *gin.Context) {
 	instances, err := topology.FetchSchedulingTopology(s.lifecycleCtx, s.params.PDClient)
 	if err != nil {
-		rest.Error(c, err)
+		// TODO: refine later
+		if strings.Contains(err.Error(), "status code 404") {
+			rest.Error(c, rest.ErrNotFound.Wrap(err, "api not found"))
+		} else {
+			rest.Error(c, err)
+		}
 		return
 	}
 	c.JSON(http.StatusOK, instances)

diff --git a/pkg/utils/topology/scheduling.go b/pkg/utils/topology/scheduling.go
@@ -14,7 +14,7 @@ import (
 
 func FetchSchedulingTopology(ctx context.Context, pdClient *pd.Client) ([]SchedulingInfo, error) {
 	nodes := make([]SchedulingInfo, 0)
-	data, err := pdClient.WithoutPrefix().SendGetRequest("pd/api/v2/ms/members/scheduling")
+	data, err := pdClient.WithoutPrefix().SendGetRequest("/pd/api/v2/ms/members/scheduling")
 	if err != nil {
 		return nil, err
 	}

diff --git a/pkg/utils/topology/tso.go b/pkg/utils/topology/tso.go
@@ -14,7 +14,7 @@ import (
 
 func FetchTSOTopology(ctx context.Context, pdClient *pd.Client) ([]TSOInfo, error) {
 	nodes := make([]TSOInfo, 0)
-	data, err := pdClient.WithoutPrefix().SendGetRequest("pd/api/v2/ms/members/tso")
+	data, err := pdClient.WithoutPrefix().SendGetRequest("/pd/api/v2/ms/members/tso")
 	if err != nil {
 		return nil, err
 	}