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

feat(stepfunctions-tasks): additional allocation strategies for spot instance fleets in EmrCreateCluster #28525

Merged
merged 2 commits into from
Dec 30, 2023
Merged

feat(stepfunctions-tasks): additional allocation strategies for spot instance fleets in EmrCreateCluster #28525

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7331e32
feat(stepfunctions-tasks): add new allocation strategies for spot ins…
go-to-k Dec 29, 2023
e392be3
Merge branch 'main' into sfn-task-emr-new-alloc-str
mergify[bot] Dec 30, 2023
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
14 changes: 14 additions & 0 deletions packages/aws-cdk-lib/aws-stepfunctions-tasks/lib/emr/emr-create-cluster.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -684,6 +684,20 @@ export namespace EmrCreateCluster {
* Capacity-optimized, which launches instances from Spot Instance pools with optimal capacity for the number of instances that are launching.
*/
CAPACITY_OPTIMIZED = 'capacity-optimized',
/**
* Price-capacity-optimized, which launches instances from Spot Instance pools with the highest capacity availability for the number of instances that are launching.
*
* Recommended.
*/
PRICE_CAPACITY_OPTIMIZED = 'price-capacity-optimized',
/**
* Lowest-price, which launches instances from the lowest priced pool that has available capacity.
*/
LOWEST_PRICE = 'lowest-price',
/**
* Diversified, which launches instances across all Spot capacity pools.
*/
DIVERSIFIED = 'diversified',
}

/**
Expand Down
13 changes: 9 additions & 4 deletions packages/aws-cdk-lib/aws-stepfunctions-tasks/test/emr/emr-create-cluster.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { Template, Match } from '../../../assertions';
import { Template } from '../../../assertions';
import * as iam from '../../../aws-iam';
import * as sfn from '../../../aws-stepfunctions';
import * as cdk from '../../../core';
Expand Down Expand Up @@ -883,7 +883,12 @@ test('Create Cluster with Instances configuration', () => {
});
});

test('Create Cluster with InstanceFleet with allocation strategy=capacity-optimized for Spot instances', () => {
test.each([
[EmrCreateCluster.SpotAllocationStrategy.CAPACITY_OPTIMIZED, 'capacity-optimized'],
[EmrCreateCluster.SpotAllocationStrategy.PRICE_CAPACITY_OPTIMIZED, 'price-capacity-optimized'],
[EmrCreateCluster.SpotAllocationStrategy.LOWEST_PRICE, 'lowest-price'],
[EmrCreateCluster.SpotAllocationStrategy.DIVERSIFIED, 'diversified'],
])('Create Cluster with InstanceFleet with allocation strategy %s for Spot instances', (strategy, expected) => {
// WHEN
const task = new EmrCreateCluster(stack, 'Task', {
instances: {
Expand Down Expand Up @@ -913,7 +918,7 @@ test('Create Cluster with InstanceFleet with allocation strategy=capacity-optimi
}],
launchSpecifications: {
spotSpecification: {
allocationStrategy: EmrCreateCluster.SpotAllocationStrategy.CAPACITY_OPTIMIZED,
allocationStrategy: strategy,
blockDurationMinutes: 1,
timeoutAction: EmrCreateCluster.SpotTimeoutAction.TERMINATE_CLUSTER,
timeoutDurationMinutes: 5,
Expand Down Expand Up @@ -975,7 +980,7 @@ test('Create Cluster with InstanceFleet with allocation strategy=capacity-optimi
}],
LaunchSpecifications: {
SpotSpecification: {
AllocationStrategy: 'capacity-optimized',
AllocationStrategy: expected,
BlockDurationMinutes: 1,
TimeoutAction: 'TERMINATE_CLUSTER',
TimeoutDurationMinutes: 5,
Expand Down