Merge pull request #326 from hmcts/increase_aat_cache_size

Attempt to fix AAT performance issues

Author: ngul

infrastructure/main.tf

@@ -126,6 +126,10 @@ module "ccd-data-store-api" {
 
     CCD_DEFAULTPRINTURL                 = "${local.default_print_url}"
 
+    DEFINITION_CACHE_TTL_SEC            = "${var.definition_cache_ttl_sec}"
+    DEFINITION_CACHE_MAX_SIZE           = "${var.definition_cache_max_size}"
+    DEFINITION_CACHE_EVICTION_POLICY    = "${var.definition_cache_eviction_policy}"
+
     ELASTIC_SEARCH_ENABLED              = "${var.elastic_search_enabled}"
     ELASTIC_SEARCH_HOSTS                = "${local.elastic_search_hosts}"
     ELASTIC_SEARCH_DATA_NODES_HOSTS     = "${local.elastic_search_data_node_hosts}"

infrastructure/variables.tf

@@ -58,6 +58,21 @@ variable "jenkins_AAD_objectId" {
   description                 = "(Required) The Azure AD object ID of a user, service principal or security group in the Azure Active Directory tenant for the vault. The object ID must be unique for the list of access policies."
 }
 
+variable "definition_cache_ttl_sec" {
+  type = "string"
+  default = "259200"
+}
+
+variable "definition_cache_max_size" {
+  type = "string"
+  default = "5000"
+}
+
+variable "definition_cache_eviction_policy" {
+  type = "string"
+  default = "NONE"
+}
+
 ////////////////////////////////
 // Database
 ////////////////////////////////

src/main/java/uk/gov/hmcts/ccd/ApplicationParams.java

@@ -9,6 +9,7 @@
 
 import static java.util.stream.Collectors.toList;
 
+import com.hazelcast.config.EvictionPolicy;
 import org.springframework.beans.factory.annotation.Value;
 import uk.gov.hmcts.ccd.endpoint.exceptions.ServiceException;
 
@@ -66,6 +67,12 @@ public class ApplicationParams {
     @Value("${definition.cache.ttl.secs}")
     private Integer definitionCacheTTLSecs;
 
+    @Value("${definition.cache.max.size}")
+    private Integer definitionCacheMaxSize;
+
+    @Value("${definition.cache.eviction.policy}")
+    private EvictionPolicy definitionCacheEvictionPolicy;
+
     @Value("#{'${search.elastic.hosts}'.split(',')}")
     private List<String> elasticSearchHosts;
 
@@ -217,6 +224,14 @@ public int getDefinitionCacheTTLSecs() {
         return definitionCacheTTLSecs;
     }
 
+    public int getDefinitionCacheMaxSize() {
+        return definitionCacheMaxSize;
+    }
+
+    public EvictionPolicy getDefinitionCacheEvictionPolicy() {
+        return definitionCacheEvictionPolicy;
+    }
+
     public List<String> getSearchBlackList() {
         return searchBlackList;
     }

src/main/java/uk/gov/hmcts/ccd/CachingConfiguration.java

@@ -35,8 +35,8 @@ private void configCaches(int definitionCacheTTL, Config config) {
 
     private MapConfig newMapConfig(final String name, int definitionCacheTTL) {
         return new MapConfig().setName(name)
-                .setMaxSizeConfig(new MaxSizeConfig(1000, MaxSizeConfig.MaxSizePolicy.FREE_HEAP_SIZE))
-                .setEvictionPolicy(EvictionPolicy.LRU)
+                .setMaxSizeConfig(new MaxSizeConfig(applicationParams.getDefinitionCacheMaxSize(), MaxSizeConfig.MaxSizePolicy.PER_NODE))
+                .setEvictionPolicy(applicationParams.getDefinitionCacheEvictionPolicy())
                 .setMaxIdleSeconds(definitionCacheTTL);
     }
 

src/main/resources/application.properties

@@ -20,8 +20,16 @@ pagination.page.size=25
 liquibase.enabled=${ENABLE_DB_MIGRATE:true}
 liquibase.change-log=classpath:/db/changelog/db.changelog-master.xml
 
-#ttl of cached definitions in seconds
-definition.cache.ttl.secs=${DEFINITION_CACHE_TTL_SEC:86400}
+
+#definitions cache parameters
+#ttl of cache map entry
+definition.cache.ttl.secs=${DEFINITION_CACHE_TTL_SEC:259200}
+
+#max size of cache map in terms of number of entries
+definition.cache.max.size=${DEFINITION_CACHE_MAX_SIZE:5000}
+
+#eviction policy. If set to NONE the cache can grow arbitrarily large and definition.cache.max.size is ignored
+definition.cache.eviction.policy=${DEFINITION_CACHE_EVICTION_POLICY:NONE}
 
 # Jackson ObjectMapper configuration
 spring.jackson.serialization.WRITE_DATES_AS_TIMESTAMPS=false