schdule: exclude offline store in filter source (#983)

tikv · Mar 9, 2018 · c337e36 · c337e36
1 parent cd898ee
commit c337e36
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
diff --git a/server/schedule/filters.go b/server/schedule/filters.go
@@ -95,16 +95,12 @@ func NewStateFilter() Filter {
 	return &stateFilter{}
 }
 
-func (f *stateFilter) filter(store *core.StoreInfo) bool {
-	return !store.IsUp()
-}
-
 func (f *stateFilter) FilterSource(opt Options, store *core.StoreInfo) bool {
-	return f.filter(store)
+	return store.IsTombstone()
 }
 
 func (f *stateFilter) FilterTarget(opt Options, store *core.StoreInfo) bool {
-	return f.filter(store)
+	return !store.IsUp()
 }
 
 type healthFilter struct{}

diff --git a/server/schedulers/balance_test.go b/server/schedulers/balance_test.go
@@ -228,6 +228,10 @@ func (s *testBalanceLeaderSchedulerSuite) TestBalanceFilter(c *C) {
 
 	CheckTransferLeader(c, s.schedule(nil), schedule.OpBalance, 4, 1)
 	// Test stateFilter.
+	// if store 4 is offline, we schould consider it
+	// because it still provides services
+	s.tc.setStoreOffline(4)
+	CheckTransferLeader(c, s.schedule(nil), schedule.OpBalance, 4, 1)
 	// If store 1 is down, it will be filtered,
 	// store 2 becomes the store with least leaders.
 	s.tc.setStoreDown(1)