aboutsummaryrefslogtreecommitdiffstats
path: root/config-model
diff options
context:
space:
mode:
authorHenning Baldersheim <balder@yahoo-inc.com>2022-01-10 11:48:49 +0100
committerHenning Baldersheim <balder@yahoo-inc.com>2022-01-10 11:48:49 +0100
commit88dbdea21e058cd4383040c3fed2c668b6af91cf (patch)
tree224fefa917a565e3ba3ce08c1c6232456f231350 /config-model
parentca9e75d4d99120a051b40900b9b2838b705faaad (diff)
Reduce default memory gain limit from 10% to 8%
Diffstat (limited to 'config-model')
-rw-r--r--config-model/src/main/java/com/yahoo/vespa/model/search/NodeResourcesTuning.java2
-rw-r--r--config-model/src/test/java/com/yahoo/config/model/provision/ModelProvisioningTest.java2
-rw-r--r--config-model/src/test/java/com/yahoo/vespa/model/search/NodeResourcesTuningTest.java9
3 files changed, 7 insertions, 6 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 0eb0bd0bf2d..b3de53c2344 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
@@ -16,7 +16,7 @@ public class NodeResourcesTuning implements ProtonConfig.Producer {
private final static double SUMMARY_FILE_SIZE_AS_FRACTION_OF_MEMORY = 0.02;
private final static double SUMMARY_CACHE_SIZE_AS_FRACTION_OF_MEMORY = 0.05;
- private final static double MEMORY_GAIN_AS_FRACTION_OF_MEMORY = 0.10;
+ private final static double MEMORY_GAIN_AS_FRACTION_OF_MEMORY = 0.08;
final static long MB = 1024 * 1024;
public final static long GB = MB * 1024;
// This is an approximate number base on observation of a node using 33G memory with 765M docs
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 2447709f778..10f883bdc75 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
@@ -2166,7 +2166,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 * 0.10), cfg.flush().memory().each().maxmemory()); // from default node flavor tuning
+ assertEquals((long) ((128 - reservedMemoryGb) * GB * 0.08), cfg.flush().memory().each().maxmemory()); // from default node flavor tuning
}
private static ProtonConfig getProtonConfig(VespaModel model, String configId) {
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 9a6a7458766..03b49c9303d 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
@@ -23,6 +23,7 @@ public class NodeResourcesTuningTest {
private static final double delta = 0.00001;
private static final double combinedFactor = 1 - 18.0/100;
+ private static final double DEFAULT_MEMORY_GAIN = 0.08;
@Test
public void require_that_hwinfo_disk_size_is_set() {
@@ -125,10 +126,10 @@ public class NodeResourcesTuningTest {
@Test
public void require_that_flush_strategy_memory_limits_are_set_based_on_available_memory() {
- assertFlushStrategyMemory((long)(4 * GB * 0.10), 4);
- assertFlushStrategyMemory((long)(8 * GB * 0.10), 8);
- assertFlushStrategyMemory((long)(24 * GB * 0.10), 24);
- assertFlushStrategyMemory((long)(64 * GB * 0.10), 64);
+ assertFlushStrategyMemory((long)(4 * GB * DEFAULT_MEMORY_GAIN), 4);
+ assertFlushStrategyMemory((long)(8 * GB * DEFAULT_MEMORY_GAIN), 8);
+ assertFlushStrategyMemory((long)(24 * GB * DEFAULT_MEMORY_GAIN), 24);
+ assertFlushStrategyMemory((long)(64 * GB * DEFAULT_MEMORY_GAIN), 64);
}
@Test