This is an automated cherry-pick of tikv#7108

close tikv#6897

Signed-off-by: ti-chi-bot <ti-community-prow-bot@tidb.io>

pkg/schedule/scheduler.go

@@ -119,16 +119,28 @@ func CreateScheduler(typ string, opController *OperatorController, storage endpo
 		return nil, errs.ErrSchedulerCreateFuncNotRegistered.FastGenByArgs(typ)
 	}
 
+<<<<<<< HEAD:pkg/schedule/scheduler.go
 	s, err := fn(opController, storage, dec)
 	if err != nil {
 		return nil, err
 	}
+=======
+	return fn(oc, storage, dec, removeSchedulerCb...)
+}
+
+// SaveSchedulerConfig saves the config of the specified scheduler.
+func SaveSchedulerConfig(storage endpoint.ConfigStorage, s Scheduler) error {
+>>>>>>> 67529748f (scheduler: fix scheduler save config (#7108)):pkg/schedule/schedulers/scheduler.go
 	data, err := s.EncodeConfig()
 	if err != nil {
-		return nil, err
+		return err
 	}
+<<<<<<< HEAD:pkg/schedule/scheduler.go
 	err = storage.SaveScheduleConfig(s.GetName(), data)
 	return s, err
+=======
+	return storage.SaveSchedulerConfig(s.GetName(), data)
+>>>>>>> 67529748f (scheduler: fix scheduler save config (#7108)):pkg/schedule/schedulers/scheduler.go
 }
 
 // FindSchedulerTypeByName finds the type of the specified name.

pkg/schedule/schedulers/evict_leader.go

@@ -180,7 +180,7 @@ func newEvictLeaderScheduler(opController *schedule.OperatorController, conf *ev
 	}
 }
 
-// EvictStores returns the IDs of the evict-stores.
+// EvictStoreIDs returns the IDs of the evict-stores.
 func (s *evictLeaderScheduler) EvictStoreIDs() []uint64 {
 	return s.conf.getStores()
 }