Skip to content

Allow specifying max vcpus for a particular compute environment #3063

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

Draft
jhkennedy wants to merge 1 commit into
base: develop
Choose a base branch
from
Draft

Allow specifying max vcpus for a particular compute environment #3063

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: 8 additions & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,14 @@ All notable changes to this project will be documented in this file.
The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).

## [10.15.0]

### Added
- Compute environments can now specify maximum vCPU, otherwise the default will be used.

### Changed
- The `ItsLiveSpotIntel` compute environment now has a maximum vCPUs of 16 to prevent ITS_LIVE production from overwhelming the STAC catalog.

## [10.14.4]

### Changed
Expand Down
3 changes: 2 additions & 1 deletion apps/compute-cf.yml.j2
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -110,6 +110,7 @@ Resources:
{% set ami_id = env['ami_id'] if 'ami_id' in env else '!Ref AmiId' %}
{% set type = env['allocation_type'] if 'allocation_type' in env else 'EC2' %}
{% set strategy = env['allocation_strategy'] if 'allocation_strategy' in env else 'BEST_FIT_PROGRESSIVE' %}
{% set max_vcpus = env['max_vcpus'] if 'max_vcpus' in env else '!Ref MaxvCpus' %}
{{ name }}ComputeEnvironment:
Type: AWS::Batch::ComputeEnvironment
Properties:
Expand All @@ -119,7 +120,7 @@ Resources:
Type: {{ type }}
AllocationStrategy: {{ strategy }}
MinvCpus: 0
MaxvCpus: !Ref MaxvCpus
MaxvCpus: {{ max_vcpus }}
InstanceTypes: {{ instance_types }}
ImageId: {{ ami_id }}
Subnets: !Ref SubnetIds
Expand Down
2 changes: 2 additions & 0 deletions job_spec/config/compute_environments.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ compute_environments:
# ami_id
# allocation_type
# allocation_strategy
# max_vcpus
SrgGslc:
instance_types: g6.2xlarge
ami_id: "'{{resolve:ssm:/aws/service/ecs/optimized-ami/amazon-linux-2/gpu/recommended/image_id}}'"
Expand All @@ -14,6 +15,7 @@ compute_environments:
ami_id: "'{{resolve:ssm:/aws/service/ecs/optimized-ami/amazon-linux-2023/recommended/image_id}}'"
allocation_type: SPOT
allocation_strategy: SPOT_PRICE_CAPACITY_OPTIMIZED
max_vcpus: 16
ItsLiveIntel:
instance_types: r8id.xlarge,r8id.2xlarge,r8id.4xlarge,r8id.8xlarge,r8id.12xlarge,r8id.16xlarge
ami_id: "'{{resolve:ssm:/aws/service/ecs/optimized-ami/amazon-linux-2023/recommended/image_id}}'"
Expand Down
Loading