server/balancer: don't care score if not enough replicas (#501)

If a region has not enough replicas, we just add replicas to any available stores.
tikv · Feb 13, 2017 · bf2e914 · bf2e914
1 parent 7c90c0b
commit bf2e914
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
diff --git a/server/balancer.go b/server/balancer.go
@@ -167,7 +167,7 @@ func (r *replicaChecker) Check(region *regionInfo) Operator {
 	}
 
 	if len(region.GetPeers()) < r.rep.GetMaxReplicas() {
-		newPeer, _ := r.selectBestPeer(region)
+		newPeer, _ := r.selectBestPeer(region, r.filters...)
 		if newPeer == nil {
 			return nil
 		}

diff --git a/server/balancer_test.go b/server/balancer_test.go
@@ -353,22 +353,22 @@ func (s *testReplicaCheckerSuite) TestBasic(c *C) {
 	checkAddPeer(c, rc.Check(region), 4)
 
 	// Test healthFilter.
-	// If store 4 is down, we wait.
+	// If store 4 is down, we add to store 3.
 	tc.setStoreDown(4)
-	c.Assert(rc.Check(region), IsNil)
+	checkAddPeer(c, rc.Check(region), 3)
 	tc.setStoreUp(4)
 	checkAddPeer(c, rc.Check(region), 4)
 
 	// Test snapshotCountFilter.
-	// If snapshotCount > MaxSnapshotCount, we can not add peer.
+	// If snapshotCount > MaxSnapshotCount, we add to store 3.
 	tc.updateSnapshotCount(4, 3)
-	c.Assert(rc.Check(region), IsNil)
+	checkAddPeer(c, rc.Check(region), 3)
 	// If snapshotCount < MaxSnapshotCount, we can add peer again.
 	tc.updateSnapshotCount(4, 1)
 	checkAddPeer(c, rc.Check(region), 4)
 
 	// Test storageThresholdFilter.
-	// If storage ratio > storageRatioThreshold, we can not add peer.
+	// If storage ratio > storageRatioThreshold, we add to store 3.
 	tc.addRegionStore(4, 1, 0.9)
 	checkAddPeer(c, rc.Check(region), 3)
 	// If storage ratio < storageRatioThreshold, we can add peer again.