Merge #130381

craig[bot] · pav-kv · craig[bot] · commit 74678610d54c · 2024-09-10T13:33:30.000Z
130381: replica_rac2: fix unprotected RangeController ref r=kvoli a=pav-kv

The `p.mu.leader.rc` field can not be accessed without holding one of the mutexes protecting it. Use the cached `rd` variable.

Epic: none
Release note: none

Co-authored-by: Pavel Kalinnikov &lt;pavel@cockroachlabs.com&gt;
diff --git a/pkg/kv/kvserver/kvflowcontrol/replica_rac2/processor.go b/pkg/kv/kvserver/kvflowcontrol/replica_rac2/processor.go
@@ -996,7 +996,7 @@ func (p *processorImpl) AdmitForEval(
 		p.opts.EvalWaitMetrics.OnBypassed(workClass, 0 /* duration */)
 		return false, nil
 	}
-	return p.mu.leader.rc.WaitForEval(ctx, pri)
+	return rc.WaitForEval(ctx, pri)
 }
 
 // GetAdmitted implements rac2.AdmittedTracker.

Original file line number	Diff line number	Diff line change
`@@ -996,7 +996,7 @@ func (p *processorImpl) AdmitForEval(`
`996`	`996`	`p.opts.EvalWaitMetrics.OnBypassed(workClass, 0 /* duration */)`
`997`	`997`	`return false, nil`
`998`	`998`	`}`
`999`		`- return p.mu.leader.rc.WaitForEval(ctx, pri)`
	`999`	`+ return rc.WaitForEval(ctx, pri)`
`1000`	`1000`	`}`
`1001`	`1001`
`1002`	`1002`	`// GetAdmitted implements rac2.AdmittedTracker.`