fix(RRB): fix NPE introduced in https://github.com/spinnaker/orca/pull/3031 #3050
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
dreynaud
reviewed
Jul 19, 2019
| @@ -122,6 +114,14 @@ class RollingRedBlackStrategy implements Strategy, ApplicationContextAware { | |||
|
|
|||
| Stage parentCreateServerGroupStage = stage.directAncestors().find() { it.type == CreateServerGroupStage.PIPELINE_CONFIG_TYPE } | |||
|
|
|||
| if (parentCreateServerGroupStage.status == ExecutionStatus.NOT_STARTED) { | |||
| // No point in composing the flow if we are called to plan "beforeStages" since we don't have any STAGE_BEFOREs. | |||
There was a problem hiding this comment.
I don't see an explicit connection between the condition being checked and being called to plan beforeStages, can you elaborate?
There was a problem hiding this comment.
There was a problem hiding this comment.
what happens is:
DeployStrategyStage implemented aroundStages which calls our composeFlow
the DeployStrategyStage::aroundStages is called from StageDefinitionBuilder::beforeStages (java) which is called from StageDefinitionBuilder::buildBeforeStages (kotlin), which is called from RunStageHandler
When there is no source server group and a validation pipeline has been specified RRB flow composition will fail (erroneously) trying to construct parameters to be passed into the validation pipeline (even though the source isn't even necessary!). This fix does two things: 1. Correctly calculate parameters passed into the validation pipeline 2. Don't even bother composing the flow if we are being called during the `beforeStages` since all these stages will be discared anyway (none of the stages have `STAGE_BEFORE` synthetic) Medium term: all of this should just go away - we shouldn't be using `aroundStages` which is a source of lots of confusion. I will be refactoring this code to take advantage of newer `beforeStages` and `afterStages`
marchello2000
force-pushed
the
mark/rrb_fix_npe
branch
from
50b568d
to
6ecd0ff
Compare
|
@dreynaud i am going to merge this so we can potentially deploy it on monday. Let me know if you have any comments |
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.
When there is no source server group and a validation pipeline has been specified
RRB flow composition will fail (erroneously) trying to construct parameters to be
passed into the validation pipeline (even though the source isn't even necessary!).
This fix does two things:
beforeStagessince all these stages will be discared anyway (none of the stages have
STAGE_BEFOREsynthetic)Medium term: all of this should just go away - we shouldn't be using
aroundStageswhich is asource of lots of confusion. I will be refactoring this code to take advantage of newer
beforeStagesandafterStages