From 928c25784e381b13838c27ce2b9de837d9a49098 Mon Sep 17 00:00:00 2001 From: ti-srebot <66930949+ti-srebot@users.noreply.github.com> Date: Tue, 1 Sep 2020 12:15:24 +0800 Subject: [PATCH] scheduler: fix the issue that some scheduler persist config without solving error (#2817) (#2818) Signed-off-by: ti-srebot --- plugin/scheduler_example/evict_leader.go | 3 +-- server/schedulers/evict_leader.go | 3 +-- server/schedulers/grant_leader.go | 3 +-- server/schedulers/scatter_range.go | 3 +-- 4 files changed, 4 insertions(+), 8 deletions(-) diff --git a/plugin/scheduler_example/evict_leader.go b/plugin/scheduler_example/evict_leader.go index 0f0388a4ad6..b40633dfb2e 100644 --- a/plugin/scheduler_example/evict_leader.go +++ b/plugin/scheduler_example/evict_leader.go @@ -132,8 +132,7 @@ func (conf *evictLeaderSchedulerConfig) Persist() error { if err != nil { return err } - conf.storage.SaveScheduleConfig(name, data) - return nil + return conf.storage.SaveScheduleConfig(name, data) } func (conf *evictLeaderSchedulerConfig) getScheduleName() string { diff --git a/server/schedulers/evict_leader.go b/server/schedulers/evict_leader.go index db64f99057c..de3028caee5 100644 --- a/server/schedulers/evict_leader.go +++ b/server/schedulers/evict_leader.go @@ -120,8 +120,7 @@ func (conf *evictLeaderSchedulerConfig) Persist() error { if err != nil { return err } - conf.storage.SaveScheduleConfig(name, data) - return nil + return conf.storage.SaveScheduleConfig(name, data) } func (conf *evictLeaderSchedulerConfig) getSchedulerName() string { diff --git a/server/schedulers/grant_leader.go b/server/schedulers/grant_leader.go index 8109f8d497a..30e117e6f3b 100644 --- a/server/schedulers/grant_leader.go +++ b/server/schedulers/grant_leader.go @@ -114,8 +114,7 @@ func (conf *grantLeaderSchedulerConfig) Persist() error { if err != nil { return err } - conf.storage.SaveScheduleConfig(name, data) - return nil + return conf.storage.SaveScheduleConfig(name, data) } func (conf *grantLeaderSchedulerConfig) getSchedulerName() string { diff --git a/server/schedulers/scatter_range.go b/server/schedulers/scatter_range.go index 06640d0fbb4..ea08e5a00b0 100644 --- a/server/schedulers/scatter_range.go +++ b/server/schedulers/scatter_range.go @@ -110,8 +110,7 @@ func (conf *scatterRangeSchedulerConfig) Persist() error { if err != nil { return err } - conf.storage.SaveScheduleConfig(name, data) - return nil + return conf.storage.SaveScheduleConfig(name, data) } func (conf *scatterRangeSchedulerConfig) GetRangeName() string {