Revert "perf(docker): Fix for ConcurrentHashMap cast error. Added uni…

…t tests (#3942)" (#3958) This reverts commit 011da56.
spinnaker · Aug 16, 2019 · 5ba456f · 5ba456f
1 parent 8e37e6a
commit 5ba456f
Show file tree

Hide file tree

Showing 4 changed files with 19 additions and 140 deletions.
diff --git a/...vy/com/netflix/spinnaker/clouddriver/docker/registry/cache/DefaultCacheDataBuilder.groovy b/...vy/com/netflix/spinnaker/clouddriver/docker/registry/cache/DefaultCacheDataBuilder.groovy
@@ -17,8 +17,6 @@
 package com.netflix.spinnaker.clouddriver.docker.registry.cache
 
 import com.netflix.spinnaker.cats.cache.DefaultCacheData
-import java.util.concurrent.ConcurrentHashMap
-import java.util.concurrent.ConcurrentMap
 
 class DefaultCacheDataBuilder {
   String id = ''
@@ -30,7 +28,7 @@ class DefaultCacheDataBuilder {
     new DefaultCacheData(id, ttlSeconds, attributes, relationships)
   }
 
-  public static ConcurrentMap<String, DefaultCacheDataBuilder> defaultCacheDataBuilderMap() {
-    return new ConcurrentHashMap<String, DefaultCacheDataBuilder>()
+  public static Map<String, DefaultCacheDataBuilder> defaultCacheDataBuilderMap() {
+    return [:].withDefault { String id -> new DefaultCacheDataBuilder(id: id) }
   }
 }
diff --git a/...innaker/clouddriver/docker/registry/provider/agent/DockerRegistryImageCachingAgent.groovy b/...innaker/clouddriver/docker/registry/provider/agent/DockerRegistryImageCachingAgent.groovy
@@ -28,7 +28,6 @@ import com.netflix.spinnaker.clouddriver.docker.registry.security.DockerRegistry
 import groovy.util.logging.Slf4j
 import retrofit.RetrofitError
 
-import java.util.concurrent.ConcurrentMap
 import java.util.concurrent.TimeUnit
 
 import static java.util.Collections.unmodifiableSet
@@ -129,11 +128,11 @@ class DockerRegistryImageCachingAgent implements CachingAgent, AccountAware, Age
   private CacheResult buildCacheResult(Map<String, Set<String>> tagMap) {
     log.info("Describing items in ${agentType}")
 
-    ConcurrentMap<String, DefaultCacheDataBuilder> cachedTags = DefaultCacheDataBuilder.defaultCacheDataBuilderMap()
-    ConcurrentMap<String, DefaultCacheDataBuilder> cachedIds = DefaultCacheDataBuilder.defaultCacheDataBuilderMap()
+    Map<String, DefaultCacheDataBuilder> cachedTags = DefaultCacheDataBuilder.defaultCacheDataBuilderMap()
+    Map<String, DefaultCacheDataBuilder> cachedIds = DefaultCacheDataBuilder.defaultCacheDataBuilderMap()
 
     tagMap.forEach { repository, tags ->
-      tags.parallelStream().forEach { tag ->
+      tags.forEach { tag ->
         if (!tag) {
           log.warn("Empty tag encountered for $accountName/$repository, not caching")
           return
@@ -159,26 +158,23 @@ class DockerRegistryImageCachingAgent implements CachingAgent, AccountAware, Age
             }
           }
         }
+        try {
+          creationDate = credentials.client.getCreationDate(repository, tag)
+        } catch (Exception e) {
+          log.warn("Unable to fetch tag creation date, reason: {} (tag: {}, repository: {})", e.message, tag, repository)
+        }
 
-        if (credentials.sortTagsByDate) {
-          try {
-            creationDate = credentials.client.getCreationDate(repository, tag)
-          } catch (Exception e) {
-            log.warn("Unable to fetch tag creation date, reason: {} (tag: {}, repository: {})", e.message, tag, repository)
-          }
+        cachedTags[tagKey].with {
+          attributes.name = "${repository}:${tag}".toString()
+          attributes.account = accountName
+          attributes.digest = digest
+          attributes.date = creationDate
         }
 
-        def tagData = new DefaultCacheDataBuilder()
-        tagData.attributes.put("name", "${repository}:${tag}".toString())
-        tagData.attributes.put("account", accountName)
-        tagData.attributes.put("digest", digest)
-        tagData.attributes.put("date", creationDate)
-        cachedTags.put(tagKey, tagData)
-
-        def idData = new DefaultCacheDataBuilder()
-        idData.attributes.put("tagKey", tagKey)
-        idData.attributes.put("account", accountName)
-        cachedIds.put(imageIdKey, idData)
+        cachedIds[imageIdKey].with {
+          attributes.tagKey = tagKey
+          attributes.account = accountName
+        }
       }
 
       null

diff --git a/...m/netflix/spinnaker/clouddriver/docker/registry/security/DockerRegistryCredentials.groovy b/...m/netflix/spinnaker/clouddriver/docker/registry/security/DockerRegistryCredentials.groovy
@@ -52,10 +52,6 @@ class DockerRegistryCredentials {
     return trackDigests
   }
 
-  boolean getSortTagsByDate() {
-    return sortTagsByDate
-  }
-
   List<String> getSkip(){
     return skip
   }

diff --git a/...ker/clouddriver/docker/registry/provider/agent/DockerRegistryImageCachingAgentTest.groovy b/...ker/clouddriver/docker/registry/provider/agent/DockerRegistryImageCachingAgentTest.groovy