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

Jump to bottom

Default to zonal bulkInsert #3005

Merged
merged 1 commit into from
Sep 9, 2024
Merged

Default to zonal bulkInsert #3005

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
43 changes: 21 additions & 22 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 @@ -135,7 +135,6 @@ def create_instances_request(nodes, partition_name, placement_group, job_id=None
model = next(iter(nodes))
nodeset = lookup().node_nodeset(model)
template = lookup().node_template(model)
region = lookup().node_region(model)
partition = lookup().cfg.partitions[partition_name]
log.debug(f"create_instances_request: {model} placement: {placement_group}")

Expand All @@ -159,18 +158,21 @@ def create_instances_request(nodes, partition_name, placement_group, job_id=None
# key is instance name, value overwrites properties
body.perInstanceProperties = {k: per_instance_properties(k) for k in nodes}

body.locationPolicy.locations = {
**{
f"zones/{zone}": {"preference": "ALLOW"}
for zone in nodeset.zone_policy_allow or []
},
**{
f"zones/{zone}": {"preference": "DENY"}
for zone in nodeset.zone_policy_deny or []
},
}
body.locationPolicy.targetShape = nodeset.zone_target_shape
zone_allow = nodeset.zone_policy_allow or []
zone_deny = nodeset.zone_policy_deny or []

if len(zone_allow) == 1: # if only one zone is used, use zonal BulkInsert API, as less prone to errors
api_method = lookup().compute.instances().bulkInsert
method_args = {"zone": zone_allow[0]}
else:
api_method = lookup().compute.regionInstances().bulkInsert
method_args = {"region": lookup().node_region(model)}

body.locationPolicy.locations = {
**{ f"zones/{z}": {"preference": "ALLOW"} for z in zone_allow },
**{ f"zones/{z}": {"preference": "DENY"} for z in zone_deny }}
body.locationPolicy.targetShape = nodeset.zone_target_shape

if lookup().cfg.enable_slurm_gcp_plugins:
slurm_gcp_plugins.pre_instance_bulk_insert(
lkp=lookup(),
Expand All @@ -179,16 +181,13 @@ def create_instances_request(nodes, partition_name, placement_group, job_id=None
request_body=body,
)

request = lookup().compute.regionInstances().bulkInsert(
project=lookup().project, region=region, body=body.to_dict()
)

if log.isEnabledFor(logging.DEBUG):
log.debug(
f"new request: endpoint={request.methodId} nodes={to_hostlist_fast(nodes)}"
)
log_api_request(request)
return request
req = api_method(
project=lookup().project,
body=body.to_dict(),
**method_args)
log.debug(f"new request: endpoint={req.methodId} nodes={to_hostlist_fast(nodes)}")
log_api_request(req)
return req


def group_nodes_bulk(nodes, resume_data=None):
Expand Down
Loading