Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[YUNIKORN-2808] E2E test Verify_preemption_on_priority_queue test is … #955

Closed
wants to merge 2 commits into from
Closed

[YUNIKORN-2808] E2E test Verify_preemption_on_priority_queue test is … #955

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b380a29
[YUNIKORN-2808] E2E test Verify_preemption_on_priority_queue test is …
manirajv06 Aug 23, 2024
0cb6b73
Run the tests for many versions
manirajv06 Aug 23, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/pre-commit.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ jobs:
strategy:
fail-fast: false
matrix:
k8s: [v1.31.0]
k8s: [v1.31.0, v1.30.0, v1.29.4, v1.28.9, v1.27.13, v1.26.15, v1.25.16, v1.24.17]
plugin: [""]
steps:
- name: Checkout yunikorn-k8shim source code
Expand Down
19 changes: 19 additions & 0 deletions pkg/scheduler/objects/preemption.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -176,6 +176,11 @@ func (p *Preemptor) initWorkingState() {
p.allocationsByNode = allocationsByNode
p.queueByAlloc = queueByAlloc
p.nodeAvailableMap = nodeAvailableMap
log.Log(log.SchedPreemption).Info("Preemption triggered based on working state", zap.String("ask", p.ask.GetAllocationKey()),
zap.String("ask queue path", p.queuePath),
zap.Int("allocationsByNode", len(p.allocationsByNode)),
zap.Int("queueByAlloc", len(p.queueByAlloc)),
zap.Int("nodeAvailableMap", len(p.nodeAvailableMap)))
}

// checkPreemptionQueueGuarantees verifies that it's possible to free enough resources to fit the given ask
Expand All @@ -198,6 +203,8 @@ func (p *Preemptor) checkPreemptionQueueGuarantees() bool {
snapshot.RemoveAllocation(alloc.GetAllocatedResource())
remaining := currentQueue.GetRemainingGuaranteedResource()
if remaining != nil && resources.StrictlyGreaterThanOrEquals(remaining, resources.Zero) {
log.Log(log.SchedPreemption).Info("Preemption Queue Guarantees check has passed", zap.String("ask", p.ask.GetAllocationKey()),
zap.String("ask queue path", p.queuePath))
return true
}
}
Expand Down Expand Up @@ -530,6 +537,10 @@ func (p *Preemptor) tryNodes() (string, []*Allocation, bool) {
}
// identify which victims and in which order should be tried
if idx, victims := p.calculateVictimsByNode(nodeAvailable, allocations); victims != nil {
log.Log(log.SchedPreemption).Info("Node wise Potential victims collected for preemption", zap.String("ask", p.ask.GetAllocationKey()),
zap.String("ask queue path", p.queuePath),
zap.String("node", nodeID),
zap.Int("victims count", len(victims)))
victimsByNode[nodeID] = victims
keys := make([]string, 0)
for _, victim := range victims {
Expand Down Expand Up @@ -569,13 +580,21 @@ func (p *Preemptor) TryPreemption() (*AllocationResult, bool) {
// no preemption possible
return nil, false
}
log.Log(log.SchedPreemption).Info("Node chosen for preemption", zap.String("ask", p.ask.GetAllocationKey()),
zap.String("ask queue path", p.queuePath),
zap.String("node", nodeID),
zap.Int("victims count", len(victims)))

// look for additional victims in case we have not yet made enough capacity in the queue
extraVictims, ok := p.calculateAdditionalVictims(victims)
if !ok {
// not enough resources were preempted
return nil, false
}
log.Log(log.SchedPreemption).Info("Additional victims chosen for preemption", zap.String("ask", p.ask.GetAllocationKey()),
zap.String("ask queue path", p.queuePath),
zap.String("node", nodeID),
zap.Int("additional victims count", len(extraVictims)))
victims = append(victims, extraVictims...)
if len(victims) == 0 {
return nil, false
Expand Down
Loading