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

Fix a race when closing activeQ

Browse Source
This commit is contained in:
Maciej Skoczeń 2025-03-18 09:18:48 +00:00
parent 6396fa0f77
commit 1be3f8961b
1 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
pkg/scheduler/backend/queue/active_queue.go
View File

@ -402,6 +402,12 @@ func (aq *activeQueue) done(pod types.UID) {
aq.lock.Lock() aq.lock.Lock()
defer aq.lock.Unlock() defer aq.lock.Unlock()
aq.unlockedDone(pod)
}
// unlockedDone is used by the activeQueue internally and doesn't take the lock itself.
// It assumes the lock is already taken outside before the method is called.
func (aq *activeQueue) unlockedDone(pod types.UID) {
inFlightPod, ok := aq.inFlightPods[pod] inFlightPod, ok := aq.inFlightPods[pod]
if !ok { if !ok {
// This Pod is already done()ed. // This Pod is already done()ed.
@ -446,15 +452,15 @@ func (aq *activeQueue) done(pod types.UID) {
// close closes the activeQueue. // close closes the activeQueue.
func (aq *activeQueue) close() { func (aq *activeQueue) close() {
aq.lock.Lock()
defer aq.lock.Unlock()
// We should call done() for all in-flight pods to clean up the inFlightEvents metrics. // We should call done() for all in-flight pods to clean up the inFlightEvents metrics.
// It's safe even if the binding cycle running asynchronously calls done() afterwards // It's safe even if the binding cycle running asynchronously calls done() afterwards
// done() will just be a no-op. // done() will just be a no-op.
for pod := range aq.inFlightPods { for pod := range aq.inFlightPods {
aq.done(pod) aq.unlockedDone(pod)
} }
aq.lock.Lock()
aq.closed = true aq.closed = true
aq.lock.Unlock()
} }
// broadcast notifies the pop() operation that new pod(s) was added to the activeQueue. // broadcast notifies the pop() operation that new pod(s) was added to the activeQueue.