Ensure target server group after stages are added correctly #1170
Conversation
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
robfletcher
commented
Feb 9, 2017
| @@ -43,11 +43,6 @@ class ModifyAwsScalingProcessStage extends TargetServerGroupLinearStageSupport { | |||
| } | |||
|
|
|||
| @Override | |||
| def <T extends Execution> List<Stage<T>> aroundStages(Stage<T> parentStage) { | |||
| return composeTargets(parentStage); | |||
| } | |||
There was a problem hiding this comment.
This is redundant — it does exactly the same thing as in the superclass
robfletcher
commented
Feb 9, 2017
| @@ -36,8 +36,6 @@ class DestroyServerGroupStage extends TargetServerGroupLinearStageSupport { | |||
| @Override | |||
| <T extends Execution<T>> void taskGraph(Stage<T> stage, TaskNode.Builder builder) { | |||
| try { | |||
| composeTargets(stage) | |||
There was a problem hiding this comment.
This was just cruft from long ago. It doesn't need to do this as part of the main stage as it's done in aroundStages
robfletcher
commented
Feb 9, 2017
| return composeTargets(parentStage) | ||
| } | ||
|
|
||
| @Memoized |
There was a problem hiding this comment.
Makes the method safe to be re-entrant. What could go wrong?
robfletcher
commented
Feb 9, 2017
| @@ -39,10 +40,11 @@ abstract class TargetServerGroupLinearStageSupport implements StageDefinitionBui | |||
| String name = this.type | |||
|
|
|||
| @Override | |||
| def <T extends Execution> List<Stage<T>> aroundStages(Stage<T> parentStage) { | |||
| def <T extends Execution<T>> List<Stage<T>> aroundStages(Stage<T> parentStage) { | |||
There was a problem hiding this comment.
Groovy and weird generic signature glitches.
Because `aroundStages` is re-entrant but in the case of TargetServerGroupLinearStageSupport it also mutates the original stage context it was losing the additional regions. I would like to not have the method be re-entrant at all but this should fix things for now.
|
fabulous, lets see what happens! |
cfieber
approved these changes
Feb 9, 2017
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
Tactical fix for SPIN-2298
Because
aroundStagesis re-entrant but in the case of TargetServerGroupLinearStageSupport it also mutates the original stage context it was losing the additional regions. I would like to not have the method be re-entrant at all but this should fix things for now.