utilize updateAutoScalingPolicy command for Titus policies

spinnaker · Mar 26, 2018 · 86142f0 · 86142f0
1 parent 57faf1d
commit 86142f0
Show file tree

Hide file tree

Showing 3 changed files with 33 additions and 44 deletions.
diff --git a/...vy/com/netflix/spinnaker/clouddriver/titus/client/RegionScopedTitusAutoscalingClient.java b/...vy/com/netflix/spinnaker/clouddriver/titus/client/RegionScopedTitusAutoscalingClient.java
@@ -84,11 +84,16 @@ public ScalingPolicyResult getScalingPolicy(String policyId) {
   }
 
   @Override
-  public ScalingPolicyID upsertScalingPolicy(PutPolicyRequest policy) {
+  public ScalingPolicyID createScalingPolicy(PutPolicyRequest policy) {
     return autoScalingServiceBlockingStub
       .setAutoScalingPolicy(policy);
   }
 
+  @Override
+  public void updateScalingPolicy(UpdatePolicyRequest policy) {
+    autoScalingServiceBlockingStub.updateAutoScalingPolicy(policy);
+  }
+
   @Override
   public void deleteScalingPolicy(DeletePolicyRequest request) {
     autoScalingServiceBlockingStub.deleteAutoScalingPolicy(request);

diff --git a/src/main/groovy/com/netflix/spinnaker/clouddriver/titus/client/TitusAutoscalingClient.java b/src/main/groovy/com/netflix/spinnaker/clouddriver/titus/client/TitusAutoscalingClient.java
@@ -16,10 +16,7 @@
 
 package com.netflix.spinnaker.clouddriver.titus.client;
 
-import com.netflix.titus.grpc.protogen.DeletePolicyRequest;
-import com.netflix.titus.grpc.protogen.PutPolicyRequest;
-import com.netflix.titus.grpc.protogen.ScalingPolicyID;
-import com.netflix.titus.grpc.protogen.ScalingPolicyResult;
+import com.netflix.titus.grpc.protogen.*;
 
 import java.util.List;
 
@@ -31,7 +28,9 @@ public interface TitusAutoscalingClient {
 
   ScalingPolicyResult getScalingPolicy(String policyId);
 
-  ScalingPolicyID upsertScalingPolicy(PutPolicyRequest policy);
+  ScalingPolicyID createScalingPolicy(PutPolicyRequest policy);
+
+  void updateScalingPolicy(UpdatePolicyRequest policy);
 
   void deleteScalingPolicy(DeletePolicyRequest request);
 }
diff --git a/...lix/spinnaker/clouddriver/titus/deploy/ops/UpsertTitusScalingPolicyAtomicOperation.groovy b/...lix/spinnaker/clouddriver/titus/deploy/ops/UpsertTitusScalingPolicyAtomicOperation.groovy
@@ -29,6 +29,7 @@ import com.netflix.titus.grpc.protogen.ScalingPolicy
 import com.netflix.titus.grpc.protogen.ScalingPolicyID
 import com.netflix.titus.grpc.protogen.ScalingPolicyResult
 import com.netflix.titus.grpc.protogen.ScalingPolicyStatus.ScalingPolicyState
+import com.netflix.titus.grpc.protogen.UpdatePolicyRequest
 import groovy.util.logging.Slf4j
 import org.springframework.beans.factory.annotation.Autowired
 
@@ -62,57 +63,41 @@ class UpsertTitusScalingPolicyAtomicOperation implements AtomicOperation<Map> {
       throw new UnsupportedOperationException("Autoscaling is not supported for this account/region")
     }
 
-    ScalingPolicyResult previousPolicy
-
     if (description.scalingPolicyID) {
 
-      previousPolicy = client.getScalingPolicy(description.scalingPolicyID)
-
-      task.updateStatus BASE_PHASE, "Deleting previous scaling policy (${description.scalingPolicyID})..."
-
-      DeletePolicyRequest.Builder deleteRequestBuilder = DeletePolicyRequest.newBuilder()
-        .setId(ScalingPolicyID.newBuilder().setId(description.scalingPolicyID))
-
-      client.deleteScalingPolicy(deleteRequestBuilder.build())
-
-      task.updateStatus BASE_PHASE, "Deleted previous scaling policy (${description.scalingPolicyID}); monitoring deletion"
-
       retrySupport.retry({ ->
-        ScalingPolicyResult updatedPolicy = client.getScalingPolicy(description.scalingPolicyID)
-        if (!updatedPolicy || (updatedPolicy.getPolicyState().state != ScalingPolicyState.Deleted)) {
-          throw new IllegalStateException("Previous policy was not deleted after 45 seconds")
-        }
-      }, 5000, 10, false)
+        client.updateScalingPolicy(
+          UpdatePolicyRequest.newBuilder()
+            .setScalingPolicy(description.toScalingPolicyBuilder().build())
+            .setPolicyId(ScalingPolicyID.newBuilder().setId(description.scalingPolicyID).build())
+            .build()
+        )
+      }, 10, 3000, false)
 
-      task.updateStatus BASE_PHASE, "Previous scaling policy successfully deleted"
-    }
+      task.updateStatus BASE_PHASE, "Scaling policy successfully updated"
 
-    ScalingPolicy.Builder builder = description.toScalingPolicyBuilder()
+      return [scalingPolicyID: description.scalingPolicyID]
+    } else {
+      ScalingPolicy.Builder builder = description.toScalingPolicyBuilder()
 
-    Builder requestBuilder = PutPolicyRequest.newBuilder()
-      .setScalingPolicy(builder)
-      .setJobId(description.jobId)
+      Builder requestBuilder = PutPolicyRequest.newBuilder()
+        .setScalingPolicy(builder)
+        .setJobId(description.jobId)
 
-    task.updateStatus BASE_PHASE, "Create Scaling Policy request constructed, sending..."
+      task.updateStatus BASE_PHASE, "Create Scaling Policy request constructed, sending..."
 
-    ScalingPolicyID result = client.upsertScalingPolicy(requestBuilder.build())
+      ScalingPolicyID result = client.createScalingPolicy(requestBuilder.build())
 
-    task.updateStatus BASE_PHASE, "Create Scaling Policy succeeded; new policy ID: ${result.id}; monitoring creation..."
+      task.updateStatus BASE_PHASE, "Create Scaling Policy succeeded; new policy ID: ${result.id}; monitoring creation..."
 
-    // make sure the new policy was applied
-    try {
+      // make sure the new policy was applied
       verifyNewPolicyState(client, result)
-    } catch (IllegalStateException e) {
-      if (previousPolicy) {
-        log.info("New policy creation failed; attempting to restore previous policy")
-        client.upsertScalingPolicy(PutPolicyRequest.newBuilder().setScalingPolicy(previousPolicy.scalingPolicy).build())
-      }
-      throw e
-    }
 
-    task.updateStatus BASE_PHASE, "Scaling policy successfully created"
+      task.updateStatus BASE_PHASE, "Scaling policy successfully created"
+
+      return [scalingPolicyID: result.id]
+    }
 
-    return [scalingPolicyID: result.id]
   }
 
   private void verifyNewPolicyState(client, result) {