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

Add provisioningModel for calendar future reservations #3592

Open
wants to merge 1 commit into
base: develop
Choose a base branch
from
+9 −4
Open

Add provisioningModel for calendar future reservations #3592

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
8 changes: 4 additions & 4 deletions ...y/modules/scheduler/schedmd-slurm-gcp-v6-controller/modules/slurm_files/scripts/resume.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -101,11 +101,11 @@ def instance_properties(nodeset:object, model:str, placement_group:Optional[str]
props.resourcePolicies = [placement_group]

if reservation := lookup().nodeset_reservation(nodeset):
update_reservation_props(reservation, props, placement_group)
update_reservation_props(reservation, props, placement_group, calendar_mode=False)

if (fr := lookup().future_reservation(nodeset)) and fr.specific:
assert fr.active_reservation
update_reservation_props(fr.active_reservation, props, placement_group)
update_reservation_props(fr.active_reservation, props, placement_group, fr.calendar)

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

def update_reservation_props(reservation:ReservationDetails, props:NSDict, placement_group:Optional[str]) -> None:
def update_reservation_props(reservation:ReservationDetails, props:NSDict, placement_group:Optional[str], calendar_mode:bool) -> None:
props.reservationAffinity = {
"consumeReservationType": "SPECIFIC_RESERVATION",
"key": f"compute.{util.universe_domain()}/reservation-name",
"values": [reservation.bulk_insert_name],
}

if reservation.dense:
if reservation.dense or calendar_mode:
props.scheduling.provisioningModel = "RESERVATION_BOUND"

# Figure out `resourcePolicies`
Expand Down
5 changes: 5 additions & 0 deletions ...ity/modules/scheduler/schedmd-slurm-gcp-v6-controller/modules/slurm_files/scripts/util.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1313,8 +1313,12 @@ class FutureReservation:
specific: bool
start_time: datetime
end_time: datetime
reservation_mode: Optional[str]
active_reservation: Optional[ReservationDetails]

@property
def calendar(self) -> bool:
return self.reservation_mode == "CALENDAR"

@dataclass
class Job:
Expand Down Expand Up @@ -1681,6 +1685,7 @@ def future_reservation(self, nodeset:object) -> Optional[FutureReservation]:
specific=fr["specificReservationRequired"],
start_time=start_time,
end_time=end_time,
reservation_mode=fr.get("reservationMode"),
active_reservation=active_reservation
)

Expand Down