perf(aws): configurable termination lifecycle agent poll time (#1491)

spinnaker · Mar 5, 2017 · 2594fa3 · 2594fa3
1 parent 9229940
commit 2594fa3
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 3 deletions.
diff --git a/...lix/spinnaker/clouddriver/aws/lifecycle/InstanceTerminationConfigurationProperties.groovy b/...lix/spinnaker/clouddriver/aws/lifecycle/InstanceTerminationConfigurationProperties.groovy
@@ -27,6 +27,7 @@ class InstanceTerminationConfigurationProperties {
   int maxMessagesPerCycle = 1000
   int visibilityTimeout = 30
   int waitTimeSeconds = 5
+  int pollIntervalSeconds = 30
 
   InstanceTerminationConfigurationProperties() {
     // default constructor
@@ -37,12 +38,14 @@ class InstanceTerminationConfigurationProperties {
                                              String topicARN,
                                              int maxMessagesPerCycle,
                                              int visibilityTimeout,
-                                             int waitTimeSeconds) {
+                                             int waitTimeSeconds,
+                                             int pollIntervalSeconds) {
     this.accountName = accountName
     this.queueARN = queueARN
     this.topicARN = topicARN
     this.maxMessagesPerCycle = maxMessagesPerCycle
     this.visibilityTimeout = visibilityTimeout
     this.waitTimeSeconds = waitTimeSeconds
+    this.pollIntervalSeconds = pollIntervalSeconds
   }
 }
diff --git a/...vy/com/netflix/spinnaker/clouddriver/aws/lifecycle/InstanceTerminationLifecycleAgent.java b/...vy/com/netflix/spinnaker/clouddriver/aws/lifecycle/InstanceTerminationLifecycleAgent.java
@@ -112,7 +112,7 @@ public String getProviderName() {
 
   @Override
   public long getPollIntervalMillis() {
-    return TimeUnit.SECONDS.toMillis(30);
+    return TimeUnit.SECONDS.toMillis(properties.getPollIntervalSeconds());
   }
 
   @Override

diff --git a/...etflix/spinnaker/clouddriver/aws/lifecycle/InstanceTerminationLifecycleAgentProvider.java b/...etflix/spinnaker/clouddriver/aws/lifecycle/InstanceTerminationLifecycleAgentProvider.java
@@ -83,7 +83,8 @@ public Collection<Agent> agents() {
             .replaceAll(ACCOUNT_ID_TEMPLATE_PATTERN, credentials.getAccountId()),
           properties.getMaxMessagesPerCycle(),
           properties.getVisibilityTimeout(),
-          properties.getWaitTimeSeconds()
+          properties.getWaitTimeSeconds(),
+          properties.getPollIntervalSeconds()
         ),
         discoverySupport,
         registry

diff --git a/.../spinnaker/clouddriver/aws/lifecycle/InstanceTerminationLifecycleAgentProviderSpec.groovy b/.../spinnaker/clouddriver/aws/lifecycle/InstanceTerminationLifecycleAgentProviderSpec.groovy
@@ -43,6 +43,7 @@ class InstanceTerminationLifecycleAgentProviderSpec extends Specification {
     'arn:aws:sqs:{{region}}:{{accountId}}:topicName',
     -1,
     -1,
+    -1,
     -1
   )
 

diff --git a/.../netflix/spinnaker/clouddriver/aws/lifecycle/InstanceTerminationLifecycleAgentSpec.groovy b/.../netflix/spinnaker/clouddriver/aws/lifecycle/InstanceTerminationLifecycleAgentSpec.groovy
@@ -73,6 +73,7 @@ class InstanceTerminationLifecycleAgentSpec extends Specification {
       topicARN.arn,
       -1,
       -1,
+      -1,
       -1
     ),
     awsEurekaSupportProvider,