Skip to content

fix(opensearchservice): wrong iops limit checks #33401

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

Merged
merged 2 commits into from
Feb 12, 2025
Merged

fix(opensearchservice): wrong iops limit checks #33401

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
fe13827
remove iops min-max check
samson-keung Feb 11, 2025
51592a5
Merge branch 'main' into remove-iops-check
mergify[bot] Feb 11, 2025
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
10 changes: 0 additions & 10 deletions packages/aws-cdk-lib/aws-opensearchservice/lib/domain.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1658,16 +1658,6 @@ export class Domain extends DomainBase implements IDomain, ec2.IConnectable {
'`iops` may only be specified if the `volumeType` is `PROVISIONED_IOPS_SSD`, `PROVISIONED_IOPS_SSD_IO2` or `GENERAL_PURPOSE_SSD_GP3`.',
);
}
// Enforce minimum & maximum IOPS:
// https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/aws-properties-ec2-ebs-volume.html
const iopsRanges: { [key: string]: { Min: number; Max: number } } = {};
iopsRanges[ec2.EbsDeviceVolumeType.GENERAL_PURPOSE_SSD_GP3] = { Min: 3000, Max: 16000 };
iopsRanges[ec2.EbsDeviceVolumeType.PROVISIONED_IOPS_SSD] = { Min: 100, Max: 64000 };
iopsRanges[ec2.EbsDeviceVolumeType.PROVISIONED_IOPS_SSD_IO2] = { Min: 100, Max: 64000 };
const { Min, Max } = iopsRanges[volumeType];
if (props.ebs?.iops < Min || props.ebs?.iops > Max) {
throw new Error(`\`${volumeType}\` volumes iops must be between ${Min} and ${Max}.`);
}

// Enforce maximum ratio of IOPS/GiB:
// https://docs.aws.amazon.com/AWSEC2/latest/UserGuide/ebs-volume-types.html
Expand Down
48 changes: 0 additions & 48 deletions packages/aws-cdk-lib/aws-opensearchservice/test/domain.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2558,54 +2558,6 @@ describe('EBS Options Configurations', () => {
new Domain(stack, `Domain${idx++}`, domainProps);
}).toThrow('General Purpose EBS volumes can not be used with Iops or Throughput configuration');

expect(() => {
const domainProps: DomainProps = {
version: EngineVersion.OPENSEARCH_2_5,
ebs: {
volumeSize: 30,
volumeType: EbsDeviceVolumeType.PROVISIONED_IOPS_SSD,
iops: 99,
},
};
new Domain(stack, `Domain${idx++}`, domainProps);
}).toThrow('`io1` volumes iops must be between 100 and 64000.');

expect(() => {
const domainProps: DomainProps = {
version: EngineVersion.OPENSEARCH_2_5,
ebs: {
volumeSize: 30,
volumeType: EbsDeviceVolumeType.PROVISIONED_IOPS_SSD,
iops: 64001,
},
};
new Domain(stack, `Domain${idx++}`, domainProps);
}).toThrow('`io1` volumes iops must be between 100 and 64000.');

expect(() => {
const domainProps: DomainProps = {
version: EngineVersion.OPENSEARCH_2_5,
ebs: {
volumeSize: 30,
volumeType: EbsDeviceVolumeType.GENERAL_PURPOSE_SSD_GP3,
iops: 16001,
},
};
new Domain(stack, `Domain${idx++}`, domainProps);
}).toThrow('`gp3` volumes iops must be between 3000 and 16000.');

expect(() => {
const domainProps: DomainProps = {
version: EngineVersion.OPENSEARCH_2_5,
ebs: {
volumeSize: 30,
volumeType: EbsDeviceVolumeType.GENERAL_PURPOSE_SSD_GP3,
iops: 2999,
},
};
new Domain(stack, `Domain${idx++}`, domainProps);
}).toThrow('`gp3` volumes iops must be between 3000 and 16000.');

expect(() => {
const domainProps: DomainProps = {
version: EngineVersion.OPENSEARCH_2_5,
Expand Down