Resolving of initialnumdocs is now done in the backend.

3 files changed, 3 insertions, 32 deletions

diff --git a/config-model/src/main/java/com/yahoo/vespa/model/builder/xml/dom/DomSearchTuningBuilder.java b/config-model/src/main/java/com/yahoo/vespa/model/builder/xml/dom/DomSearchTuningBuilder.java
index 273e5580403..a78304a65a7 100644
--- a/config-model/src/main/java/com/yahoo/vespa/model/builder/xml/dom/DomSearchTuningBuilder.java
+++ b/config-model/src/main/java/com/yahoo/vespa/model/builder/xml/dom/DomSearchTuningBuilder.java
@@ -56,7 +56,7 @@ public class DomSearchTuningBuilder extends VespaDomBuilder.DomConfigProducerBui
             } else if (equals("flushstrategy", e)) {
                 handleFlushStrategy(e, t.searchNode);
             } else if (equals("resizing", e)) {
-                handleResizing(deployLogger, e, t.searchNode);
+                deployLogger.logApplicationPackage(Level.WARNING, "saerchnode.resizing is deprecated and ignored");
             } else if (equals("index", e)) {
                 handleIndex(deployLogger, e, t.searchNode);
             } else if (equals("attribute", e)) {
@@ -164,18 +164,6 @@ public class DomSearchTuningBuilder extends VespaDomBuilder.DomConfigProducerBui
         }
     }
 
-    private void handleResizing(DeployLogger deployLogger, Element spec, Tuning.SearchNode sn) {
-        sn.resizing = new Tuning.SearchNode.Resizing();
-        for (Element e : XML.getChildren(spec)) {
-            if (equals("initialdocumentcount", e)) {
-                deployLogger.logApplicationPackage(Level.WARNING, "resizing.initialdocumentcount is deprecated.");
-                sn.resizing.initialDocumentCount = asInt(e);
-            } else if (equals("amortize-count", e)) {
-                deployLogger.logApplicationPackage(Level.WARNING, "resizing.amortize-count is deprecated and ignored");
-            }
-        }
-    }
-
     private void handleIndex(DeployLogger deployLogger, Element spec, Tuning.SearchNode sn) {
         sn.index = new Tuning.SearchNode.Index();
         for (Element e : XML.getChildren(spec)) {
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 2beec421faa..2616dd8a93c 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
@@ -23,21 +23,16 @@ public class NodeResourcesTuning implements ProtonConfig.Producer {
     private final static double TLS_SIZE_FRACTION = 0.02;
     final static long MB = 1024 * 1024;
     public final static long GB = MB * 1024;
-    // This is an approximate number based on observation of a node using 33G memory with 765M docs
-    private final static long MEMORY_COST_PER_DOCUMENT_DB_ONLY = 46L;
     private final NodeResources resources;
     private final int threadsPerSearch;
     private final double fractionOfMemoryReserved;
-    private final Redundancy redundancy;
 
     public NodeResourcesTuning(NodeResources resources,
                                int threadsPerSearch,
-                               double fractionOfMemoryReserved,
-                               Redundancy redundancy) {
+                               double fractionOfMemoryReserved) {
         this.resources = resources;
         this.threadsPerSearch = threadsPerSearch;
         this.fractionOfMemoryReserved = fractionOfMemoryReserved;
-        this.redundancy = redundancy;
     }
 
     @Override
@@ -52,18 +47,6 @@ public class NodeResourcesTuning implements ProtonConfig.Producer {
         tuneSummaryReadIo(builder.summary.read);
         tuneSummaryCache(builder.summary.cache);
         tuneSearchReadIo(builder.search.mmap);
-        for (ProtonConfig.Documentdb.Builder dbb : builder.documentdb) {
-            getConfig(dbb);
-        }
-    }
-
-    private void getConfig(ProtonConfig.Documentdb.Builder builder) {
-        // TODO => Move this to backend to enable ignoring this setting.
-        ProtonConfig.Documentdb dbCfg = builder.build();
-        if (dbCfg.mode() != ProtonConfig.Documentdb.Mode.Enum.INDEX) {
-            long numDocs = (long)usableMemoryGb() * GB / MEMORY_COST_PER_DOCUMENT_DB_ONLY;
-            builder.allocation.initialnumdocs(numDocs/redundancy.readyCopies());
-        }
     }
 
     private void tuneSummaryCache(ProtonConfig.Summary.Cache.Builder builder) {
diff --git a/config-model/src/main/java/com/yahoo/vespa/model/search/SearchNode.java b/config-model/src/main/java/com/yahoo/vespa/model/search/SearchNode.java
index 83c1778b95e..c0f22da2982 100644
--- a/config-model/src/main/java/com/yahoo/vespa/model/search/SearchNode.java
+++ b/config-model/src/main/java/com/yahoo/vespa/model/search/SearchNode.java
@@ -284,7 +284,7 @@ public class SearchNode extends AbstractService implements
         if (nodeResources.isPresent()) {
             var nodeResourcesTuning = new NodeResourcesTuning(nodeResources.get(),
                                                               tuning.map(Tuning::threadsPerSearch).orElse(1),
-                                                              fractionOfMemoryReserved, redundancyProvider.redundancy());
+                                                              fractionOfMemoryReserved);
             nodeResourcesTuning.getConfig(builder);
 
             tuning.ifPresent(t -> t.getConfig(builder));