fix(aws): Enable stale key evictions for amazon load balancers (#1994)

Key structures vary between classic and application/networking load balancers.
spinnaker · Oct 13, 2017 · f0d1597 · f0d1597
1 parent a849b69
commit f0d1597
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 1 deletion.
diff --git a/cats/cats-core/src/main/java/com/netflix/spinnaker/cats/agent/CachingAgent.java b/cats/cats-core/src/main/java/com/netflix/spinnaker/cats/agent/CachingAgent.java
@@ -112,7 +112,7 @@ public void storeAgentResult(Agent agent, CacheResult result) {
                 Collection<String> evictionsForType = result.getEvictions().computeIfAbsent(type, evictableKeys -> new ArrayList<>());
                 evictionsForType.addAll(evictableIdentifiers);
 
-                log.info("Evicting stale identifiers: {}", evictableIdentifiers);
+                log.debug("Evicting stale identifiers: {}", evictableIdentifiers);
               }
             } catch (Exception e) {
               log.error("Failed to check for stale identifiers (type: {}, pattern: {}, agent: {})", type, cacheKeyPatternForType, agent, e);

diff --git a/...spinnaker/clouddriver/aws/provider/agent/AmazonApplicationLoadBalancerCachingAgent.groovy b/...spinnaker/clouddriver/aws/provider/agent/AmazonApplicationLoadBalancerCachingAgent.groovy
@@ -66,6 +66,13 @@ class AmazonApplicationLoadBalancerCachingAgent extends AbstractAmazonLoadBalanc
     this.eddaTimeoutConfig = eddaTimeoutConfig
   }
 
+  @Override
+  Optional<Map<String, String>> getCacheKeyPatterns() {
+    return [
+      (LOAD_BALANCERS.ns): Keys.getLoadBalancerKey('*', account.name, region, 'vpc-????????', '*')
+    ]
+  }
+
   @Override
   OnDemandAgent.OnDemandResult handle(ProviderCache providerCache, Map<String, ? extends Object> data) {
     if (!data.containsKey("loadBalancerName")) {

diff --git a/...om/netflix/spinnaker/clouddriver/aws/provider/agent/AmazonLoadBalancerCachingAgent.groovy b/...om/netflix/spinnaker/clouddriver/aws/provider/agent/AmazonLoadBalancerCachingAgent.groovy
@@ -47,6 +47,13 @@ class AmazonLoadBalancerCachingAgent extends AbstractAmazonLoadBalancerCachingAg
     super(amazonCloudProvider, amazonClientProvider, account, region, objectMapper, registry)
   }
 
+  @Override
+  Optional<Map<String, String>> getCacheKeyPatterns() {
+    return [
+      (LOAD_BALANCERS.ns): Keys.getLoadBalancerKey('*', account.name, region, 'vpc-????????', null)
+    ]
+  }
+
   @Override
   OnDemandAgent.OnDemandResult handle(ProviderCache providerCache, Map<String, ? extends Object> data) {
     if (!data.containsKey("loadBalancerName")) {