This repository has been archived by the owner on May 14, 2022. It is now read-only.
-
Notifications
You must be signed in to change notification settings - Fork 70
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Step scaling custom dimensions (#1191)
Step scaling custom dimensions support for job auto scaling
- Loading branch information
Showing
7 changed files
with
198 additions
and
9 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
95 changes: 95 additions & 0 deletions
95
titus-api/src/test/java/com/netflix/titus/api/appscale/model/PolicyConfigurationTest.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,95 @@ | ||
| package com.netflix.titus.api.appscale.model; | ||
|
|
||
| import com.netflix.titus.api.json.ObjectMappers; | ||
| import org.junit.Test; | ||
|
|
||
| import static org.assertj.core.api.AssertionsForClassTypes.assertThat; | ||
|
|
||
| public class PolicyConfigurationTest { | ||
| @Test | ||
| public void deserializePolicyConfiguration() { | ||
| String policyConfigStrNoMetricDimensions = "{\n" + | ||
| " \"name\": null,\n" + | ||
| " \"policyType\": \"StepScaling\",\n" + | ||
| " \"stepScalingPolicyConfiguration\": {\n" + | ||
| " \"metricAggregationType\": \"Maximum\",\n" + | ||
| " \"adjustmentType\": \"ChangeInCapacity\",\n" + | ||
| " \"minAdjustmentMagnitude\": null,\n" + | ||
| " \"steps\": [\n" + | ||
| " {\n" + | ||
| " \"scalingAdjustment\": 1,\n" + | ||
| " \"metricIntervalLowerBound\": 0.0,\n" + | ||
| " \"metricIntervalUpperBound\": null\n" + | ||
| " }\n" + | ||
| " ],\n" + | ||
| " \"coolDownSec\": 60\n" + | ||
| " },\n" + | ||
| " \"alarmConfiguration\": {\n" + | ||
| " \"name\": null,\n" + | ||
| " \"region\": null,\n" + | ||
| " \"actionsEnabled\": true,\n" + | ||
| " \"comparisonOperator\": \"GreaterThanThreshold\",\n" + | ||
| " \"evaluationPeriods\": 1,\n" + | ||
| " \"threshold\": 2.0,\n" + | ||
| " \"metricNamespace\": \"titus/integrationTest\",\n" + | ||
| " \"metricName\": \"RequestCount\",\n" + | ||
| " \"statistic\": \"Sum\",\n" + | ||
| " \"periodSec\": 60\n" + | ||
| " },\n" + | ||
| " \"targetTrackingPolicy\": null\n" + | ||
| "}"; | ||
|
|
||
| PolicyConfiguration policyConfigNoMetricDimension = ObjectMappers.readValue(ObjectMappers.appScalePolicyMapper(), | ||
| policyConfigStrNoMetricDimensions, PolicyConfiguration.class); | ||
| assertThat(policyConfigNoMetricDimension).isNotNull(); | ||
| assertThat(policyConfigNoMetricDimension.getAlarmConfiguration().getDimensions()).isNull(); | ||
|
|
||
| String policyConfigStrWithMetricDimensions = "{\n" + | ||
| " \"name\": null,\n" + | ||
| " \"policyType\": \"StepScaling\",\n" + | ||
| " \"stepScalingPolicyConfiguration\": {\n" + | ||
| " \"metricAggregationType\": \"Maximum\",\n" + | ||
| " \"adjustmentType\": \"ChangeInCapacity\",\n" + | ||
| " \"minAdjustmentMagnitude\": null,\n" + | ||
| " \"steps\": [\n" + | ||
| " {\n" + | ||
| " \"scalingAdjustment\": 1,\n" + | ||
| " \"metricIntervalLowerBound\": 0.0,\n" + | ||
| " \"metricIntervalUpperBound\": null\n" + | ||
| " }\n" + | ||
| " ],\n" + | ||
| " \"coolDownSec\": 60\n" + | ||
| " },\n" + | ||
| " \"alarmConfiguration\": {\n" + | ||
| " \"name\": null,\n" + | ||
| " \"region\": null,\n" + | ||
| " \"actionsEnabled\": true,\n" + | ||
| " \"comparisonOperator\": \"GreaterThanThreshold\",\n" + | ||
| " \"evaluationPeriods\": 1,\n" + | ||
| " \"threshold\": 2.0,\n" + | ||
| " \"metricNamespace\": \"titus/integrationTest\",\n" + | ||
| " \"metricName\": \"RequestCount\",\n" + | ||
| " \"statistic\": \"Sum\",\n" + | ||
| " \"periodSec\": 60,\n" + | ||
| " \"unknownField\": 100,\n" + | ||
| " \"dimensions\": [\n" + | ||
| " {\n" + | ||
| " \"Name\": \"foo\",\n" + | ||
| " \"Value\": \"bar\"\n" + | ||
| " },\n" + | ||
| " {\n" + | ||
| " \"Name\": \"tier\",\n" + | ||
| " \"Value\": \"1\"\n" + | ||
| " }\n" + | ||
| " ]\n" + | ||
| " },\n" + | ||
| " \"targetTrackingPolicy\": null\n" + | ||
| "}"; | ||
|
|
||
| PolicyConfiguration policyConfigWithMetricDimensions = ObjectMappers.readValue(ObjectMappers.appScalePolicyMapper(), | ||
| policyConfigStrWithMetricDimensions, PolicyConfiguration.class); | ||
| assertThat(policyConfigWithMetricDimensions).isNotNull(); | ||
| assertThat(policyConfigWithMetricDimensions.getAlarmConfiguration().getDimensions()).isNotNull(); | ||
| assertThat(policyConfigWithMetricDimensions.getAlarmConfiguration().getDimensions().size()).isEqualTo(2); | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
55 changes: 55 additions & 0 deletions
55
titus-ext/aws/src/test/java/com/netflix/titus/ext/aws/cloudwatch/CloudWatchClientTest.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,55 @@ | ||
| package com.netflix.titus.ext.aws.cloudwatch; | ||
|
|
||
| import java.util.Arrays; | ||
| import java.util.List; | ||
|
|
||
| import com.amazonaws.services.cloudwatch.model.Dimension; | ||
| import com.netflix.titus.api.appscale.model.AlarmConfiguration; | ||
| import com.netflix.titus.api.appscale.model.ComparisonOperator; | ||
| import com.netflix.titus.api.appscale.model.MetricDimension; | ||
| import com.netflix.titus.api.appscale.model.Statistic; | ||
| import org.junit.Test; | ||
|
|
||
| import static org.assertj.core.api.AssertionsForClassTypes.assertThat; | ||
|
|
||
| public class CloudWatchClientTest { | ||
|
|
||
| private AlarmConfiguration.Builder getAlarmConfigBuilder() { | ||
| return AlarmConfiguration.newBuilder() | ||
| .withName("alarm-config-1") | ||
| .withMetricName("metric-1") | ||
| .withMetricNamespace("standard") | ||
| .withStatistic(Statistic.Average) | ||
| .withActionsEnabled(true) | ||
| .withPeriodSec(60) | ||
| .withThreshold(5) | ||
| .withEvaluationPeriods(2) | ||
| .withComparisonOperator(ComparisonOperator.GreaterThanOrEqualToThreshold); | ||
| } | ||
|
|
||
| @Test | ||
| public void buildDefaultMetricDimensions() { | ||
| AlarmConfiguration alarmConfiguration = getAlarmConfigBuilder().build(); | ||
| List<Dimension> dimensions = CloudWatchClient.buildMetricDimensions(alarmConfiguration, "foo-bar"); | ||
| assertThat(dimensions).isNotNull(); | ||
| assertThat(dimensions.size()).isEqualTo(1); | ||
| assertThat(dimensions.get(0).getName()).isEqualTo("AutoScalingGroupName"); | ||
| assertThat(dimensions.get(0).getValue()).isEqualTo("foo-bar"); | ||
| } | ||
|
|
||
| @Test | ||
| public void buildCustomMetricDimensions() { | ||
| MetricDimension md1 = MetricDimension.newBuilder().withName("foo").withValue("bar").build(); | ||
| MetricDimension md2 = MetricDimension.newBuilder().withName("service-tier").withValue("1").build(); | ||
| List<MetricDimension> customMetricDimensions = Arrays.asList(md1, md2); | ||
| AlarmConfiguration alarmConfiguration = getAlarmConfigBuilder().withDimensions(customMetricDimensions).build(); | ||
| List<Dimension> dimensions = CloudWatchClient.buildMetricDimensions(alarmConfiguration, "foo-bar"); | ||
| assertThat(dimensions).isNotNull(); | ||
| assertThat(dimensions.size()).isEqualTo(2); | ||
| assertThat(dimensions.get(0).getName()).isEqualTo("foo"); | ||
| assertThat(dimensions.get(0).getValue()).isEqualTo("bar"); | ||
| assertThat(dimensions.get(1).getName()).isEqualTo("service-tier"); | ||
| assertThat(dimensions.get(1).getValue()).isEqualTo("1"); | ||
| } | ||
|
|
||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters