fix(cf): cf rolling red black did not resize old SG correctly (#3211) (…

…#3212)
spinnaker · Oct 3, 2019 · 6a95ae3 · 6a95ae3
1 parent 1f96597
commit 6a95ae3
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 4 deletions.
diff --git a/...spinnaker/orca/clouddriver/pipeline/servergroup/strategies/CFRollingRedBlackStrategy.java b/...spinnaker/orca/clouddriver/pipeline/servergroup/strategies/CFRollingRedBlackStrategy.java
@@ -278,9 +278,13 @@ public List<Stage> composeFlow(Stage stage) {
       stages.add(disableStage);
 
       // scale old back to original
+      ResizeStrategy.Capacity resetCapacity = new ResizeStrategy.Capacity();
+      resetCapacity.setMax(sourceCapacity.getMax());
+      resetCapacity.setMin(0);
+      resetCapacity.setDesired(0);
       Map<String, Object> scaleSourceContext =
           getScalingContext(
-              stage, cleanupConfig, baseContext, sourceCapacity, 100, source.getServerGroupName());
+              stage, cleanupConfig, baseContext, resetCapacity, 100, source.getServerGroupName());
       scaleSourceContext.put("scaleStoppedServerGroup", true);
       log.info(
           "Adding `Grow source to 100% of original size` stage with context {} [executionId={}]",

diff --git a/...naker/orca/clouddriver/pipeline/servergroup/strategies/CFRollingRedBlackStrategyTest.java b/...naker/orca/clouddriver/pipeline/servergroup/strategies/CFRollingRedBlackStrategyTest.java
@@ -81,7 +81,7 @@ class CFRollingRedBlackStrategyTest {
   }
 
   @Test
-  void composeFlowWithDelayBeforeScaleDown() {
+  void composeFlowWithDelayBeforeScaleDown() throws IOException {
     List<Object> targetPercentageList = Stream.of(50, 100).collect(Collectors.toList());
     Map<String, Object> direct = new HashMap<>();
     direct.put("instances", 4);
@@ -100,6 +100,8 @@ void composeFlowWithDelayBeforeScaleDown() {
             new Execution(PIPELINE, "unit"), CreateServerGroupStage.PIPELINE_CONFIG_TYPE, context);
     when(targetServerGroupResolver.resolve(any()))
         .thenReturn(singletonList(new TargetServerGroup(Collections.emptyMap())));
+    when(resizeStrategySupport.getCapacity(any(), any(), any(), any()))
+        .thenReturn(new ResizeStrategy.Capacity(1, 1, 1));
 
     List<Stage> stages = strategy.composeFlow(deployServerGroupStage);
 
@@ -142,6 +144,8 @@ void composeFlowWithDelayBeforeCleanup() {
 
     when(targetServerGroupResolver.resolve(any()))
         .thenReturn(singletonList(new TargetServerGroup(Collections.emptyMap())));
+    when(resizeStrategySupport.getCapacity(any(), any(), any(), any()))
+        .thenReturn(new ResizeStrategy.Capacity(1, 1, 1));
 
     List<Stage> stages = strategy.composeFlow(deployServerGroupStage);
 
@@ -222,6 +226,8 @@ void composeFlowWithSourceAndManifestDirect() {
         new Stage(
             new Execution(PIPELINE, "unit"), CreateServerGroupStage.PIPELINE_CONFIG_TYPE, context);
     ResizeStrategy.Capacity initialSourceCapacity = new ResizeStrategy.Capacity(8, 8, 8);
+    ResizeStrategy.Capacity resetOriginalCapacity =
+        new ResizeStrategy.Capacity(initialSourceCapacity.getMax(), 0, 0);
 
     when(targetServerGroupResolver.resolve(any()))
         .thenReturn(singletonList(new TargetServerGroup(Collections.emptyMap())));
@@ -261,7 +267,7 @@ void composeFlowWithSourceAndManifestDirect() {
             initialSourceCapacity,
             null,
             null,
-            initialSourceCapacity);
+            resetOriginalCapacity);
     assertThat(deployServerGroupStage.getContext().get("targetSize")).isNull();
     assertThat(deployServerGroupStage.getContext().get("useSourceCapacity")).isNull();
     assertThat(deployServerGroupStage.getContext().get("capacity")).isEqualTo(zeroCapacity);
@@ -342,6 +348,8 @@ void composeFlowWithSourceAndManifestArtifactConvertsManifestToDirect() throws I
     context.put("source", createSource());
     ResizeStrategy.Capacity resizeTo4Capacity = new ResizeStrategy.Capacity(4, 4, 4);
     ResizeStrategy.Capacity initialSourceCapacity = new ResizeStrategy.Capacity(8, 8, 8);
+    ResizeStrategy.Capacity resetOriginalCapacity =
+        new ResizeStrategy.Capacity(initialSourceCapacity.getMax(), 0, 0);
 
     Stage deployServerGroupStage = new Stage(new Execution(PIPELINE, "unit"), "type", context);
     Artifact boundArtifactForStage = new Artifact();
@@ -386,7 +394,7 @@ void composeFlowWithSourceAndManifestArtifactConvertsManifestToDirect() throws I
             initialSourceCapacity,
             null,
             null,
-            initialSourceCapacity);
+            resetOriginalCapacity);
     assertThat(stages.stream().map(stage -> stage.getContext().get("scalePct")))
         .containsExactly(null, 50, 50, 75, 25, 100, 0, null, null, 100);
     assertThat(deployServerGroupStage.getContext().get("targetSize")).isNull();