Merge pull request kubernetes#90542 from lixiang233/master

k8s-ci-robot · web-flow · commit 4099ad6e0db5 · 2020-04-28T12:58:25.000-07:00
There's no need to set moveRequestCycle and do broadcast twice.
diff --git a/pkg/scheduler/internal/queue/scheduling_queue.go b/pkg/scheduler/internal/queue/scheduling_queue.go
@@ -499,8 +499,6 @@ func (p *PriorityQueue) MoveAllToActiveOrBackoffQueue(event string) {
 		unschedulablePods = append(unschedulablePods, pInfo)
 	}
 	p.movePodsToActiveOrBackoffQueue(unschedulablePods, event)
-	p.moveRequestCycle = p.schedulingCycle
-	p.cond.Broadcast()
 }
 
 // NOTE: this function assumes lock has been acquired in caller

Original file line number	Diff line number	Diff line change
`@@ -499,8 +499,6 @@ func (p *PriorityQueue) MoveAllToActiveOrBackoffQueue(event string) {`
`499`	`499`	`unschedulablePods = append(unschedulablePods, pInfo)`
`500`	`500`	`}`
`501`	`501`	`p.movePodsToActiveOrBackoffQueue(unschedulablePods, event)`
`502`		`- p.moveRequestCycle = p.schedulingCycle`
`503`		`- p.cond.Broadcast()`
`504`	`502`	`}`
`505`	`503`
`506`	`504`	`// NOTE: this function assumes lock has been acquired in caller`