conflict

Signed-off-by: bufferflies <1045931706@qq.com>
bufferflies · bufferflies · Jul 11, 2022 · Jul 13, 2022 · Jul 14, 2022 · Jul 14, 2022
commit d674f5a882b6f2ece3bda12d31166c1b8b74c6e4
diff --git a/go.mod b/go.mod
@@ -176,4 +176,4 @@ require (
 	sigs.k8s.io/yaml v1.1.0 // indirect
 )
 
-replace github.com/pingcap/kvproto v0.0.0-20220805093305-ab1ee4d521ab => github.com/bufferflies/kvproto v0.0.0-20220905085223-a755556a1053
+replace github.com/pingcap/kvproto v0.0.0-20220818063303-5c20f55db5ad => github.com/bufferflies/kvproto v0.0.0-20220905085223-a755556a1053
diff --git a/go.sum b/go.sum
@@ -49,9 +49,7 @@ github.com/bmizerany/assert v0.0.0-20160611221934-b7ed37b82869 h1:DDGfHa7BWjL4Yn
 github.com/bmizerany/assert v0.0.0-20160611221934-b7ed37b82869/go.mod h1:Ekp36dRnpXw/yCqJaO+ZrUyxD+3VXMFFr56k5XYrpB4=
 github.com/breeswish/gin-jwt/v2 v2.6.4-jwt-patch h1:KLE/YeX+9FNaGVW5MtImRVPhjDpfpgJhvkuYWBmOYbo=
 github.com/breeswish/gin-jwt/v2 v2.6.4-jwt-patch/go.mod h1:KjBLriHXe7L6fGceqWzTod8HUB/TP1WWDtfuSYtYXaI=
-github.com/bufferflies/kvproto v0.0.0-20220822072948-2d22d5ad68c3 h1:H4qG9RENpQfn679FByBDS5Z8MA7IwbBCsM08bG85d/Q=
-github.com/bufferflies/kvproto v0.0.0-20220822072948-2d22d5ad68c3/go.mod h1:OYtxs0786qojVTmkVeufx93xe+jUgm56GUYRIKnmaGI=
-github.com/bufferflies/kvproto v0.0.0-20220905065233-ee177f9c41e4/go.mod h1:OYtxs0786qojVTmkVeufx93xe+jUgm56GUYRIKnmaGI=
+github.com/bufferflies/kvproto v0.0.0-20220905085223-a755556a1053 h1:44CC47lCnidk8LzO8a0iFO7je2HJR1w8cUdCwQzMuxE=
 github.com/bufferflies/kvproto v0.0.0-20220905085223-a755556a1053/go.mod h1:OYtxs0786qojVTmkVeufx93xe+jUgm56GUYRIKnmaGI=
 github.com/cakturk/go-netstat v0.0.0-20200220111822-e5b49efee7a5 h1:BjkPE3785EwPhhyuFkbINB+2a1xATwk8SNDWnJiD41g=
 github.com/cakturk/go-netstat v0.0.0-20200220111822-e5b49efee7a5/go.mod h1:jtAfVaU/2cu1+wdSRPWE2c1N2qeAA3K4RH9pYgqwets=

diff --git a/server/schedule/filter/filters.go b/server/schedule/filter/filters.go
@@ -362,6 +362,15 @@ func (f *StoreStateFilter) slowStoreEvicted(opt *config.PersistOptions, store *c
 	return statusOK
 }
 
+func (f *StoreStateFilter) exceedRecvSnapLimit(_ *config.PersistOptions, store *core.StoreInfo) *plan.Status {
+	if !f.AllowTemporaryStates && !store.IsAvailableSnap(storelimit.RecvSnapShot) {
+		f.Reason = "exceed-recv-snapshot-limit"
+		return statusStoreSnapRemoveLimit
+	}
+	f.Reason = ""
+	return statusOK
+}
+
 func (f *StoreStateFilter) isDisconnected(opt *config.PersistOptions, store *core.StoreInfo) *plan.Status {
 	if !f.AllowTemporaryStates && store.IsDisconnected() {
 		f.Reason = "disconnected"
@@ -380,16 +389,7 @@ func (f *StoreStateFilter) isBusy(opt *config.PersistOptions, store *core.StoreI
 	return statusOK
 }
 
-func (f *StoreStateFilter) exceedRecvSnapLimit(_ *config.PersistOptions, store *core.StoreInfo) plan.Status {
-	if !f.AllowTemporaryStates && !store.IsAvailableSnap(storelimit.RecvSnapShot) {
-		f.Reason = "exceed-recv-snapshot-limit"
-		return statusStoreSnapRemoveLimit
-	}
-	f.Reason = ""
-	return statusOK
-}
-
-func (f *StoreStateFilter) exceedRemoveLimit(opt *config.PersistOptions, store *core.StoreInfo) plan.Status {
+func (f *StoreStateFilter) exceedRemoveLimit(opt *config.PersistOptions, store *core.StoreInfo) *plan.Status {
 	if !f.AllowTemporaryStates && !store.IsAvailable(storelimit.RemovePeer) {
 		f.Reason = "exceed-remove-limit"
 		return statusStoreRemoveLimit

diff --git a/server/schedule/filter/status.go b/server/schedule/filter/status.go
@@ -19,26 +19,28 @@ import "github.com/tikv/pd/server/schedule/plan"
 var (
 	statusOK = plan.NewStatus(plan.StatusOK)
 
-	// store filter status
-	statusStoreDown               = plan.NewStatus(plan.StatusStoreUnavailable, "store is lost for longer than 'max-store-down-time' setting")
-	statusStoreTombstone          = plan.NewStatus(plan.StatusStoreUnavailable, "store is tombstone")
-	statusStoreDisconnected       = plan.NewStatus(plan.StatusStoreUnavailable, "store is lost for more than 20s")
-	statusStoreBusy               = plan.NewStatus(plan.StatusStoreUnavailable, "store is busy")
-	statusStoresOffline           = plan.NewStatus(plan.StatusStoreDraining, "store is in the process of offline")
-	statusStoreLowSpace           = plan.NewStatus(plan.StatusStoreLowSpace, "store space is not enough, please scale out or change 'low-space-ratio' setting")
-	statusStoreExcluded           = plan.NewStatus(plan.StatusStoreExcluded, "there has already had a peer or the peer is unhealthy in the store")
-	statusStoreIsolation          = plan.NewStatus(plan.StatusIsolationNotMatch)
-	statusStoreTooManySnapshot    = plan.NewStatus(plan.StatusStoreThrottled, "store snapshot has been piled up, the related setting is 'max-snapshot-count'")
-	statusStoreTooManyPendingPeer = plan.NewStatus(plan.StatusStoreThrottled, "store has too many pending peers, the related setting is 'max-pending-peer-count'")
-	statusStoreAddLimit           = plan.NewStatus(plan.StatusStoreThrottled, "store's add limit is exhausted, please check the setting of 'store limit'")
-	statusStoreRemoveLimit        = plan.NewStatus(plan.StatusStoreThrottled, "store's remove limit is exhausted, please check the setting of 'store limit'")
-	statusStoreSnapRemoveLimit    = plan.NewStatus(plan.StatusStoreThrottled, "store's snapshot remove limit is exhausted'")
-	statusStoreLabel              = plan.NewStatus(plan.StatusLabelNotMatch)
-	statusStoreRule               = plan.NewStatus(plan.StatusRuleNotMatch)
-	statusStorePauseLeader        = plan.NewStatus(plan.StatusStoreBlocked, "the store is not allowed to transfer leader, there might be an evict-leader-scheduler")
-	statusStoreRejectLeader       = plan.NewStatus(plan.StatusStoreBlocked, "the store is not allowed to transfer leader, please check 'label-property'")
-	statusStoreSlow               = plan.NewStatus(plan.StatusStoreBlocked, "the store is slow and are evicting leaders, there might be an evict-slow-store-scheduler")
+	statusStoreScoreDisallowed = plan.NewStatus(plan.StatusStoreScoreDisallowed)
+	statusStoreAlreadyHasPeer  = plan.NewStatus(plan.StatusStoreAlreadyHasPeer)
 
+	// store hard limitation
+	statusStoreDown         = plan.NewStatus(plan.StatusStoreDown)
+	statusStoreRemoved      = plan.NewStatus(plan.StatusStoreRemoved)
+	statusStoreDisconnected = plan.NewStatus(plan.StatusStoreDisconnected)
+	statusStoresRemoving    = plan.NewStatus(plan.StatusStoreRemoving)
+	statusStoreLowSpace     = plan.NewStatus(plan.StatusStoreLowSpace)
+	statusStoreBusy         = plan.NewStatus(plan.StatusStoreBusy)
+
+	// store soft limitation
+	statusStoreSnapshotThrottled    = plan.NewStatus(plan.StatusStoreSnapshotThrottled)
+	statusStorePendingPeerThrottled = plan.NewStatus(plan.StatusStorePendingPeerThrottled)
+	statusStoreAddLimit             = plan.NewStatus(plan.StatusStoreAddLimitThrottled)
+	statusStoreRemoveLimit          = plan.NewStatus(plan.StatusStoreRemoveLimitThrottled)
+	statusStoreSnapRemoveLimit      = plan.NewStatus(plan.StatusStoreSendSnapShotLimitThrottled)
+	// store config limitation
+	statusStoreRejectLeader = plan.NewStatus(plan.StatusStoreRejectLeader)
+
+	statusStoreNotMatchRule      = plan.NewStatus(plan.StatusStoreNotMatchRule)
+	statusStoreNotMatchIsolation = plan.NewStatus(plan.StatusStoreNotMatchIsolation)
 	// region filter status
 	statusRegionPendingPeer   = plan.NewStatus(plan.StatusRegionUnhealthy)
 	statusRegionDownPeer      = plan.NewStatus(plan.StatusRegionUnhealthy)

diff --git a/server/schedule/plan/status.go b/server/schedule/plan/status.go
@@ -43,6 +43,8 @@ const (
 	StatusStoreAddLimitThrottled
 	// StatusStoreRemoveLimitThrottled represents the store cannot be selected due to the remove peer limitation.
 	StatusStoreRemoveLimitThrottled
+
+	StatusStoreSendSnapShotLimitThrottled
 )
 
 // config limitation