aboutsummaryrefslogtreecommitdiffstats
path: root/config-model/src/test/java/com/yahoo/vespa/model/content
diff options
context:
space:
mode:
authorHenning Baldersheim <balder@yahoo-inc.com>2022-10-06 23:30:20 +0200
committerHenning Baldersheim <balder@yahoo-inc.com>2022-10-06 23:30:20 +0200
commitc63c5b593f0844173917ba31b99e4148c2706fd5 (patch)
tree64d2caca445ceffd5c76f8f2b1ce4df24d811a99 /config-model/src/test/java/com/yahoo/vespa/model/content
parent54fae00cefe5e3483461a472d49ee4310b023722 (diff)
No need for feature flag for max-merge-queue-size
Diffstat (limited to 'config-model/src/test/java/com/yahoo/vespa/model/content')
-rw-r--r--config-model/src/test/java/com/yahoo/vespa/model/content/StorageClusterTest.java8
1 files changed, 3 insertions, 5 deletions
diff --git a/config-model/src/test/java/com/yahoo/vespa/model/content/StorageClusterTest.java b/config-model/src/test/java/com/yahoo/vespa/model/content/StorageClusterTest.java
index 8f9941820d6..f3a59733ece 100644
--- a/config-model/src/test/java/com/yahoo/vespa/model/content/StorageClusterTest.java
+++ b/config-model/src/test/java/com/yahoo/vespa/model/content/StorageClusterTest.java
@@ -120,9 +120,7 @@ public class StorageClusterTest {
parse(cluster("foofighters", joinLines(
"<tuning>",
" <merges max-per-node=\"1K\" max-queue-size=\"10K\"/>",
- "</tuning>")),
- new TestProperties().setMaxMergeQueueSize(1919)
- ).getConfig(builder);
+ "</tuning>"))).getConfig(builder);
StorServerConfig config = new StorServerConfig(builder);
assertEquals(1024, config.max_merges_per_node());
@@ -174,9 +172,9 @@ public class StorageClusterTest {
@Test
void testMergeFeatureFlags() {
- var config = configFromProperties(new TestProperties().setMaxMergeQueueSize(1919));
+ var config = configFromProperties(new TestProperties());
assertEquals(16, config.max_merges_per_node());
- assertEquals(1919, config.max_merge_queue_size());
+ assertEquals(100, config.max_merge_queue_size());
}
@Test