Skip to content

Commit

Permalink
pdctl: address comment
Browse files Browse the repository at this point in the history
  • Loading branch information
nolouch committed Mar 21, 2017
1 parent 470002b commit 32487d2
Showing 1 changed file with 10 additions and 8 deletions.
18 changes: 10 additions & 8 deletions server/kv.go
Original file line number Diff line number Diff line change
Expand Up @@ -90,11 +90,14 @@ func (kv *kv) saveRegion(region *metapb.Region) error {
}

func (kv *kv) loadScheduleOption(opt *scheduleOption) (bool, error) {
cfg, err := kv.loadConfig()
cfg := &Config{}
cfg.Schedule = *opt.load()
cfg.Replication = *opt.rep.load()
isExist, err := kv.loadConfig(cfg)
if err != nil {
return false, errors.Trace(err)
}
if cfg == nil {
if !isExist {
return false, nil
}
opt.store(&cfg.Schedule)
Expand All @@ -117,20 +120,19 @@ func (kv *kv) saveConfig(cfg *Config) error {
return kv.save(kv.configPath, string(value))
}

func (kv *kv) loadConfig() (*Config, error) {
func (kv *kv) loadConfig(cfg *Config) (bool, error) {
value, err := kv.load(kv.configPath)
if err != nil {
return nil, errors.Trace(err)
return false, errors.Trace(err)
}
if value == nil {
return nil, nil
return false, nil
}
cfg := &Config{}
err = json.Unmarshal(value, cfg)
if err != nil {
return nil, errors.Trace(err)
return false, errors.Trace(err)
}
return cfg, nil
return true, nil
}

func (kv *kv) loadStores(stores *storesInfo, rangeLimit int64) error {
Expand Down

0 comments on commit 32487d2

Please sign in to comment.