Skip to content

Commit 84e453d

Browse files
authored
add preemptable candidates (#493)
* add preemptable candidates * Revert "add preemptable candidates" This reverts commit da08c4a. * Revert "Revert "add preemptable candidates"" This reverts commit 4d0da32. * address review
1 parent edce2c4 commit 84e453d

File tree

1 file changed

+8
-3
lines changed

1 file changed

+8
-3
lines changed

pkg/controller/queuejob/queuejob_controller_ex.go

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -955,9 +955,6 @@ func (qjm *XController) getAggregatedAvailableResourcesPriority(unallocatedClust
955955
continue
956956
}
957957

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

963960
err := qjm.qjobResControls[arbv1.ResourceTypePod].UpdateQueueJobStatus(value)
@@ -969,6 +966,8 @@ func (qjm *XController) getAggregatedAvailableResourcesPriority(unallocatedClust
969966
klog.V(10).Infof("[getAggAvaiResPri] total resources consumed by Appwrapper %v when lower priority compared to target are %v", value.Name, totalResource)
970967
preemptable = preemptable.Add(totalResource)
971968
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)
969+
queueJobKey, _ := GetQueueJobKey(value)
970+
addPreemptableAWs(preemptableAWs, value, queueJobKey, preemptableAWsMap)
972971
continue
973972
} else if qjm.isDispatcher {
974973
// Dispatcher job does not currently track pod states. This is
@@ -1017,6 +1016,12 @@ func (qjm *XController) getAggregatedAvailableResourcesPriority(unallocatedClust
10171016
return r, proposedPremptions
10181017
}
10191018

1019+
func addPreemptableAWs(preemptableAWs map[float64][]string, value *arbv1.AppWrapper, queueJobKey string, preemptableAWsMap map[string]*arbv1.AppWrapper) {
1020+
preemptableAWs[value.Status.SystemPriority] = append(preemptableAWs[value.Status.SystemPriority], queueJobKey)
1021+
preemptableAWsMap[queueJobKey] = value
1022+
klog.V(10).Infof("[getAggAvaiResPri] %s: Added %s to candidate preemptable job with priority %f.", time.Now().String(), value.Name, value.Status.SystemPriority)
1023+
}
1024+
10201025
func (qjm *XController) chooseAgent(qj *arbv1.AppWrapper) string {
10211026

10221027
qjAggrResources := qjm.GetAggregatedResources(qj)

0 commit comments

Comments
 (0)