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

fix(autoscaling): step scaling without adjustment type fails #29158

Merged
merged 6 commits into from
Feb 28, 2024
Merged

fix(autoscaling): step scaling without adjustment type fails #29158

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
8b7ef73
fix(autoscaling): step scaling without adjustmentType fails
go-to-k Jan 20, 2024
5392611
Merge branch 'main' into asg-adjustment-type
go-to-k Feb 11, 2024
760520c
an integ test
go-to-k Feb 20, 2024
91918e4
Update packages/@aws-cdk-testing/framework-integ/test/aws-autoscaling…
go-to-k Feb 25, 2024
d2e0720
Merge branch 'main' into asg-adjustment-type
go-to-k Feb 25, 2024
c40ab28
Merge branch 'main' into asg-adjustment-type
mergify[bot] Feb 28, 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
4 changes: 2 additions & 2 deletions ...-autoscaling/test/integ.asg-step-scaling.js.snapshot/autoscaling-step-scaling.assets.json
View file
Open in desktop

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

93 changes: 93 additions & 0 deletions ...utoscaling/test/integ.asg-step-scaling.js.snapshot/autoscaling-step-scaling.template.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -643,6 +643,99 @@
"Statistic": "Average",
"Threshold": 50
}
},
"ASGStepScalingWithDefaultAdjustmentTypeLowerPolicyA6C1EA33": {
"Type": "AWS::AutoScaling::ScalingPolicy",
"Properties": {
"AdjustmentType": "ChangeInCapacity",
"AutoScalingGroupName": {
"Ref": "ASG46ED3070"
},
"MetricAggregationType": "Maximum",
"PolicyType": "StepScaling",
"StepAdjustments": [
{
"MetricIntervalUpperBound": 0,
"ScalingAdjustment": -1
}
]
}
},
"ASGStepScalingWithDefaultAdjustmentTypeLowerAlarmF9F52487": {
"Type": "AWS::CloudWatch::Alarm",
"Properties": {
"AlarmActions": [
{
"Ref": "ASGStepScalingWithDefaultAdjustmentTypeLowerPolicyA6C1EA33"
}
],
"AlarmDescription": "Lower threshold scaling alarm",
"ComparisonOperator": "LessThanOrEqualToThreshold",
"DatapointsToAlarm": 5,
"Dimensions": [
{
"Name": "AutoScalingGroupName",
"Value": {
"Ref": "ASG46ED3070"
}
}
],
"EvaluationPeriods": 10,
"MetricName": "DiskWriteOps",
"Namespace": "AWS/EC2",
"Period": 300,
"Statistic": "Average",
"Threshold": 100
}
},
"ASGStepScalingWithDefaultAdjustmentTypeUpperPolicy08CC2D99": {
"Type": "AWS::AutoScaling::ScalingPolicy",
"Properties": {
"AdjustmentType": "ChangeInCapacity",
"AutoScalingGroupName": {
"Ref": "ASG46ED3070"
},
"MetricAggregationType": "Maximum",
"PolicyType": "StepScaling",
"StepAdjustments": [
{
"MetricIntervalLowerBound": 0,
"MetricIntervalUpperBound": 200,
"ScalingAdjustment": 1
},
{
"MetricIntervalLowerBound": 200,
"ScalingAdjustment": 2
}
]
}
},
"ASGStepScalingWithDefaultAdjustmentTypeUpperAlarm2379E17B": {
"Type": "AWS::CloudWatch::Alarm",
"Properties": {
"AlarmActions": [
{
"Ref": "ASGStepScalingWithDefaultAdjustmentTypeUpperPolicy08CC2D99"
}
],
"AlarmDescription": "Upper threshold scaling alarm",
"ComparisonOperator": "GreaterThanOrEqualToThreshold",
"DatapointsToAlarm": 5,
"Dimensions": [
{
"Name": "AutoScalingGroupName",
"Value": {
"Ref": "ASG46ED3070"
}
}
],
"EvaluationPeriods": 10,
"MetricName": "DiskWriteOps",
"Namespace": "AWS/EC2",
"Period": 300,
"Statistic": "Average",
"Threshold": 300
}
}
},
"Parameters": {
Expand Down
26 changes: 25 additions & 1 deletion ...ramework-integ/test/aws-autoscaling/test/integ.asg-step-scaling.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.

175 changes: 175 additions & 0 deletions ...ng/framework-integ/test/aws-autoscaling/test/integ.asg-step-scaling.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.

12 changes: 12 additions & 0 deletions ...ages/@aws-cdk-testing/framework-integ/test/aws-autoscaling/test/integ.asg-step-scaling.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,18 @@ asg.scaleOnMetric('StepScaling', {
datapointsToAlarm: 5,
metricAggregationType: autoscaling.MetricAggregationType.MAXIMUM,
});
asg.scaleOnMetric('StepScalingWithDefaultAdjustmentType', {
metric: new cloudwatch.Metric({ namespace: 'AWS/EC2', metricName: 'DiskWriteOps', dimensionsMap: { AutoScalingGroupName: asg.autoScalingGroupName } }),
scalingSteps: [
{ upper: 100, change: -1 },
{ lower: 300, change: +1 },
{ lower: 500, change: +2 },
],
// adjustmentType: autoscaling.AdjustmentType.CHANGE_IN_CAPACITY, // adjustmentType is set to CHANGE_IN_CAPACITY by default
go-to-k marked this conversation as resolved.
Show resolved Hide resolved
evaluationPeriods: 10,
datapointsToAlarm: 5,
metricAggregationType: autoscaling.MetricAggregationType.MAXIMUM,
});

new integ.IntegTest(app, 'autoscaling-step-scaling-integ', {
testCases: [stack],
Expand Down
4 changes: 2 additions & 2 deletions packages/aws-cdk-lib/aws-autoscaling/lib/step-scaling-policy.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -147,7 +147,7 @@ export class StepScalingPolicy extends Construct {
const threshold = intervals[alarms.lowerAlarmIntervalIndex].upper;

this.lowerAction = new StepScalingAction(this, 'LowerPolicy', {
adjustmentType: props.adjustmentType,
adjustmentType,
Copy link
Contributor Author

Choose a reason for hiding this comment

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

The property is defined here.

cooldown: props.cooldown,
estimatedInstanceWarmup: props.estimatedInstanceWarmup,
metricAggregationType: props.metricAggregationType ?? aggregationTypeFromMetric(props.metric),
Expand Down Expand Up @@ -179,7 +179,7 @@ export class StepScalingPolicy extends Construct {
const threshold = intervals[alarms.upperAlarmIntervalIndex].lower;

this.upperAction = new StepScalingAction(this, 'UpperPolicy', {
adjustmentType: props.adjustmentType,
adjustmentType,
cooldown: props.cooldown,
estimatedInstanceWarmup: props.estimatedInstanceWarmup,
metricAggregationType: props.metricAggregationType ?? aggregationTypeFromMetric(props.metric),
Expand Down
Loading
Loading