ctl: replace gc_safepoint call with HTTP SDK

client/http/api.go

@@ -84,6 +84,8 @@ const (
 	// Keyspace
 	KeyspaceConfig        = "/pd/api/v2/keyspaces/%s/config"
 	GetKeyspaceMetaByName = "/pd/api/v2/keyspaces/%s"
+	// safepoint
+	GCSafepoint = "pd/api/v1/gc/safepoint"
 )
 
 // RegionByID returns the path of PD HTTP API to get region by ID.

client/http/interface.go

@@ -128,6 +128,10 @@ type Client interface {
 	WithTargetURL(string) Client
 	// Close gracefully closes the HTTP client.
 	Close()
+
+	//safepoint
+	GetGCSafePoint(context.Context) (Safepoint, error)
+	DeleteGCSafePoint(context.Context, string) (string, error)
 }
 
 var _ Client = (*client)(nil)
@@ -1024,3 +1028,29 @@ func (c *client) GetKeyspaceMetaByName(ctx context.Context, keyspaceName string)
 	}
 	return &keyspaceMetaPB, nil
 }
+
+func (c *client) GetGCSafePoint(ctx context.Context) (Safepoint ,error) {
+	var sfp Safepoint
+	err := c.request(ctx, newRequestInfo().
+		WithName(GetGCSafePointName).
+		WithURI(GCSafepoint).
+		WithMethod(http.MethodGet).
+		WithResp(&sfp))
+	if err != nil {
+		return nil, err
+	}
+	return sfp, nil
+}
+
+func (c *client) DeleteGCSafePoint(ctx context.Context, serviceID string) (string ,error) {
+	var msg string
+	err := c.request(ctx, newRequestInfo().
+		WithName(DeleteGCSafePointName).
+		WithURI(GCSafepoint + "/" + serviceID).
+		WithMethod(http.MethodDelete).
+		WithResp(&msg))
+	if err != nil {
+		return nil, err
+	}
+	return msg, nil
+}

client/http/request_info.go

@@ -85,6 +85,8 @@ const (
 	deleteOperators                         = "DeleteOperators"
 	UpdateKeyspaceGCManagementTypeName      = "UpdateKeyspaceGCManagementType"
 	GetKeyspaceMetaByNameName               = "GetKeyspaceMetaByName"
+	GetGCSafePointName						= "GetGCSafePoint"
+	DeleteGCSafePointName					= "DeleteGCSafePoint"
 )
 
 type requestInfo struct {

client/http/types.go

@@ -643,3 +643,9 @@ type Health struct {
 	ClientUrls []string `json:"client_urls"`
 	Health     bool     `json:"health"`
 }
+
+type Safepoint struct {
+	ServiceGCSafepoints   []*endpoint.ServiceSafePoint `json:"service_gc_safe_points"`
+	MinServiceGcSafepoint uint64                       `json:"min_service_gc_safe_point,omitempty"`
+	GCSafePoint           uint64                       `json:"gc_safe_point"`
+}

pkg/mcs/resourcemanager/server/manager.go

@@ -121,7 +121,7 @@ func (m *Manager) Init(ctx context.Context) error {
 		return err
 	}
 	if err = json.Unmarshal([]byte(v), &m.controllerConfig); err != nil {
-		log.Error("un-marshall controller config failed, fallback to default", zap.Error(err), zap.String("v", v))
+		log.Warn("un-marshall controller config failed, fallback to default", zap.Error(err), zap.String("v", v))
 	}
 
 	// re-save the config to make sure the config has been persisted.

server/api/service_gc_safepoint.go

@@ -38,6 +38,7 @@ func newServiceGCSafepointHandler(svr *server.Server, rd *render.Render) *servic
 
 // ListServiceGCSafepoint is the response for list service GC safepoint.
 // NOTE: This type is exported by HTTP API. Please pay more attention when modifying it.
+// - Need to sync with client/http/types.go#Safepoint
 type ListServiceGCSafepoint struct {
 	ServiceGCSafepoints   []*endpoint.ServiceSafePoint `json:"service_gc_safe_points"`
 	MinServiceGcSafepoint uint64                       `json:"min_service_gc_safe_point,omitempty"`

tools/pd-ctl/pdctl/command/gc_safepoint_command.go

@@ -23,10 +23,6 @@ import (
 	"github.com/tikv/pd/server/api"
 )
 
-var (
-	serviceGCSafepointPrefix = "pd/api/v1/gc/safepoint"
-)
-
 // NewServiceGCSafepointCommand return a service gc safepoint subcommand of rootCmd
 func NewServiceGCSafepointCommand() *cobra.Command {
 	l := &cobra.Command{
@@ -50,12 +46,13 @@ func NewDeleteServiceGCSafepointCommand() *cobra.Command {
 }
 
 func showSSPs(cmd *cobra.Command, _ []string) {
-	r, err := doRequest(cmd, serviceGCSafepointPrefix, http.MethodGet, http.Header{})
+	// r, err := doRequest(cmd, serviceGCSafepointPrefix, http.MethodGet, http.Header{})
+	r, err := PDCli.GetGCSafePoint(cmd.Context())
 	if err != nil {
 		cmd.Printf("Failed to get service GC safepoint: %s\n", err)
 		return
 	}
-	var safepoint api.ListServiceGCSafepoint
+	var safepoint Safepoint
 	if err := json.Unmarshal([]byte(r), &safepoint); err != nil {
 		cmd.Printf("Failed to unmarshal service GC safepoint: %s\n", err)
 		return
@@ -76,9 +73,10 @@ func deleteSSP(cmd *cobra.Command, args []string) {
 		cmd.Usage()
 		return
 	}
-	serviceID := args[0]
-	deleteURL := serviceGCSafepointPrefix + "/" + serviceID
-	r, err := doRequest(cmd, deleteURL, http.MethodDelete, http.Header{})
+	// serviceID := args[0]
+	// deleteURL := serviceGCSafepointPrefix + "/" + serviceID
+	// r, err := doRequest(cmd, deleteURL, http.MethodDelete, http.Header{})
+	r, err := PDCli.DeleteGCSafePoint(cmd.Context(), args[0])
 	if err != nil {
 		cmd.Printf("Failed to delete service GC safepoint: %s\n", err)
 		return