resource_control: fix data race in controller (#7520)

close #4399, ref pingcap/tidb#49311 the meta information is not safe to visit concurrency - address the data race condition Signed-off-by: Shuning Chen <nolouch@ShuningdeMacBook-Pro.local> Co-authored-by: Shuning Chen <nolouch@ShuningdeMacBook-Pro.local>
tikv · Dec 11, 2023 · fcdeec4 · fcdeec4
1 parent ab68192
commit fcdeec4
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/client/resource_group/controller/controller.go b/client/resource_group/controller/controller.go
@@ -1265,7 +1265,7 @@ func (gc *groupCostController) onRequestWait(
 	*gc.mu.storeCounter[info.StoreID()] = *gc.mu.globalCounter
 	gc.mu.Unlock()
 
-	return delta, penalty, waitDuration, gc.meta.Priority, nil
+	return delta, penalty, waitDuration, gc.getMeta().GetPriority(), nil
 }
 
 func (gc *groupCostController) onResponse(

diff --git a/client/resource_group/controller/metrics.go b/client/resource_group/controller/metrics.go
@@ -94,6 +94,7 @@ func init() {
 	prometheus.MustRegister(resourceGroupStatusGauge)
 	prometheus.MustRegister(successfulRequestDuration)
 	prometheus.MustRegister(failedRequestCounter)
+	prometheus.MustRegister(failedLimitReserveDuration)
 	prometheus.MustRegister(requestRetryCounter)
 	prometheus.MustRegister(tokenRequestDuration)
 	prometheus.MustRegister(resourceGroupTokenRequestCounter)