feat(monitored deploy): Support rollback on failure (#3222)

* feat(monitored deploy): Support rollback on failure Add rollback support to monitored deploy strategy. It's slightly different from the default you get with CreateServerGroup, hence it is removed from there for this strategy * fix(tests): added happy path tests
spinnaker · Oct 15, 2019 · dd5dd1f · dd5dd1f
1 parent 8aba734
commit dd5dd1f
Show file tree

Hide file tree

Showing 9 changed files with 401 additions and 61 deletions.
diff --git a/...groovy/com/netflix/spinnaker/orca/clouddriver/pipeline/cluster/ScaleDownClusterStage.java b/...groovy/com/netflix/spinnaker/orca/clouddriver/pipeline/cluster/ScaleDownClusterStage.java
@@ -21,11 +21,14 @@
 import com.netflix.spinnaker.orca.clouddriver.tasks.cluster.AbstractWaitForClusterWideClouddriverTask;
 import com.netflix.spinnaker.orca.clouddriver.tasks.cluster.ScaleDownClusterTask;
 import com.netflix.spinnaker.orca.clouddriver.tasks.cluster.WaitForScaleDownClusterTask;
+import com.netflix.spinnaker.orca.pipeline.StageDefinitionBuilder;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 
 @Component
 public class ScaleDownClusterStage extends AbstractClusterWideClouddriverOperationStage {
+  public static final String PIPELINE_CONFIG_TYPE =
+      StageDefinitionBuilder.getType(ScaleDownClusterStage.class);
 
   @Autowired
   public ScaleDownClusterStage(DynamicConfigService dynamicConfigService) {

diff --git a/...ix/spinnaker/orca/clouddriver/pipeline/monitoreddeploy/EvaluateDeploymentHealthStage.java b/...ix/spinnaker/orca/clouddriver/pipeline/monitoreddeploy/EvaluateDeploymentHealthStage.java
@@ -39,6 +39,9 @@
 @Component
 @ConditionalOnProperty(value = "monitored-deploy.enabled")
 public class EvaluateDeploymentHealthStage implements StageDefinitionBuilder {
+  public static final String PIPELINE_CONFIG_TYPE =
+      StageDefinitionBuilder.getType(EvaluateDeploymentHealthStage.class);
+
   @Override
   public void taskGraph(Stage stage, TaskNode.Builder builder) {
     builder.withTask("evaluateDeploymentHealth", EvaluateDeploymentHealthTask.class);

diff --git a/...tflix/spinnaker/orca/clouddriver/pipeline/monitoreddeploy/NotifyDeployCompletedStage.java b/...tflix/spinnaker/orca/clouddriver/pipeline/monitoreddeploy/NotifyDeployCompletedStage.java
@@ -34,6 +34,9 @@
 @Component
 @ConditionalOnProperty(value = "monitored-deploy.enabled")
 public class NotifyDeployCompletedStage implements StageDefinitionBuilder {
+  public static final String PIPELINE_CONFIG_TYPE =
+      StageDefinitionBuilder.getType(NotifyDeployCompletedStage.class);
+
   @Override
   public void taskGraph(Stage stage, TaskNode.Builder builder) {
     builder.withTask("notifyDeployCompleted", NotifyDeployCompletedTask.class);

diff --git a/...etflix/spinnaker/orca/clouddriver/pipeline/monitoreddeploy/NotifyDeployStartingStage.java b/...etflix/spinnaker/orca/clouddriver/pipeline/monitoreddeploy/NotifyDeployStartingStage.java
@@ -34,6 +34,9 @@
 @Component
 @ConditionalOnProperty(value = "monitored-deploy.enabled")
 public class NotifyDeployStartingStage implements StageDefinitionBuilder {
+  public static final String PIPELINE_CONFIG_TYPE =
+      StageDefinitionBuilder.getType(NotifyDeployStartingStage.class);
+
   @Override
   public void taskGraph(Stage stage, TaskNode.Builder builder) {
     builder.withTask("notifyDeployStarting", NotifyDeployStartingTask.class);

diff --git a/...com/netflix/spinnaker/orca/clouddriver/pipeline/servergroup/CreateServerGroupStage.groovy b/...com/netflix/spinnaker/orca/clouddriver/pipeline/servergroup/CreateServerGroupStage.groovy
@@ -110,7 +110,7 @@ class CreateServerGroupStage extends AbstractDeployStrategyStage {
     def additionalRollbackContext = [:]
 
     def strategy = Strategy.fromStrategyKey(stageData.strategy)
-    if ((strategy == Strategy.ROLLING_RED_BLACK) || (strategy == Strategy.MONITORED)) {
+    if (strategy == Strategy.ROLLING_RED_BLACK) {
       // rollback is always supported regardless of where the failure occurred
       strategySupportsRollback = true
       additionalRollbackContext.enableAndDisableOnly = true
@@ -156,7 +156,7 @@ class CreateServerGroupStage extends AbstractDeployStrategyStage {
     super.onFailureStages(stage, graph)
   }
 
-  private static class StageData {
+  static class StageData {
     String application
     String account
     String credentials
@@ -186,7 +186,7 @@ class CreateServerGroupStage extends AbstractDeployStrategyStage {
     }
   }
 
-  private static class Rollback {
+  static class Rollback {
     Boolean onFailure
     Boolean destroyLatest
   }

diff --git a/.../netflix/spinnaker/orca/clouddriver/pipeline/servergroup/rollback/ExplicitRollback.groovy b/.../netflix/spinnaker/orca/clouddriver/pipeline/servergroup/rollback/ExplicitRollback.groovy
@@ -91,7 +91,7 @@ class ExplicitRollback implements Rollback {
     Map disableServerGroupContext = new HashMap(parentStage.context)
     disableServerGroupContext.serverGroupName = rollbackServerGroupName
     def disableServerGroupStage = newStage(
-      parentStage.execution, disableServerGroupStage.type, "disable", disableServerGroupContext, parentStage, SyntheticStageOwner.STAGE_AFTER
+      parentStage.execution, disableServerGroupStage.type, "Disable ${disableServerGroupContext.serverGroupName} due to rollback", disableServerGroupContext, parentStage, SyntheticStageOwner.STAGE_AFTER
     )
 
     if (disableOnly) {
@@ -105,7 +105,7 @@ class ExplicitRollback implements Rollback {
     enableServerGroupContext.targetHealthyDeployPercentage = targetHealthyRollbackPercentage
     enableServerGroupContext.serverGroupName = restoreServerGroupName
     def enableServerGroupStage = newStage(
-      parentStage.execution, enableServerGroupStage.type, "enable", enableServerGroupContext, parentStage, SyntheticStageOwner.STAGE_AFTER
+      parentStage.execution, enableServerGroupStage.type, "Enable ${enableServerGroupContext.serverGroupName} due to rollback", enableServerGroupContext, parentStage, SyntheticStageOwner.STAGE_AFTER
     )
 
     if (enableAndDisableOnly) {
@@ -254,7 +254,7 @@ class ExplicitRollback implements Rollback {
     return newStage(
       parentStage.execution,
       applySourceServerGroupCapacityStage.type,
-      "Restore Min Capacity From Snapshot",
+      "Restore Min Capacity From Snapshot due to rollback",
       applySourceServerGroupCapacityContext,
       parentStage,
       SyntheticStageOwner.STAGE_AFTER