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

feat(stepfunctions-tasks): add AutoTerminationPolicy.IdleTimeout to EmrCreateCluster #29954

Closed
wants to merge 5 commits into from
Closed

feat(stepfunctions-tasks): add AutoTerminationPolicy.IdleTimeout to EmrCreateCluster #29954

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
db4799f
Add IdleTimeout to StepFn emrCreateCluster Task
valentinlagunes Apr 24, 2024
c194e7d
Merge branch 'main' into addIdleTimeoutStepFn
valentinlagunes Apr 24, 2024
9f48f4e
Adding idleTimout to integ test
valentinlagunes Apr 24, 2024
5212bd3
Fixing formatting
valentinlagunes Apr 24, 2024
39191b3
Merge branch 'main' into addIdleTimeoutStepFn
valentinlagunes Apr 24, 2024
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
2 changes: 1 addition & 1 deletion ...nstance-fleet.js.snapshot/EmrCreateClusterTestDefaultTestDeployAssert697DC891.assets.json
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 3 additions & 3 deletions ...ce-fleet.js.snapshot/aws-cdk-emr-create-cluster-with-on-demand-instance-fleet.assets.json
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion ...-fleet.js.snapshot/aws-cdk-emr-create-cluster-with-on-demand-instance-fleet.template.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -219,7 +219,7 @@
{
"Ref": "EmrCreateClusterServiceRole5251910D"
},
"\",\"ReleaseLabel\":\"emr-5.36.1\",\"Tags\":[{\"Key\":\"Key\",\"Value\":\"Value\"},{\"Key\":\"for-use-with-amazon-emr-managed-policies\",\"Value\":\"true\"}],\"VisibleToAllUsers\":true}}}}"
"\",\"AutoTerminationPolicy\":{\"IdleTimeout\":120},\"ReleaseLabel\":\"emr-6.14.0\",\"Tags\":[{\"Key\":\"Key\",\"Value\":\"Value\"},{\"Key\":\"for-use-with-amazon-emr-managed-policies\",\"Value\":\"true\"}],\"VisibleToAllUsers\":true}}}}"
]
]
},
Expand Down
2 changes: 1 addition & 1 deletion ...tasks/test/emr/integ.emr-create-cluster-with-on-demand-instance-fleet.js.snapshot/cdk.out
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion ...ks/test/emr/integ.emr-create-cluster-with-on-demand-instance-fleet.js.snapshot/integ.json
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions ...test/emr/integ.emr-create-cluster-with-on-demand-instance-fleet.js.snapshot/manifest.json
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

98 changes: 49 additions & 49 deletions ...sks/test/emr/integ.emr-create-cluster-with-on-demand-instance-fleet.js.snapshot/tree.json
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 5 additions & 1 deletion ...ws-stepfunctions-tasks/test/emr/integ.emr-create-cluster-with-on-demand-instance-fleet.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,13 +2,14 @@ import * as sfn from 'aws-cdk-lib/aws-stepfunctions';
import { App, Stack } from 'aws-cdk-lib';
import { IntegTest } from '@aws-cdk/integ-tests-alpha';
import { EmrCreateCluster } from 'aws-cdk-lib/aws-stepfunctions-tasks';
import * as cdk from 'aws-cdk-lib/core';

const app = new App();

const stack = new Stack(app, 'aws-cdk-emr-create-cluster-with-on-demand-instance-fleet');

const step = new EmrCreateCluster(stack, 'EmrCreateCluster', {
releaseLabel: 'emr-5.36.1',
releaseLabel: 'emr-6.14.0',
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Any reason on why we need to update the version? As from the readme, it is mentioned emr release label above 5.30.0 should work.

instances: {
instanceFleets: [{
instanceFleetType: EmrCreateCluster.InstanceRoleType.MASTER,
Expand All @@ -27,6 +28,9 @@ const step = new EmrCreateCluster(stack, 'EmrCreateCluster', {
},
name: 'Cluster',
integrationPattern: sfn.IntegrationPattern.RUN_JOB,
autoTerminationPolicy: {
idleTimeout: cdk.Duration.seconds(120),
},
tags: {
Key: 'Value',
},
Expand Down
15 changes: 15 additions & 0 deletions packages/aws-cdk-lib/aws-stepfunctions-tasks/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -730,6 +730,21 @@ new tasks.EmrCreateCluster(this, 'Create Cluster', {
});
```

If you want to use an [auto-termination policy](https://docs.aws.amazon.com/emr/latest/ManagementGuide/emr-auto-termination-policy.html),
you can specify the `autoTerminationPolicy` property. Set the `idleTimeout` as a `Duration` between 60 seconds and 7 days.
`autoTerminationPolicy` requires the EMR release label to be 5.30.0 or above.

```ts
new tasks.EmrCreateCluster(this, 'Create Cluster', {
instances: {},
name: 'ClusterName',
autoTerminationPolicy: {
idleTimeout: Duration.seconds(120),
},
});
```


### Termination Protection

Locks a cluster (job flow) so the EC2 instances in the cluster cannot be
Expand Down
Loading