Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Revert "schedule, server: persist scheduler list to etcd (#769)" #784

Merged
merged 1 commit into from
Oct 7, 2017
Merged

Revert "schedule, server: persist scheduler list to etcd (#769)" #784

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 7 additions & 3 deletions conf/config.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,9 +53,13 @@ replica-schedule-limit = 24

# customized schedulers, the format is as below
# if empty, it will use balance-leader, balance-region, hot-region as default
# [[schedule.schedulers]]
# type = "evict-leader"
# args = ["1"]
[schedule.schedulers]
# [schedule.schedulers.balance-leader]
#
# [schedule.schedulers.balance-region]
#
# [schedule.schedulers.hot-region]



[replication]
Expand Down
2 changes: 1 addition & 1 deletion server/cluster.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -107,7 +107,7 @@ func (c *RaftCluster) start() error {
return nil
}
c.cachedCluster = cluster
c.coordinator = newCoordinator(c.cachedCluster, c.s.scheduleOpt, c.s.hbStreams, c.s.kv)
c.coordinator = newCoordinator(c.cachedCluster, c.s.scheduleOpt, c.s.hbStreams)
c.quit = make(chan struct{})

c.wg.Add(2)
Expand Down
72 changes: 13 additions & 59 deletions server/config.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,6 @@ import (
"flag"
"fmt"
"net/url"
"reflect"
"strings"
"sync/atomic"
"time"
Expand All @@ -28,7 +27,6 @@ import (
"github.com/pingcap/pd/pkg/logutil"
"github.com/pingcap/pd/pkg/metricutil"
"github.com/pingcap/pd/pkg/typeutil"
"github.com/pingcap/pd/server/schedule"
)

// Config is the pd server configuration.
Expand Down Expand Up @@ -289,7 +287,8 @@ func (c *Config) String() string {

// configFromFile loads config from file.
func (c *Config) configFromFile(path string) error {
_, err := toml.DecodeFile(path, c)
meta, err := toml.DecodeFile(path, c)
c.Schedule.Meta = meta
return errors.Trace(err)
}

Expand All @@ -309,29 +308,14 @@ type ScheduleConfig struct {
ReplicaScheduleLimit uint64 `toml:"replica-schedule-limit,omitempty" json:"replica-schedule-limit"`
// Schedulers support for loding customized schedulers
Schedulers SchedulerConfigs `toml:"schedulers,omitempty" json:"schedulers"`
}

func (c *ScheduleConfig) clone() *ScheduleConfig {
schedulers := make(SchedulerConfigs, len(c.Schedulers))
copy(schedulers, c.Schedulers)
return &ScheduleConfig{
MaxSnapshotCount: c.MaxSnapshotCount,
MaxStoreDownTime: c.MaxStoreDownTime,
LeaderScheduleLimit: c.LeaderScheduleLimit,
RegionScheduleLimit: c.RegionScheduleLimit,
ReplicaScheduleLimit: c.ReplicaScheduleLimit,
Schedulers: schedulers,
}
// Meta is meta information return from toml.Decode
// passing it to scheduler handler for supporting customized arguments
Meta toml.MetaData
}

// SchedulerConfigs is a slice of customized scheduler configuration.
type SchedulerConfigs []SchedulerConfig

// SchedulerConfig is customized scheduler configuration
type SchedulerConfig struct {
Type string `toml:"type" json:"type"`
Args []string `toml:"args,omitempty" json:"args"`
}
// SchedulerConfigs is a map of customized scheduler configuration.
type SchedulerConfigs map[string]toml.Primitive

const (
defaultMaxReplicas = 3
Expand All @@ -343,9 +327,9 @@ const (
)

var defaultSchedulers = SchedulerConfigs{
{Type: "balance-region"},
{Type: "balance-leader"},
{Type: "hot-region"},
"balance-region": toml.Primitive{},
"balance-leader": toml.Primitive{},
"hot-region": toml.Primitive{},
}

func (c *ScheduleConfig) adjust() {
Expand All @@ -370,7 +354,7 @@ type ReplicationConfig struct {
}

func (c *ReplicationConfig) clone() *ReplicationConfig {
locationLabels := make(typeutil.StringSlice, len(c.LocationLabels))
locationLabels := make(typeutil.StringSlice, 0, len(c.LocationLabels))
copy(locationLabels, c.LocationLabels)
return &ReplicationConfig{
MaxReplicas: c.MaxReplicas,
Expand Down Expand Up @@ -443,38 +427,8 @@ func (o *scheduleOption) GetSchedulers() SchedulerConfigs {
return o.load().Schedulers
}

func (o *scheduleOption) AddSchedulerCfg(tp string, args []string) error {
c := o.load()
v := c.clone()
for _, schedulerCfg := range v.Schedulers {
// comparing args is to cover the case that there are schedulers in same type but not with same name
// such as two schedulers of type "evict-leader",
// one name is "evict-leader-scheduler-1" and the other is "evict-leader-scheduler-2"
if reflect.DeepEqual(schedulerCfg, SchedulerConfig{tp, args}) {
return nil
}
}
v.Schedulers = append(v.Schedulers, SchedulerConfig{Type: tp, Args: args})
o.store(v)
return nil
}

func (o *scheduleOption) RemoveSchedulerCfg(name string) error {
c := o.load()
v := c.clone()
for i, schedulerCfg := range v.Schedulers {
// To create a temporary scheduler is just used to get scheduler's name
tmp, err := schedule.CreateScheduler(schedulerCfg.Type, o, schedulerCfg.Args...)
if err != nil {
return errors.Trace(err)
}
if tmp.GetName() == name {
v.Schedulers = append(v.Schedulers[:i], v.Schedulers[i+1:]...)
o.store(v)
return nil
}
}
return nil
func (o *scheduleOption) GetMeta() toml.MetaData {
return o.load().Meta
}

func (o *scheduleOption) persist(kv *kv) error {
Expand Down
42 changes: 10 additions & 32 deletions server/coordinator.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,10 +68,9 @@ type coordinator struct {
schedulers map[string]*scheduleController
histories cache.Cache
hbStreams *heartbeatStreams
kv *kv
}

func newCoordinator(cluster *clusterInfo, opt *scheduleOption, hbStreams *heartbeatStreams, kv *kv) *coordinator {
func newCoordinator(cluster *clusterInfo, opt *scheduleOption, hbStreams *heartbeatStreams) *coordinator {
ctx, cancel := context.WithCancel(context.Background())
return &coordinator{
ctx: ctx,
Expand All @@ -84,7 +83,6 @@ func newCoordinator(cluster *clusterInfo, opt *scheduleOption, hbStreams *heartb
schedulers: make(map[string]*scheduleController),
histories: cache.NewDefaultCache(historiesCacheSize),
hbStreams: hbStreams,
kv: kv,
}
}

Expand Down Expand Up @@ -135,32 +133,19 @@ func (c *coordinator) run() {
}
log.Info("coordinator: Run scheduler")

k := 0
scheduleCfg := c.opt.load()
for _, schedulerCfg := range scheduleCfg.Schedulers {
s, err := schedule.CreateScheduler(schedulerCfg.Type, c.opt, schedulerCfg.Args...)
for name := range c.opt.GetSchedulers() {
// note: CreateScheduler just needs specific scheduler config
// so schedulers(a map of scheduler configs) wrapped by c.opt has redundant configs
s, err := schedule.CreateScheduler(name, c.opt)
if err != nil {
log.Errorf("can not create scheduler %s: %v", schedulerCfg.Type, err)
log.Errorf("can not create scheduler %s: %v", name, err)
} else {
log.Infof("create scheduler %s", s.GetName())
if err = c.addScheduler(s, s.GetInterval(), schedulerCfg.Args...); err != nil {
log.Errorf("can not add scheduler %s: %v", s.GetName(), err)
log.Infof("create scheduler %s", name)
if err := c.addScheduler(s, s.GetInterval()); err != nil {
log.Errorf("can not add scheduler %s: %v", name, err)
}
}

// only record valid scheduler config
if err == nil {
scheduleCfg.Schedulers[k] = schedulerCfg
k++
}
}

// remove invalid scheduler config and persist
scheduleCfg.Schedulers = scheduleCfg.Schedulers[:k]
if err := c.opt.persist(c.kv); err != nil {
log.Errorf("can't persist schedule config: %v", err)
}

}

func (c *coordinator) stop() {
Expand Down Expand Up @@ -269,7 +254,7 @@ func (c *coordinator) shouldRun() bool {
return c.cluster.isPrepared()
}

func (c *coordinator) addScheduler(scheduler schedule.Scheduler, interval time.Duration, args ...string) error {
func (c *coordinator) addScheduler(scheduler schedule.Scheduler, interval time.Duration) error {
c.Lock()
defer c.Unlock()

Expand All @@ -285,8 +270,6 @@ func (c *coordinator) addScheduler(scheduler schedule.Scheduler, interval time.D
c.wg.Add(1)
go c.runScheduler(s)
c.schedulers[s.GetName()] = s
c.opt.AddSchedulerCfg(s.GetType(), args)

return nil
}

Expand All @@ -301,11 +284,6 @@ func (c *coordinator) removeScheduler(name string) error {

s.Stop()
delete(c.schedulers, name)

if err := c.opt.RemoveSchedulerCfg(name); err != nil {
return errors.Trace(err)
}

return nil
}

Expand Down
Loading