github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-23 11:50:44 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #100638 from tkashem/fix-98697

Browse Source 
apf: fix data race in queueset
This commit is contained in:
Kubernetes Prow Robot 2021-03-30 05:15:57 -07:00 committed by GitHub
commit b6ff1370bd
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
staging/src/k8s.io/apiserver/pkg/util/flowcontrol/fairqueuing/queueset/queueset.go
View File

@ -285,6 +285,11 @@ func (qs *queueSet) StartRequest(ctx context.Context, hashValue uint64, flowDist
// request's context's Done channel gets closed by the time // request's context's Done channel gets closed by the time
// the request is done being processed. // the request is done being processed.
doneCh := ctx.Done() doneCh := ctx.Done()
// Retrieve the queueset configuration name while we have the lock
// and use it in the goroutine below.
configName := qs.qCfg.Name
if doneCh != nil { if doneCh != nil {
qs.preCreateOrUnblockGoroutine() qs.preCreateOrUnblockGoroutine()
go func() { go func() {
@ -297,7 +302,7 @@ func (qs *queueSet) StartRequest(ctx context.Context, hashValue uint64, flowDist
// known that the count does not need to be accurate. // known that the count does not need to be accurate.
// BTW, the count only needs to be accurate in a test that // BTW, the count only needs to be accurate in a test that
// uses FakeEventClock::Run(). // uses FakeEventClock::Run().
klog.V(6).Infof("QS(%s): Context of request %q %#+v %#+v is Done", qs.qCfg.Name, fsName, descr1, descr2) klog.V(6).Infof("QS(%s): Context of request %q %#+v %#+v is Done", configName, fsName, descr1, descr2)
qs.cancelWait(req) qs.cancelWait(req)
qs.goroutineDoneOrBlocked() qs.goroutineDoneOrBlocked()
}() }()