Skip to content

Commit db69e0c

Browse files
abbas1902tpdownes
authored andcommitted
Remove provisioningModel from future reservations
1 parent 346d015 commit db69e0c

File tree

1 file changed

+4
-4
lines changed
  • community/modules/scheduler/schedmd-slurm-gcp-v6-controller/modules/slurm_files/scripts

1 file changed

+4
-4
lines changed

community/modules/scheduler/schedmd-slurm-gcp-v6-controller/modules/slurm_files/scripts/resume.py

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -102,10 +102,10 @@ def instance_properties(nodeset:object, model:str, placement_group:Optional[str]
102102
props.resourcePolicies = [placement_group]
103103

104104
if reservation := lookup().nodeset_reservation(nodeset):
105-
update_reservation_props(reservation, props, placement_group, False)
105+
update_reservation_props(reservation, props, placement_group)
106106

107107
if (fr := lookup().future_reservation(nodeset)) and fr.specific:
108-
update_reservation_props(fr.active_reservation, props, placement_group, True)
108+
update_reservation_props(fr.active_reservation, props, placement_group)
109109

110110
if props.resourcePolicies:
111111
props.scheduling.onHostMaintenance = "TERMINATE"
@@ -120,14 +120,14 @@ def instance_properties(nodeset:object, model:str, placement_group:Optional[str]
120120
props.update(nodeset.get("instance_properties") or {})
121121
return props
122122

123-
def update_reservation_props(reservation:object, props:object, placement_group:Optional[str], reservation_from_fr:bool) -> None:
123+
def update_reservation_props(reservation:object, props:object, placement_group:Optional[str]) -> None:
124124
props.reservationAffinity = {
125125
"consumeReservationType": "SPECIFIC_RESERVATION",
126126
"key": f"compute.{util.universe_domain()}/reservation-name",
127127
"values": [reservation.bulk_insert_name],
128128
}
129129

130-
if reservation.dense or reservation_from_fr:
130+
if reservation.dense:
131131
props.scheduling.provisioningModel = "RESERVATION_BOUND"
132132

133133
# Figure out `resourcePolicies`

0 commit comments

Comments
 (0)