Skip to content

Commit

Permalink
address the comment
Browse files Browse the repository at this point in the history
Signed-off-by: Cabinfever_B <cabinfeveroier@gmail.com>
  • Loading branch information
CabinfeverB committed Jul 14, 2022
1 parent 94860ac commit 20937fc
Showing 1 changed file with 6 additions and 6 deletions.
12 changes: 6 additions & 6 deletions server/schedule/filter/filters.go
Original file line number Diff line number Diff line change
Expand Up @@ -456,7 +456,7 @@ func (f *StoreStateFilter) anyConditionMatch(typ int, opt *config.PersistOptions
funcs = []conditionFunc{f.isRemoved, f.isRemoving, f.isDown, f.isDisconnected, f.isBusy}
}
for _, cf := range funcs {
if status := cf(opt, store); status != statusOK {
if status := cf(opt, store); !status.IsOK() {
return status
}
}
Expand All @@ -467,12 +467,12 @@ func (f *StoreStateFilter) anyConditionMatch(typ int, opt *config.PersistOptions
// source.
func (f *StoreStateFilter) Source(opts *config.PersistOptions, store *core.StoreInfo) (status plan.Status) {
if f.TransferLeader {
if status = f.anyConditionMatch(leaderSource, opts, store); status != statusOK {
if status = f.anyConditionMatch(leaderSource, opts, store); !status.IsOK() {
return
}
}
if f.MoveRegion {
if status = f.anyConditionMatch(regionSource, opts, store); status != statusOK {
if status = f.anyConditionMatch(regionSource, opts, store); !status.IsOK() {
return
}
}
Expand All @@ -483,17 +483,17 @@ func (f *StoreStateFilter) Source(opts *config.PersistOptions, store *core.Store
// target.
func (f *StoreStateFilter) Target(opts *config.PersistOptions, store *core.StoreInfo) (status plan.Status) {
if f.TransferLeader {
if status = f.anyConditionMatch(leaderTarget, opts, store); status != statusOK {
if status = f.anyConditionMatch(leaderTarget, opts, store); !status.IsOK() {
return
}
}
if f.MoveRegion && f.ScatterRegion {
if status = f.anyConditionMatch(scatterRegionTarget, opts, store); status != statusOK {
if status = f.anyConditionMatch(scatterRegionTarget, opts, store); !status.IsOK() {
return
}
}
if f.MoveRegion && !f.ScatterRegion {
if status = f.anyConditionMatch(regionTarget, opts, store); status != statusOK {
if status = f.anyConditionMatch(regionTarget, opts, store); !status.IsOK() {
return
}
}
Expand Down

0 comments on commit 20937fc

Please sign in to comment.