fit: further optimize the selection of witness rule candidates

pkg/schedule/placement/fit.go

@@ -107,6 +107,7 @@ type RuleFit struct {
 	// IsolationScore indicates at which level of labeling these Peers are
 	// isolated. A larger value is better.
 	IsolationScore float64 `json:"isolation-score"`
+	WitnessScore   int64   `json:"witness-score"`
 	// stores is the stores that the peers are placed in.
 	stores []*core.StoreInfo
 }
@@ -139,6 +140,10 @@ func compareRuleFit(a, b *RuleFit) int {
 		return -1
 	case a.IsolationScore > b.IsolationScore:
 		return 1
+	case a.WitnessScore > b.WitnessScore:
+		return -1
+	case a.WitnessScore < b.WitnessScore:
+		return 1
 	default:
 		return 0
 	}
@@ -333,7 +338,7 @@ func (w *fitWorker) updateOrphanPeers(index int) {
 }
 
 func newRuleFit(rule *Rule, peers []*fitPeer, supportWitness bool) *RuleFit {
-	rf := &RuleFit{Rule: rule, IsolationScore: isolationScore(peers, rule.LocationLabels)}
+	rf := &RuleFit{Rule: rule, IsolationScore: isolationScore(peers, rule.LocationLabels), WitnessScore: witnessScore(peers, supportWitness && rule.IsWitness)}
 	for _, p := range peers {
 		rf.Peers = append(rf.Peers, p.Peer)
 		rf.stores = append(rf.stores, p.store)
@@ -429,3 +434,14 @@ func stateScore(region *core.RegionInfo, peerID uint64) int {
 		return 2
 	}
 }
+
+func witnessScore(peers []*fitPeer, fitWitness bool) int64 {
+	var score int64
+	if !fitWitness || len(peers) == 0 {
+		return 0
+	}
+	for _, p := range peers {
+		score += int64(p.store.GetWitnessCount())
+	}
+	return score
+}