Enough to reserve 0.5Gb memory on content nodes

3 files changed, 11 insertions, 11 deletions

diff --git a/config-model/src/main/java/com/yahoo/vespa/model/search/NodeResourcesTuning.java b/config-model/src/main/java/com/yahoo/vespa/model/search/NodeResourcesTuning.java
index 7367850bb42..1d18b26440b 100644
--- a/config-model/src/main/java/com/yahoo/vespa/model/search/NodeResourcesTuning.java
+++ b/config-model/src/main/java/com/yahoo/vespa/model/search/NodeResourcesTuning.java
@@ -22,8 +22,8 @@ public class NodeResourcesTuning implements ProtonConfig.Producer {
     private final int threadsPerSearch;
     private final boolean combined;
 
-    // "Reserve" 1GB of memory for other processes running on the content node (config-proxy, cluster-controller, metrics-proxy).
-    public static final double reservedMemoryGb = 1;
+    // "Reserve" 0.5GB of memory for other processes running on the content node (config-proxy, metrics-proxy).
+    public static final double reservedMemoryGb = 0.5;
 
     public NodeResourcesTuning(NodeResources resources,
                                int redundancy,
diff --git a/config-model/src/test/java/com/yahoo/config/model/provision/ModelProvisioningTest.java b/config-model/src/test/java/com/yahoo/config/model/provision/ModelProvisioningTest.java
index f1c81e29923..711e153e2bb 100644
--- a/config-model/src/test/java/com/yahoo/config/model/provision/ModelProvisioningTest.java
+++ b/config-model/src/test/java/com/yahoo/config/model/provision/ModelProvisioningTest.java
@@ -1910,7 +1910,7 @@ public class ModelProvisioningTest {
         ProtonConfig cfg = getProtonConfig(model, cluster.getSearchNodes().get(0).getConfigId());
         assertEquals(2000, cfg.flush().memory().maxtlssize()); // from config override
         assertEquals(1000, cfg.flush().memory().maxmemory()); // from explicit tuning
-        assertEquals((long) (128 - reservedMemoryGb) * GB / 8, cfg.flush().memory().each().maxmemory()); // from default node flavor tuning
+        assertEquals((long) ((128 - reservedMemoryGb) * GB / 8), cfg.flush().memory().each().maxmemory()); // from default node flavor tuning
         assertEquals(0.92, cfg.writefilter().memorylimit(), 0.0001); // from explicit resource-limits
     }
 
diff --git a/config-model/src/test/java/com/yahoo/vespa/model/search/NodeResourcesTuningTest.java b/config-model/src/test/java/com/yahoo/vespa/model/search/NodeResourcesTuningTest.java
index 1f9c9b1e07a..b1a8cf07ead 100644
--- a/config-model/src/test/java/com/yahoo/vespa/model/search/NodeResourcesTuningTest.java
+++ b/config-model/src/test/java/com/yahoo/vespa/model/search/NodeResourcesTuningTest.java
@@ -10,6 +10,7 @@ import org.junit.Test;
 import java.util.Arrays;
 import java.util.List;
 
+import static com.yahoo.vespa.model.search.NodeResourcesTuning.reservedMemoryGb;
 import static org.junit.Assert.assertEquals;
 import static com.yahoo.vespa.model.search.NodeResourcesTuning.MB;
 import static com.yahoo.vespa.model.search.NodeResourcesTuning.GB;
@@ -19,9 +20,8 @@ import static com.yahoo.vespa.model.search.NodeResourcesTuning.GB;
  */
 public class NodeResourcesTuningTest {
 
-    private static double delta = 0.00001;
-    private static double combinedFactor = 1 - 17.0/100;
-    private static int reservedMemoryGb = (int)NodeResourcesTuning.reservedMemoryGb;
+    private static final double delta = 0.00001;
+    private static final double combinedFactor = 1 - 17.0/100;
 
     @Test
     public void require_that_hwinfo_disk_size_is_set() {
@@ -36,11 +36,11 @@ public class NodeResourcesTuningTest {
     }
 
     @Test
-    public void reserved_memory_on_content_node_is_1_gb() {
-        assertEquals(1.0, NodeResourcesTuning.reservedMemoryGb, delta);
+    public void reserved_memory_on_content_node_is_0_5_gb() {
+        assertEquals(0.5, reservedMemoryGb, delta);
     }
 
-    private ProtonConfig getProtonMemoryConfig(List<Pair<String, String>> sdAndMode, int gb, int redundancy, int searchableCopies) {
+    private ProtonConfig getProtonMemoryConfig(List<Pair<String, String>> sdAndMode, double gb, int redundancy, int searchableCopies) {
         ProtonConfig.Builder builder = new ProtonConfig.Builder();
         for (Pair<String, String> sdMode : sdAndMode) {
             builder.documentdb.add(new ProtonConfig.Documentdb.Builder()
@@ -206,11 +206,11 @@ public class NodeResourcesTuningTest {
         return getConfig(new FlavorsConfig.Flavor.Builder().minDiskAvailableGb(diskGb), false);
     }
 
-    private static ProtonConfig configFromMemorySetting(int memoryGb, boolean combined) {
+    private static ProtonConfig configFromMemorySetting(double memoryGb, boolean combined) {
         return getConfig(new FlavorsConfig.Flavor.Builder().minMainMemoryAvailableGb(memoryGb), combined);
     }
 
-    private static ProtonConfig configFromMemorySetting(int memoryGb, ProtonConfig.Builder builder, int redundancy, int searchableCopies) {
+    private static ProtonConfig configFromMemorySetting(double memoryGb, ProtonConfig.Builder builder, int redundancy, int searchableCopies) {
         return getConfig(new FlavorsConfig.Flavor.Builder()
                                  .minMainMemoryAvailableGb(memoryGb), builder, redundancy, searchableCopies, false);
     }