From 97270a57e5969ade4731ab659cb7de2165c058bf Mon Sep 17 00:00:00 2001 From: Henning Baldersheim Date: Tue, 29 Jan 2019 08:38:10 +0100 Subject: Less eager on the memory until we know a reasonable upper limit. --- .../src/main/java/com/yahoo/vespa/model/search/NodeFlavorTuning.java | 2 +- .../test/java/com/yahoo/vespa/model/search/NodeFlavorTuningTest.java | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) (limited to 'config-model') 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 8cf1db3d6f5..da193a17801 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 @@ -39,7 +39,7 @@ public class NodeFlavorTuning implements ProtonConfig.Producer { private void getConfig(ProtonConfig.Documentdb.Builder builder) { ProtonConfig.Documentdb dbCfg = builder.build(); if (dbCfg.mode() != ProtonConfig.Documentdb.Mode.Enum.INDEX) { - long numDocs = (long)nodeFlavor.getMinMainMemoryAvailableGb()*GB/40L; + long numDocs = (long)nodeFlavor.getMinMainMemoryAvailableGb()*GB/64L; builder.allocation.initialnumdocs(numDocs); } } 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 56d53c2cc69..c6e322188c0 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 @@ -49,9 +49,9 @@ public class NodeFlavorTuningTest { assertEquals(3, cfg.documentdb().size()); assertEquals(1024, cfg.documentdb(0).allocation().initialnumdocs()); assertEquals("a", cfg.documentdb(0).inputdoctypename()); - assertEquals(644245094L, cfg.documentdb(1).allocation().initialnumdocs()); + assertEquals(402653184, cfg.documentdb(1).allocation().initialnumdocs()); assertEquals("b", cfg.documentdb(1).inputdoctypename()); - assertEquals(644245094L, cfg.documentdb(2).allocation().initialnumdocs()); + assertEquals(402653184, cfg.documentdb(2).allocation().initialnumdocs()); assertEquals("c", cfg.documentdb(2).inputdoctypename()); } -- cgit v1.2.3