github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-26 05:03:09 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #109879 from zzr93/master

Browse Source 
wake up only when pod being added to activeQ
This commit is contained in:
Kubernetes Prow Robot 2022-05-09 09:09:18 -07:00 committed by GitHub
commit b53be1d66e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
pkg/scheduler/internal/queue/scheduling_queue.go
View File

@ -431,7 +431,7 @@ func (p *PriorityQueue) AddUnschedulableIfNotPresent(pInfo *framework.QueuedPodI
func (p *PriorityQueue) flushBackoffQCompleted() { func (p *PriorityQueue) flushBackoffQCompleted() {
p.lock.Lock() p.lock.Lock()
defer p.lock.Unlock() defer p.lock.Unlock()
broadcast := false activated := false
for { for {
rawPodInfo := p.podBackoffQ.Peek() rawPodInfo := p.podBackoffQ.Peek()
if rawPodInfo == nil { if rawPodInfo == nil {
@ -449,10 +449,10 @@ func (p *PriorityQueue) flushBackoffQCompleted() {
} }
p.activeQ.Add(rawPodInfo) p.activeQ.Add(rawPodInfo)
metrics.SchedulerQueueIncomingPods.WithLabelValues("active", BackoffComplete).Inc() metrics.SchedulerQueueIncomingPods.WithLabelValues("active", BackoffComplete).Inc()
broadcast = true activated = true
} }
if broadcast { if activated {
p.cond.Broadcast() p.cond.Broadcast()
} }
} }
@ -624,7 +624,7 @@ func (p *PriorityQueue) MoveAllToActiveOrBackoffQueue(event framework.ClusterEve
// NOTE: this function assumes lock has been acquired in caller // NOTE: this function assumes lock has been acquired in caller
func (p *PriorityQueue) movePodsToActiveOrBackoffQueue(podInfoList []*framework.QueuedPodInfo, event framework.ClusterEvent) { func (p *PriorityQueue) movePodsToActiveOrBackoffQueue(podInfoList []*framework.QueuedPodInfo, event framework.ClusterEvent) {
moved := false activated := false
for _, pInfo := range podInfoList { for _, pInfo := range podInfoList {
// If the event doesn't help making the Pod schedulable, continue. // If the event doesn't help making the Pod schedulable, continue.
// Note: we don't run the check if pInfo.UnschedulablePlugins is nil, which denotes // Note: we don't run the check if pInfo.UnschedulablePlugins is nil, which denotes
@ -633,7 +633,6 @@ func (p *PriorityQueue) movePodsToActiveOrBackoffQueue(podInfoList []*framework.
if len(pInfo.UnschedulablePlugins) != 0 && !p.podMatchesEvent(pInfo, event) { if len(pInfo.UnschedulablePlugins) != 0 && !p.podMatchesEvent(pInfo, event) {
continue continue
} }
moved = true
pod := pInfo.Pod pod := pInfo.Pod
if p.isPodBackingoff(pInfo) { if p.isPodBackingoff(pInfo) {
if err := p.podBackoffQ.Add(pInfo); err != nil { if err := p.podBackoffQ.Add(pInfo); err != nil {
@ -646,13 +645,14 @@ func (p *PriorityQueue) movePodsToActiveOrBackoffQueue(podInfoList []*framework.
if err := p.activeQ.Add(pInfo); err != nil { if err := p.activeQ.Add(pInfo); err != nil {
klog.ErrorS(err, "Error adding pod to the scheduling queue", "pod", klog.KObj(pod)) klog.ErrorS(err, "Error adding pod to the scheduling queue", "pod", klog.KObj(pod))
} else { } else {
activated = true
metrics.SchedulerQueueIncomingPods.WithLabelValues("active", event.Label).Inc() metrics.SchedulerQueueIncomingPods.WithLabelValues("active", event.Label).Inc()
p.unschedulablePods.delete(pod) p.unschedulablePods.delete(pod)
} }
} }
} }
p.moveRequestCycle = p.schedulingCycle p.moveRequestCycle = p.schedulingCycle
if moved { if activated {
p.cond.Broadcast() p.cond.Broadcast()
} }
} }