Skip to content

Commit 147cc10

Browse files
committed
address the comment
Signed-off-by: yisaer <disxiaofei@163.com>
1 parent 521c3f9 commit 147cc10

File tree

2 files changed

+1
-28
lines changed

2 files changed

+1
-28
lines changed

server/schedule/filter/filters.go

Lines changed: 1 addition & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -389,7 +389,7 @@ func (f *StoreStateFilter) anyConditionMatch(typ int, opt *config.PersistOptions
389389
funcs = []conditionFunc{f.isTombstone, f.isOffline, f.isDown, f.isDisconnected, f.isBusy,
390390
f.exceedAddLimit, f.tooManySnapshots, f.tooManyPendingPeers}
391391
case scatterRegionTarget:
392-
funcs = []conditionFunc{f.isTombstone, f.isOffline, f.isDown, f.isDisconnected}
392+
funcs = []conditionFunc{f.isTombstone, f.isOffline, f.isDown, f.isDisconnected, f.isBusy}
393393
}
394394
for _, cf := range funcs {
395395
if cf(opt, store) {
@@ -759,32 +759,6 @@ func (f *isolationFilter) Target(opt *config.PersistOptions, store *core.StoreIn
759759
return true
760760
}
761761

762-
// NewStoreBusyFilter creates storeBusyFilter
763-
func NewStoreBusyFilter(scope string) *storeBusyFilter {
764-
return &storeBusyFilter{scope: scope}
765-
}
766-
767-
// StoreBusyFilter
768-
type storeBusyFilter struct {
769-
scope string
770-
}
771-
772-
func (f *storeBusyFilter) Scope() string {
773-
return f.scope
774-
}
775-
776-
func (f *storeBusyFilter) Type() string {
777-
return "store-busy-filter"
778-
}
779-
780-
func (f *storeBusyFilter) Source(opt *config.PersistOptions, store *core.StoreInfo) bool {
781-
return true
782-
}
783-
784-
func (f *storeBusyFilter) Target(opt *config.PersistOptions, store *core.StoreInfo) bool {
785-
return !store.IsBusy()
786-
}
787-
788762
// createRegionForRuleFit is used to create a clone region with RegionCreateOptions which is only used for
789763
// FitRegion in filter
790764
func createRegionForRuleFit(startKey, endKey []byte,

server/schedule/region_scatterer.go

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -325,7 +325,6 @@ func (r *RegionScatterer) selectCandidates(region *core.RegionInfo, sourceStoreI
325325
scoreGuard := filter.NewPlacementSafeguard(r.name, r.cluster, region, sourceStore)
326326
filters = append(filters, context.filters...)
327327
filters = append(filters, scoreGuard)
328-
filters = append(filters, filter.NewStoreBusyFilter(r.name))
329328
stores := r.cluster.GetStores()
330329
candidates := make([]uint64, 0)
331330
for _, store := range stores {

0 commit comments

Comments
 (0)