fix(core): Support wait before scaling down in red/black (#1789)

Set `delayBeforeScaleDownSec` in your stage context.
spinnaker · Nov 9, 2017 · f752ad6 · f752ad6
1 parent 7c17d88
commit f752ad6
Show file tree

Hide file tree

Showing 3 changed files with 58 additions and 18 deletions.
diff --git a/...etflix/spinnaker/orca/clouddriver/pipeline/servergroup/strategies/RedBlackStrategy.groovy b/...etflix/spinnaker/orca/clouddriver/pipeline/servergroup/strategies/RedBlackStrategy.groovy
@@ -89,7 +89,7 @@ class RedBlackStrategy implements Strategy, ApplicationContextAware {
       stages << newStage(
         stage.execution,
         waitStage.type,
-        "wait",
+        "Wait Before Disable",
         waitContext,
         stage,
         SyntheticStageOwner.STAGE_AFTER
@@ -110,6 +110,18 @@ class RedBlackStrategy implements Strategy, ApplicationContextAware {
     )
 
     if (stageData.scaleDown) {
+      if(stageData?.getDelayBeforeScaleDown()) {
+        def waitContext = [waitTime: stageData?.getDelayBeforeScaleDown()]
+        stages << newStage(
+          stage.execution,
+          waitStage.type,
+          "Wait Before Scale Down",
+          waitContext,
+          stage,
+          SyntheticStageOwner.STAGE_AFTER
+        )
+      }
+
       def scaleDown = baseContext + [
         allowScaleDownActive         : false,
         remainingFullSizeServerGroups: 1,

diff --git a/...ddriver/src/main/groovy/com/netflix/spinnaker/orca/kato/pipeline/support/StageData.groovy b/...ddriver/src/main/groovy/com/netflix/spinnaker/orca/kato/pipeline/support/StageData.groovy
@@ -40,6 +40,7 @@ class StageData {
 
   @Deprecated
   long delayBeforeDisableSec
+  long delayBeforeScaleDownSec
 
   long delayBeforeCleanup
   PipelineBeforeCleanup pipelineBeforeCleanup
@@ -67,6 +68,10 @@ class StageData {
     return this.delayBeforeCleanup ?: this.delayBeforeDisableSec
   }
 
+  long getDelayBeforeScaleDown() {
+    return this.delayBeforeScaleDownSec
+  }
+
   @Deprecated
   List<String> getRegions() {
     availabilityZones?.keySet()?.toList() ?: (region ? [region] : [])

diff --git a/...ix/spinnaker/orca/clouddriver/pipeline/servergroup/strategies/RedBlackStrategySpec.groovy b/...ix/spinnaker/orca/clouddriver/pipeline/servergroup/strategies/RedBlackStrategySpec.groovy
@@ -20,6 +20,7 @@ import com.netflix.spinnaker.moniker.Moniker
 import com.netflix.spinnaker.orca.clouddriver.pipeline.cluster.DisableClusterStage
 import com.netflix.spinnaker.orca.clouddriver.pipeline.cluster.ScaleDownClusterStage
 import com.netflix.spinnaker.orca.clouddriver.pipeline.cluster.ShrinkClusterStage
+import com.netflix.spinnaker.orca.pipeline.WaitStage
 import com.netflix.spinnaker.orca.pipeline.model.Execution
 import com.netflix.spinnaker.orca.pipeline.model.Stage
 import com.netflix.spinnaker.orca.pipeline.model.SyntheticStageOwner
@@ -30,25 +31,29 @@ class RedBlackStrategySpec extends Specification {
   def ShrinkClusterStage shrinkClusterStage = new ShrinkClusterStage()
   def ScaleDownClusterStage scaleDownClusterStage = new ScaleDownClusterStage()
   def DisableClusterStage disableClusterStage = new DisableClusterStage()
+  def WaitStage waitStage = new WaitStage()
 
   def "should compose flow"() {
     given:
-      Moniker moniker = new Moniker(app: "unit", stack: "test");
+      Moniker moniker = new Moniker(app: "unit", stack: "tests");
       def ctx = [
-          account          : "testAccount",
-          application      : "unit",
-          stack            : "tests",
-          moniker          : moniker,
-          cloudProvider    : "aws",
-          region           : "north",
-          availabilityZones: [
-              north: ["pole-1a"]
-          ]
+        account               : "testAccount",
+        application           : "unit",
+        stack                 : "tests",
+        moniker               : moniker,
+        cloudProvider         : "aws",
+        region                : "north",
+        availabilityZones     : [
+          north: ["pole-1a"]
+        ]
       ]
-    def stage = new Stage(Execution.newPipeline("orca"), "whatever", ctx)
-      def strat = new RedBlackStrategy(shrinkClusterStage: shrinkClusterStage,
-                                       scaleDownClusterStage: scaleDownClusterStage,
-                                       disableClusterStage: disableClusterStage)
+      def stage = new Stage(Execution.newPipeline("orca"), "whatever", ctx)
+      def strat = new RedBlackStrategy(
+        shrinkClusterStage: shrinkClusterStage,
+        scaleDownClusterStage: scaleDownClusterStage,
+        disableClusterStage: disableClusterStage,
+        waitStage: waitStage
+      )
 
     when:
       def syntheticStages = strat.composeFlow(stage)
@@ -71,7 +76,7 @@ class RedBlackStrategySpec extends Specification {
 
     when:
       ctx.maxRemainingAsgs = 10
-    stage = new Stage(Execution.newPipeline("orca"), "whatever", ctx)
+      stage = new Stage(Execution.newPipeline("orca"), "whatever", ctx)
       syntheticStages = strat.composeFlow(stage)
       beforeStages = syntheticStages.findAll { it.syntheticStageOwner == SyntheticStageOwner.STAGE_BEFORE }
       afterStages = syntheticStages.findAll { it.syntheticStageOwner == SyntheticStageOwner.STAGE_AFTER }
@@ -85,7 +90,7 @@ class RedBlackStrategySpec extends Specification {
 
     when:
       ctx.scaleDown = true
-    stage = new Stage(Execution.newPipeline("orca"), "whatever", ctx)
+      stage = new Stage(Execution.newPipeline("orca"), "whatever", ctx)
       syntheticStages = strat.composeFlow(stage)
       beforeStages = syntheticStages.findAll { it.syntheticStageOwner == SyntheticStageOwner.STAGE_BEFORE }
       afterStages = syntheticStages.findAll { it.syntheticStageOwner == SyntheticStageOwner.STAGE_AFTER }
@@ -100,7 +105,7 @@ class RedBlackStrategySpec extends Specification {
 
     when:
       ctx.interestingHealthProviderNames = ["Google"]
-    stage = new Stage(Execution.newPipeline("orca"), "whatever", ctx)
+      stage = new Stage(Execution.newPipeline("orca"), "whatever", ctx)
       syntheticStages = strat.composeFlow(stage)
       beforeStages = syntheticStages.findAll { it.syntheticStageOwner == SyntheticStageOwner.STAGE_BEFORE }
       afterStages = syntheticStages.findAll { it.syntheticStageOwner == SyntheticStageOwner.STAGE_AFTER }
@@ -110,5 +115,23 @@ class RedBlackStrategySpec extends Specification {
       afterStages.size() == 3
       afterStages.first().type == shrinkClusterStage.type
       afterStages.first().context.interestingHealthProviderNames == ["Google"]
+
+    when:
+      ctx.delayBeforeDisableSec = 5
+      ctx.delayBeforeScaleDownSec = 10
+      stage = new Stage(Execution.newPipeline("orca"), "resize", ctx)
+      syntheticStages = strat.composeFlow(stage)
+      beforeStages = syntheticStages.findAll { it.syntheticStageOwner == SyntheticStageOwner.STAGE_BEFORE }
+      afterStages = syntheticStages.findAll { it.syntheticStageOwner == SyntheticStageOwner.STAGE_AFTER }
+
+    then:
+      beforeStages.isEmpty()
+      afterStages[0].type == shrinkClusterStage.type
+      afterStages[1].type == waitStage.type
+      afterStages[1].context.waitTime == 5
+      afterStages[2].type == disableClusterStage.type
+      afterStages[3].type == waitStage.type
+      afterStages[3].context.waitTime == 10
+      afterStages[4].type == scaleDownClusterStage.type
   }
 }