From 0fece290c519761fcaa2efd5e28e8e1de53ef4ae Mon Sep 17 00:00:00 2001 From: okJiang <819421878@qq.com> Date: Fri, 9 Aug 2024 15:39:58 +0800 Subject: [PATCH] Deprecate SchedulersPayload Signed-off-by: okJiang <819421878@qq.com> --- pkg/mcs/scheduling/server/server.go | 8 -------- pkg/schedule/config/config.go | 2 +- server/api/config.go | 1 - server/server.go | 10 ---------- 4 files changed, 1 insertion(+), 20 deletions(-) diff --git a/pkg/mcs/scheduling/server/server.go b/pkg/mcs/scheduling/server/server.go index 50936325f45..eaf29b81fc0 100644 --- a/pkg/mcs/scheduling/server/server.go +++ b/pkg/mcs/scheduling/server/server.go @@ -540,14 +540,6 @@ func (s *Server) GetConfig() *config.Config { cfg.Schedule = *s.persistConfig.GetScheduleConfig().Clone() cfg.Replication = *s.persistConfig.GetReplicationConfig().Clone() cfg.ClusterVersion = *s.persistConfig.GetClusterVersion() - if s.storage == nil { - return cfg - } - sches, configs, err := s.storage.LoadAllSchedulerConfigs() - if err != nil { - return cfg - } - cfg.Schedule.SchedulersPayload = schedulers.ToPayload(sches, configs) return cfg } diff --git a/pkg/schedule/config/config.go b/pkg/schedule/config/config.go index 08bcc57ffe2..518b90e29db 100644 --- a/pkg/schedule/config/config.go +++ b/pkg/schedule/config/config.go @@ -279,6 +279,7 @@ type ScheduleConfig struct { Schedulers SchedulerConfigs `toml:"schedulers" json:"schedulers-v2"` // json v2 is for the sake of compatible upgrade // Only used to display + // Deprecated: not used anymore SchedulersPayload map[string]any `toml:"schedulers-payload" json:"schedulers-payload"` // Controls the time interval between write hot regions info into leveldb. @@ -324,7 +325,6 @@ func (c *ScheduleConfig) Clone() *ScheduleConfig { cfg := *c cfg.StoreLimit = storeLimit cfg.Schedulers = schedulers - cfg.SchedulersPayload = nil return &cfg } diff --git a/server/api/config.go b/server/api/config.go index d280439a988..8db8612eb0e 100644 --- a/server/api/config.go +++ b/server/api/config.go @@ -343,7 +343,6 @@ func (h *confHandler) GetScheduleConfig(w http.ResponseWriter, r *http.Request) h.rd.JSON(w, http.StatusInternalServerError, err.Error()) return } - cfg.Schedule.SchedulersPayload = nil h.rd.JSON(w, http.StatusOK, cfg.Schedule) return } diff --git a/server/server.go b/server/server.go index c10d15e90b1..1e7efa665bc 100644 --- a/server/server.go +++ b/server/server.go @@ -63,7 +63,6 @@ import ( sc "github.com/tikv/pd/pkg/schedule/config" "github.com/tikv/pd/pkg/schedule/hbstream" "github.com/tikv/pd/pkg/schedule/placement" - "github.com/tikv/pd/pkg/schedule/schedulers" "github.com/tikv/pd/pkg/storage" "github.com/tikv/pd/pkg/storage/endpoint" "github.com/tikv/pd/pkg/storage/kv" @@ -982,14 +981,6 @@ func (s *Server) GetConfig() *config.Config { cfg.MicroService = *s.persistOptions.GetMicroServiceConfig().Clone() cfg.LabelProperty = s.persistOptions.GetLabelPropertyConfig().Clone() cfg.ClusterVersion = *s.persistOptions.GetClusterVersion() - if s.storage == nil { - return cfg - } - sches, configs, err := s.storage.LoadAllSchedulerConfigs() - if err != nil { - return cfg - } - cfg.Schedule.SchedulersPayload = schedulers.ToPayload(sches, configs) return cfg } @@ -1054,7 +1045,6 @@ func (s *Server) SetScheduleConfig(cfg sc.ScheduleConfig) error { return err } old := s.persistOptions.GetScheduleConfig() - cfg.SchedulersPayload = nil s.persistOptions.SetScheduleConfig(&cfg) if err := s.persistOptions.Persist(s.storage); err != nil { s.persistOptions.SetScheduleConfig(old)