Skip to content

Commit 1e72877

Browse files
Hardcode the workernode instance type familes
1 parent 24cc48b commit 1e72877

1 file changed

Lines changed: 11 additions & 5 deletions

File tree

cft-templates/nextflow-advanced.yaml

Lines changed: 11 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,7 @@ Parameters:
8888
Description: Head Node EC2 instance type
8989
Type: String
9090
Default: t2.small
91-
AllowedValues: [t2.nano, t2.micro, t2.small, t2.medium]
91+
AllowedValues: [t2.nano, t2.micro, t2.small, t2.medium, t2.large, m5.8xlarge]
9292
ConstraintDescription: Must be a valid EC2 instance type.
9393
KeyPair:
9494
Description: Name of an existing EC2 KeyPair to enable SSH access to the Head Node. If no key pairs exist, please create one from the button next to the dropdown. Please contact your Administrator if you are unable to create one.
@@ -110,7 +110,7 @@ Parameters:
110110
Description: Specify the instance types to be used to carry out the computation. You can specify one or more family or instance type. The option 'optimal' chooses the best fit of M4, C4, and R4 instance types available in the region.
111111
Type: String
112112
Default: optimal
113-
AllowedValues: [optimal, c4.large, m4.large, r4.large, c4.4xlarge, m4.4xlarge, r4.4xlarge]
113+
AllowedValues: [optimal, c4.large, m4.large, r4.large, c4.4xlarge, m4.4xlarge, r4.4xlarge, r5.8xlarge, r5.12xlarge, r5.16xlarge, r5.24xlarge, c6i.32xlarge]
114114
WorkerNodeEBSVolumeSize:
115115
Description: The initial size of the volume (in GBs) Worker Node EBS will use for storage.
116116
Type: Number
@@ -505,8 +505,7 @@ Resources:
505505
LaunchTemplateId: !Ref EC2LaunchTemplate
506506
Version: $Latest
507507
InstanceRole: !GetAtt BatchInstanceProfile.Arn
508-
InstanceTypes:
509-
- !Ref WorkerNodeInstanceType
508+
InstanceTypes: [c5, c5a, c5ad, c5d, i3, m5, r5, c6i ]
510509
MinvCpus: !Ref ComputeEnvMinvCpus
511510
MaxvCpus: !Ref ComputeEnvMaxvCpus
512511
SecurityGroupIds:
@@ -608,8 +607,15 @@ Resources:
608607
process.container = '${PipelineContainer}'
609608
process.executor = 'awsbatch'
610609
process.queue = '${DefaultQueue}'
611-
workDir = 's3://${S3Bucket}/${AWS::StackName}'
610+
workDir = 's3://${S3Bucket}/${AWS::StackName}'
611+
process.errorStrategy = {
612+
sleep( Math.pow( 2, task.attempt ) * 150 as long )
613+
return 'retry'
614+
}
615+
process.maxRetries = 5
612616
aws.batch.cliPath = '/home/ec2-user/miniconda/bin/aws'
617+
aws.batch.maxParallelTransfers = 5
618+
aws.batch.maxTransferAttempts = 5
613619
}
614620
}
615621

0 commit comments

Comments
 (0)