Skip to content

add preemptable candidates #493

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

Merged
merged 4 commits into from
Jul 21, 2023
Merged

add preemptable candidates #493

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
da08c4a
add preemptable candidates
asm582 Jul 18, 2023
4d0da32
Revert "add preemptable candidates"
asm582 Jul 19, 2023
a82a936
Revert "Revert "add preemptable candidates""
asm582 Jul 19, 2023
5b6515d
address review
asm582 Jul 20, 2023
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
11 changes: 8 additions & 3 deletions pkg/controller/queuejob/queuejob_controller_ex.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -954,9 +954,6 @@ func (qjm *XController) getAggregatedAvailableResourcesPriority(unallocatedClust
continue
}

preemptableAWs[value.Status.SystemPriority] = append(preemptableAWs[value.Status.SystemPriority], queueJobKey)
preemptableAWsMap[queueJobKey] = value
klog.V(10).Infof("[getAggAvaiResPri] %s: Added %s to candidate preemptable job with priority %f.", time.Now().String(), value.Name, value.Status.SystemPriority)
}

err := qjm.qjobResControls[arbv1.ResourceTypePod].UpdateQueueJobStatus(value)
Expand All @@ -968,6 +965,8 @@ func (qjm *XController) getAggregatedAvailableResourcesPriority(unallocatedClust
klog.V(10).Infof("[getAggAvaiResPri] total resources consumed by Appwrapper %v when lower priority compared to target are %v", value.Name, totalResource)
preemptable = preemptable.Add(totalResource)
klog.V(6).Infof("[getAggAvaiResPri] %s proirity %v is lower target priority %v reclaiming total preemptable resources %v", value.Name, value.Status.SystemPriority, targetpr, totalResource)
queueJobKey, _ := GetQueueJobKey(value)
addPreemptableAWs(preemptableAWs, value, queueJobKey, preemptableAWsMap)
continue
} else if qjm.isDispatcher {
// Dispatcher job does not currently track pod states. This is
Expand Down Expand Up @@ -1016,6 +1015,12 @@ func (qjm *XController) getAggregatedAvailableResourcesPriority(unallocatedClust
return r, proposedPremptions
}

func addPreemptableAWs(preemptableAWs map[float64][]string, value *arbv1.AppWrapper, queueJobKey string, preemptableAWsMap map[string]*arbv1.AppWrapper) {
preemptableAWs[value.Status.SystemPriority] = append(preemptableAWs[value.Status.SystemPriority], queueJobKey)
preemptableAWsMap[queueJobKey] = value
klog.V(10).Infof("[getAggAvaiResPri] %s: Added %s to candidate preemptable job with priority %f.", time.Now().String(), value.Name, value.Status.SystemPriority)
}

func (qjm *XController) chooseAgent(qj *arbv1.AppWrapper) string {

qjAggrResources := qjm.GetAggregatedResources(qj)
Expand Down