Merge branch 'master' into keyspace-group-API

tikv · Mar 29, 2023 · a1f7126 · a1f7126
2 parents 67afab6 + 34949b8
commit a1f7126
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/client/resource_group/controller/limiter.go b/client/resource_group/controller/limiter.go
@@ -243,7 +243,7 @@ func (lim *Limiter) maybeNotify() {
 }
 
 func (lim *Limiter) isLowTokensLocked() bool {
-	if lim.isLowProcess || (lim.notifyThreshold > 0 && lim.tokens < lim.notifyThreshold) {
+	if lim.burst >= 0 && (lim.isLowProcess || (lim.notifyThreshold > 0 && lim.tokens < lim.notifyThreshold)) {
 		return true
 	}
 	return false

diff --git a/pkg/schedule/placement/label_constraint.go b/pkg/schedule/placement/label_constraint.go
@@ -72,6 +72,7 @@ var legacyExclusiveLabels = []string{core.EngineKey, "exclusive"}
 // If a store has exclusiveLabels, it can only be selected when the label is
 // explicitly specified in constraints.
 func isExclusiveLabel(key string) bool {
+	// *Do not* change this behavior, we rely on it to physically isolate stores.
 	return strings.HasPrefix(key, "$") || slice.AnyOf(legacyExclusiveLabels, func(i int) bool {
 		return key == legacyExclusiveLabels[i]
 	})