Merge pull request #4800 from vespa-engine/balder/automatic-summary-cache

Test that summary cache is given 5% of memory unless specified explicit.

2 files changed, 12 insertions, 0 deletions

diff --git a/config-model/src/main/java/com/yahoo/vespa/model/search/NodeFlavorTuning.java b/config-model/src/main/java/com/yahoo/vespa/model/search/NodeFlavorTuning.java
index e4806cb2353..f6f64eba482 100644
--- a/config-model/src/main/java/com/yahoo/vespa/model/search/NodeFlavorTuning.java
+++ b/config-model/src/main/java/com/yahoo/vespa/model/search/NodeFlavorTuning.java
@@ -30,6 +30,12 @@ public class NodeFlavorTuning implements ProtonConfig.Producer {
         tuneFlushStrategyMemoryLimits(builder.flush.memory);
         tuneFlushStrategyTlsSize(builder.flush.memory);
         tuneSummaryReadIo(builder.summary.read);
+        tuneSummaryCache(builder.summary.cache);
+    }
+
+    private void tuneSummaryCache(ProtonConfig.Summary.Cache.Builder builder) {
+        long memoryLimitBytes = (long) ((nodeFlavor.getMinMainMemoryAvailableGb() * 0.05) * GB);
+        builder.maxbytes(memoryLimitBytes);
     }
 
     private void setHwInfo(ProtonConfig.Builder builder) {
diff --git a/config-model/src/test/java/com/yahoo/vespa/model/search/NodeFlavorTuningTest.java b/config-model/src/test/java/com/yahoo/vespa/model/search/NodeFlavorTuningTest.java
index 3d62670bb52..3019b35cd2e 100644
--- a/config-model/src/test/java/com/yahoo/vespa/model/search/NodeFlavorTuningTest.java
+++ b/config-model/src/test/java/com/yahoo/vespa/model/search/NodeFlavorTuningTest.java
@@ -87,6 +87,12 @@ public class NodeFlavorTuningTest {
     }
 
     @Test
+    public void require_that_summary_cache_max_bytes_is_set_based_on_memory() {
+        assertEquals(1*GB/20, configFromMemorySetting(1).summary().cache().maxbytes());
+        assertEquals(256*GB/20, configFromMemorySetting(256).summary().cache().maxbytes());
+    }
+
+    @Test
     public void require_that_docker_node_is_tagged_with_shared_disk() {
         assertSharedDisk(true, true);
         assertSharedDisk(false, false);