This is an automated email from the ASF dual-hosted git repository.
ccondit pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/yunikorn-core.git
The following commit(s) were added to refs/heads/master by this push:
new f51aaba6 [YUNIKORN-2806] Fix deadlock in
Preemptor.findEligiblePreemptionVictims() (#948)
f51aaba6 is described below
commit f51aaba68ff20c93fe3d638b951afc12af5d3119
Author: Craig Condit <[email protected]>
AuthorDate: Thu Aug 15 16:45:12 2024 -0500
[YUNIKORN-2806] Fix deadlock in Preemptor.findEligiblePreemptionVictims()
(#948)
Preemptor.findEligiblePreemptionVictims() needs to disregard apps in the
current queue to avoid a recursive deadlock.
Closes: #948
---
pkg/scheduler/objects/queue.go | 3 +++
1 file changed, 3 insertions(+)
diff --git a/pkg/scheduler/objects/queue.go b/pkg/scheduler/objects/queue.go
index cb11c903..2a277eb6 100644
--- a/pkg/scheduler/objects/queue.go
+++ b/pkg/scheduler/objects/queue.go
@@ -1769,6 +1769,9 @@ func (sq *Queue) findEligiblePreemptionVictims(results
map[string]*QueuePreempti
if sq == nil {
return
}
+ if sq.GetQueuePath() == queuePath {
+ return
+ }
if sq.IsLeafQueue() {
// leaf queue, skip queue if preemption is disabled
if sq.GetPreemptionPolicy() ==
policies.DisabledPreemptionPolicy {
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
