-
Notifications
You must be signed in to change notification settings - Fork 807
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.
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(upsertScalingPolicyTask): make upsertScalingPolicyTask retryable #2703
Merged
aravindmd
merged 6 commits into
spinnaker:master
from
aravindmd:upsertScalingPolicyTask/retry
Mar 7, 2019
Merged
Changes from 3 commits
Commits
Show all changes
6 commits
Select commit
Hold shift + click to select a range
5c13829
feat(upsertScalingPolicyTask): make upsertScalingPolicyTask retryable
aravindmd fb2bf07
feat(upsertScalingPolicyTask): make upsertScalingPolicyTask retryable
aravindmd 6fc9bd8
Merge branch 'master' into upsertScalingPolicyTask/retry
ajordens 6091523
feat(upsertScalingPolicyTask): make upsertScalingPolicyTask retryable
aravindmd 83bd462
Merge branch 'master' into upsertScalingPolicyTask/retry
aravindmd 3f7747b
Merge branch 'upsertScalingPolicyTask/retry' of github.com:aravindmd/…
aravindmd File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
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
76 changes: 76 additions & 0 deletions
76
...netflix/spinnaker/orca/clouddriver/tasks/scalingpolicy/UpsertScalingPolicyTaskSpec.groovy
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,76 @@ | ||
/* | ||
* Copyright 2019 Netflix, Inc. | ||
* | ||
* Licensed under the Apache License, Version 2.0 (the "License"); | ||
* you may not use this file except in compliance with the License. | ||
* You may obtain a copy of the License at | ||
* | ||
* http://www.apache.org/licenses/LICENSE-2.0 | ||
* | ||
* Unless required by applicable law or agreed to in writing, software | ||
* distributed under the License is distributed on an "AS IS" BASIS, | ||
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
* See the License for the specific language governing permissions and | ||
* limitations under the License. | ||
*/ | ||
package com.netflix.spinnaker.orca.clouddriver.tasks.scalingpolicy | ||
|
||
import com.netflix.spinnaker.orca.clouddriver.KatoService | ||
import com.netflix.spinnaker.orca.clouddriver.model.TaskId | ||
import com.netflix.spinnaker.orca.pipeline.model.Execution | ||
import com.netflix.spinnaker.orca.pipeline.model.Stage | ||
import spock.lang.Shared | ||
import spock.lang.Specification | ||
import spock.lang.Unroll | ||
import rx.Observable | ||
|
||
class UpsertScalingPolicyTaskSpec extends Specification { | ||
|
||
@Shared | ||
def taskId = new TaskId(UUID.randomUUID().toString()) | ||
|
||
@Unroll | ||
def "should retry task on exception"() { | ||
|
||
given: | ||
KatoService katoService = Mock(KatoService) | ||
def task = new UpsertScalingPolicyTask(kato: katoService) | ||
def stage = new Stage(Execution.newPipeline("orca"), "upsertScalingPolicy", | ||
[credentials : "abc", cloudProvider: "aCloud", | ||
estimatedInstanceWarmup : "300", | ||
targetValue : "75", | ||
targetTrackingConfiguration: | ||
[predefinedMetricSpecification: | ||
[predefinedMetricType: "ASGAverageCPUUtilization"]]]) | ||
|
||
when: | ||
def result = task.execute(stage) | ||
|
||
then: | ||
1 * katoService.requestOperations(_, _) >> { throw new Exception() } | ||
result.status.toString() == "RUNNING" | ||
|
||
} | ||
|
||
@Unroll | ||
def "should set the task status to SUCCEEDED for successful execution"() { | ||
|
||
given: | ||
KatoService katoService = Mock(KatoService) | ||
def task = new UpsertScalingPolicyTask(kato: katoService) | ||
def stage = new Stage(Execution.newPipeline("orca"), "upsertScalingPolicy", | ||
[credentials : "abc", cloudProvider: "aCloud", | ||
estimatedInstanceWarmup : "300", | ||
targetValue : "75", | ||
targetTrackingConfiguration: | ||
[predefinedMetricSpecification: | ||
[predefinedMetricType: "ASGAverageCPUUtilization"]]]) | ||
|
||
when: | ||
def result = task.execute(stage) | ||
|
||
then: | ||
1 * katoService.requestOperations(_, _) >> { Observable.from(taskId) } | ||
result.status.toString() == "SUCCEEDED" | ||
} | ||
} |
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Stylistically ... even though this is groovy, let's prefix this with a
return
.It stands out now that it's wrapped inside a try/catch.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
👍