Replace caffeine cache with reference to full map

SingularityService/src/main/java/com/hubspot/singularity/SingularityServiceModule.java

@@ -1,13 +1,10 @@
 package com.hubspot.singularity;
 
-import com.github.benmanes.caffeine.cache.Cache;
-import com.github.benmanes.caffeine.cache.Caffeine;
 import com.google.common.base.Function;
 import com.google.inject.Binder;
 import com.google.inject.Module;
 import com.google.inject.Provides;
 import com.google.inject.Singleton;
-import com.google.inject.name.Named;
 import com.hubspot.dropwizard.guicier.DropwizardAwareModule;
 import com.hubspot.mesos.client.SingularityMesosClientModule;
 import com.hubspot.mesos.client.UserAndPassword;
@@ -29,14 +26,10 @@
 import com.hubspot.singularity.resources.SingularityOpenApiResource;
 import com.hubspot.singularity.resources.SingularityResourceModule;
 import com.hubspot.singularity.scheduler.SingularitySchedulerModule;
-import java.util.List;
 import java.util.Optional;
-import java.util.concurrent.TimeUnit;
 
 public class SingularityServiceModule
   extends DropwizardAwareModule<SingularityConfiguration> {
-  public static final String REQUESTS_CAFFEINE_CACHE =
-    "singularity.service.resources.request";
   private final Function<SingularityConfiguration, Module> dbModuleProvider;
   private Optional<Class<? extends LoadBalancerClient>> lbClientClass = Optional.empty();
 
@@ -135,16 +128,4 @@ public IndexViewConfiguration provideIndexViewConfiguration(
         .contains(SingularityAuthenticatorClass.WEBHOOK)
     );
   }
-
-  @Provides
-  @Singleton
-  @Named(REQUESTS_CAFFEINE_CACHE)
-  public Cache<String, List<SingularityRequestParent>> getRequestsCaffeineCache() {
-    SingularityConfiguration configuration = getConfiguration();
-
-    return Caffeine
-      .newBuilder()
-      .expireAfterWrite(configuration.getCaffeineCacheTtl(), TimeUnit.SECONDS)
-      .build();
-  }
 }

SingularityService/src/main/java/com/hubspot/singularity/config/SingularityConfiguration.java

@@ -446,8 +446,9 @@ public class SingularityConfiguration extends Configuration {
   // Enable caffeine cache on heavily requested endpoint
   private boolean useCaffeineCache = false;
 
-  // Caffeine cache ttl
-  private int caffeineCacheTtl = 1;
+  // Caffeine cache TTLs
+  private int deployCaffeineCacheTtl = 1;
+  private int requestCaffeineCacheTtl = 1;
 
   public long getAskDriverToKillTasksAgainAfterMillis() {
     return askDriverToKillTasksAgainAfterMillis;
@@ -2084,11 +2085,19 @@ public void setUseCaffeineCache(boolean useCaffeineCache) {
     this.useCaffeineCache = useCaffeineCache;
   }
 
-  public int getCaffeineCacheTtl() {
-    return caffeineCacheTtl;
+  public int getDeployCaffeineCacheTtl() {
+    return deployCaffeineCacheTtl;
   }
 
-  public void setCaffeineCacheTtl(int caffeineCacheTtl) {
-    this.caffeineCacheTtl = caffeineCacheTtl;
+  public void setDeployCaffeineCacheTtl(int deployCaffeineCacheTtl) {
+    this.deployCaffeineCacheTtl = deployCaffeineCacheTtl;
+  }
+
+  public int getRequestCaffeineCacheTtl() {
+    return requestCaffeineCacheTtl;
+  }
+
+  public void setRequestCaffeineCacheTtl(int requestCaffeineCacheTtl) {
+    this.requestCaffeineCacheTtl = requestCaffeineCacheTtl;
   }
 }

SingularityService/src/main/java/com/hubspot/singularity/data/DeployManager.java

@@ -27,6 +27,7 @@
 import com.hubspot.singularity.event.SingularityEventListener;
 import com.hubspot.singularity.scheduler.SingularityLeaderCache;
 import java.util.Collection;
+import java.util.Collections;
 import java.util.List;
 import java.util.Map;
 import java.util.Optional;
@@ -70,6 +71,8 @@ public class DeployManager extends CuratorAsyncManager {
   private static final String DEPLOY_STATISTICS_KEY = "STATISTICS";
   private static final String DEPLOY_RESULT_KEY = "RESULT_STATE";
 
+  private final ManagerCache<String, SingularityRequestDeployState> deployCache;
+
   @Inject
   public DeployManager(
     CuratorFramework curator,
@@ -99,6 +102,25 @@ public DeployManager(
     this.updateRequestTranscoder = updateRequestTranscoder;
     this.deploysCache = deploysCache;
     this.leaderCache = leaderCache;
+    this.deployCache =
+      new ManagerCache<>(
+        configuration.useCaffeineCache(),
+        configuration.getDeployCaffeineCacheTtl(),
+        requestId -> {
+          List<SingularityRequestDeployState> deployStates = getAsync(
+            "getRequestDeployStatesByRequestIds",
+            Collections.singletonList(getRequestDeployStatePath(requestId)),
+            requestDeployStateTranscoder
+          );
+
+          SingularityRequestDeployState deployState = null;
+          if (!deployStates.isEmpty()) {
+            deployState = deployStates.get(0);
+          }
+
+          return deployState;
+        }
+      );
   }
 
   public List<SingularityDeployKey> getDeployIdsFor(String requestId) {
@@ -124,6 +146,15 @@ public Map<String, SingularityRequestDeployState> getRequestDeployStatesByReques
       return leaderCache.getRequestDeployStateByRequestId(requestIds);
     }
 
+    Map<String, SingularityRequestDeployState> deployStatesByRequestIds;
+
+    if (deployCache.isEnabled()) {
+      deployStatesByRequestIds = deployCache.getAll(requestIds);
+      if (!deployStatesByRequestIds.isEmpty()) {
+        return deployStatesByRequestIds;
+      }
+    }
+
     return fetchDeployStatesByRequestIds(requestIds);
   }
 

SingularityService/src/main/java/com/hubspot/singularity/data/ManagerCache.java

@@ -0,0 +1,52 @@
+package com.hubspot.singularity.data;
+
+import com.github.benmanes.caffeine.cache.Caffeine;
+import com.github.benmanes.caffeine.cache.LoadingCache;
+import com.google.inject.Inject;
+import java.util.Map;
+import java.util.concurrent.TimeUnit;
+import java.util.function.Function;
+import javax.annotation.Nonnull;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+public class ManagerCache<K, V> {
+  private static final Logger LOG = LoggerFactory.getLogger(ManagerCache.class);
+
+  public final boolean isEnabled;
+  private final LoadingCache<K, V> cache;
+
+  @Inject
+  public ManagerCache(boolean isEnabled, int cacheTtl, Function<? super K, V> loader) {
+    this.isEnabled = isEnabled;
+    cache =
+      Caffeine
+        .newBuilder()
+        .expireAfterWrite(cacheTtl, TimeUnit.SECONDS)
+        .build(loader::apply);
+  }
+
+  public V get(K key) {
+    V values = cache.get(key);
+    if (values != null) {
+      LOG.trace("Grabbed values for {} from cache", key);
+    } else {
+      LOG.trace("{} not in cache, setting", key);
+    }
+
+    return values;
+  }
+
+  public Map<K, V> getAll(@Nonnull Iterable<? extends K> keys) {
+    Map<K, V> values = cache.getAll(keys);
+    if (!values.isEmpty()) {
+      LOG.trace("Grabbed mapped values for {} from cache", keys);
+    }
+
+    return values;
+  }
+
+  public boolean isEnabled() {
+    return isEnabled;
+  }
+}

SingularityService/src/main/java/com/hubspot/singularity/data/RequestManager.java

@@ -90,6 +90,7 @@ public class RequestManager extends CuratorAsyncManager {
   );
 
   private final Map<Class<? extends SingularityExpiringRequestActionParent<? extends SingularityExpiringRequestParent>>, Transcoder<? extends SingularityExpiringRequestActionParent<? extends SingularityExpiringRequestParent>>> expiringTranscoderMap;
+  private final ManagerCache<String, List<SingularityRequestWithState>> requestsCache;
 
   @Inject
   public RequestManager(
@@ -133,6 +134,12 @@ public RequestManager(
 
     this.leaderCache = leaderCache;
     this.webCache = webCache;
+    this.requestsCache =
+      new ManagerCache<>(
+        configuration.useCaffeineCache(),
+        configuration.getRequestCaffeineCacheTtl(),
+        key -> this.fetchRequests()
+      );
   }
 
   private String getRequestPath(String requestId) {
@@ -632,11 +639,20 @@ public List<SingularityRequestWithState> getRequests(boolean useWebCache) {
     if (useWebCache && webCache.useCachedRequests()) {
       return webCache.getRequests();
     }
+
+    if (requestsCache.isEnabled()) {
+      List<SingularityRequestWithState> requests = requestsCache.get("all");
+      if (requests != null) {
+        return requests;
+      }
+    }
+
     List<SingularityRequestWithState> requests = fetchRequests();
 
     if (useWebCache) {
       webCache.cacheRequests(requests);
     }
+
     return requests;
   }
 

SingularityService/src/main/java/com/hubspot/singularity/resources/RequestResource.java

@@ -5,11 +5,9 @@
 import static com.hubspot.singularity.WebExceptions.checkNotNullBadRequest;
 
 import com.fasterxml.jackson.databind.ObjectMapper;
-import com.github.benmanes.caffeine.cache.Cache;
 import com.google.common.collect.ImmutableMap;
 import com.google.common.collect.Lists;
 import com.google.inject.Inject;
-import com.google.inject.name.Named;
 import com.hubspot.jackson.jaxrs.PropertyFiltering;
 import com.hubspot.singularity.AgentPlacement;
 import com.hubspot.singularity.CrashLoopInfo;
@@ -35,7 +33,6 @@
 import com.hubspot.singularity.SingularityRequestHistory.RequestHistoryType;
 import com.hubspot.singularity.SingularityRequestParent;
 import com.hubspot.singularity.SingularityRequestWithState;
-import com.hubspot.singularity.SingularityServiceModule;
 import com.hubspot.singularity.SingularityShellCommand;
 import com.hubspot.singularity.SingularityTaskCleanup;
 import com.hubspot.singularity.SingularityTaskHealthcheckResult;
@@ -89,7 +86,6 @@
 import java.util.Optional;
 import java.util.Set;
 import java.util.UUID;
-import java.util.concurrent.TimeUnit;
 import java.util.stream.Collectors;
 import javax.servlet.http.HttpServletRequest;
 import javax.ws.rs.Consumes;
@@ -124,7 +120,6 @@ public class RequestResource extends AbstractRequestResource {
   private final SingularityConfiguration configuration;
   private final SingularityExceptionNotifier exceptionNotifier;
   private final SingularityAgentAndRackManager agentAndRackManager;
-  private final Cache<String, List<SingularityRequestParent>> requestsCache;
 
   @Inject
   public RequestResource(
@@ -142,10 +137,7 @@ public RequestResource(
     @Singularity ObjectMapper objectMapper,
     SingularityConfiguration configuration,
     SingularityExceptionNotifier exceptionNotifier,
-    SingularityAgentAndRackManager agentAndRackManager,
-    @Named(
-      SingularityServiceModule.REQUESTS_CAFFEINE_CACHE
-    ) Cache<String, List<SingularityRequestParent>> requestsCache
+    SingularityAgentAndRackManager agentAndRackManager
   ) {
     super(
       requestManager,
@@ -165,7 +157,6 @@ public RequestResource(
     this.configuration = configuration;
     this.exceptionNotifier = exceptionNotifier;
     this.agentAndRackManager = agentAndRackManager;
-    this.requestsCache = requestsCache;
   }
 
   private void submitRequest(
@@ -1472,24 +1463,7 @@ public List<SingularityRequestParent> getRequests(
       "requestType"
     ) List<RequestType> requestTypes
   ) {
-    String key = getRequestCacheKey(
-      user.getId(),
-      filterRelevantForUser,
-      includeFullRequestData,
-      limit,
-      requestTypes
-    );
-    if (!useWebCache(useWebCache) && configuration.useCaffeineCache()) {
-      List<SingularityRequestParent> cachedRequests = requestsCache.getIfPresent(key);
-
-      if (cachedRequests != null) {
-        LOG.trace("Grabbed getRequests value for {} from cache", key);
-
-        return cachedRequests;
-      }
-    }
-
-    List<SingularityRequestParent> requests = requestHelper.fillDataForRequestsAndFilter(
+    return requestHelper.fillDataForRequestsAndFilter(
       filterAutorized(
         requestManager.getRequests(useWebCache(useWebCache)),
         SingularityAuthorizationScope.READ,
@@ -1501,42 +1475,6 @@ public List<SingularityRequestParent> getRequests(
       Optional.ofNullable(limit),
       requestTypes
     );
-
-    if (!useWebCache(useWebCache) && configuration.useCaffeineCache()) {
-      requestsCache.put(key, requests);
-
-      LOG.trace("Setting getRequests value for {} in cache", key);
-    }
-
-    return requests;
-  }
-
-  private String getRequestCacheKey(
-    String id,
-    Boolean filterRelevantForUser,
-    Boolean includeFullRequestData,
-    Integer limit,
-    List<RequestType> requestTypes
-  ) {
-    StringBuilder key = new StringBuilder(id);
-
-    if (filterRelevantForUser != null) {
-      key.append("_filter_").append(filterRelevantForUser);
-    }
-    if (includeFullRequestData != null) {
-      key.append("_fullRequestData_").append(includeFullRequestData);
-    }
-    if (limit != null) {
-      key.append("_limit_").append(limit);
-    }
-    if (!requestTypes.isEmpty()) {
-      key.append("_types_");
-      for (RequestType type : requestTypes) {
-        key.append("_").append(type.name());
-      }
-    }
-
-    return key.toString();
   }
 
   private boolean valueOrFalse(Boolean input) {