Gc unused config options: min-group-coverage and max nodes per group

5 files changed, 5 insertions, 33 deletions

diff --git a/config-model/src/main/java/com/yahoo/vespa/model/content/ContentSearchCluster.java b/config-model/src/main/java/com/yahoo/vespa/model/content/ContentSearchCluster.java
index 51949e78838..efb47e97ccb 100644
--- a/config-model/src/main/java/com/yahoo/vespa/model/content/ContentSearchCluster.java
+++ b/config-model/src/main/java/com/yahoo/vespa/model/content/ContentSearchCluster.java
@@ -316,12 +316,8 @@ public class ContentSearchCluster extends AbstractConfigProducer<SearchCluster>
     }
 
     public void handleRedundancy(Redundancy redundancy) {
-        if (hasIndexedCluster()) {
-            if (usesHierarchicDistribution()) {
-                indexedCluster.setMaxNodesDownPerFixedRow((redundancy.effectiveFinalRedundancy() / groupToSpecMap.size()) - 1);
-            }
+        if (hasIndexedCluster())
             indexedCluster.setSearchableCopies(redundancy.readyCopies());
-        }
         this.redundancy = redundancy;
     }
 
diff --git a/config-model/src/main/java/com/yahoo/vespa/model/content/DispatchTuning.java b/config-model/src/main/java/com/yahoo/vespa/model/content/DispatchTuning.java
index 3b694f8986c..786d032578f 100644
--- a/config-model/src/main/java/com/yahoo/vespa/model/content/DispatchTuning.java
+++ b/config-model/src/main/java/com/yahoo/vespa/model/content/DispatchTuning.java
@@ -15,7 +15,6 @@ public class DispatchTuning {
 
     private final Integer maxHitsPerPartition;
     private DispatchPolicy dispatchPolicy;
-    private final Double minGroupCoverage;
     private final Double minActiveDocsCoverage;
 
     public Double getTopkProbability() {
@@ -27,7 +26,6 @@ public class DispatchTuning {
     private DispatchTuning(Builder builder) {
         maxHitsPerPartition = builder.maxHitsPerPartition;
         dispatchPolicy = builder.dispatchPolicy;
-        minGroupCoverage = builder.minGroupCoverage;
         minActiveDocsCoverage = builder.minActiveDocsCoverage;
         topkProbability = builder.topKProbability;
     }
@@ -41,9 +39,6 @@ public class DispatchTuning {
     @SuppressWarnings("unused")
     public void setDispatchPolicy(DispatchPolicy dispatchPolicy) { this.dispatchPolicy = dispatchPolicy; }
 
-    /** Returns the percentage of nodes in a group which must be up for that group to receive queries */
-    public Double getMinGroupCoverage() { return minGroupCoverage; }
-
     /** Returns the percentage of documents which must be available in a group for that group to receive queries */
     public Double getMinActiveDocsCoverage() { return minActiveDocsCoverage; }
 
@@ -51,7 +46,6 @@ public class DispatchTuning {
 
         private Integer maxHitsPerPartition;
         private DispatchPolicy dispatchPolicy;
-        private Double minGroupCoverage;
         private Double minActiveDocsCoverage;
         private Double topKProbability;
 
@@ -81,11 +75,6 @@ public class DispatchTuning {
             }
         }
 
-        public Builder setMinGroupCoverage(Double minGroupCoverage) {
-            this.minGroupCoverage = minGroupCoverage;
-            return this;
-        }
-
         public Builder setMinActiveDocsCoverage(Double minCoverage) {
             this.minActiveDocsCoverage = minCoverage;
             return this;
diff --git a/config-model/src/main/java/com/yahoo/vespa/model/content/cluster/DomTuningDispatchBuilder.java b/config-model/src/main/java/com/yahoo/vespa/model/content/cluster/DomTuningDispatchBuilder.java
index 64911acae1f..e6cce0ad99c 100644
--- a/config-model/src/main/java/com/yahoo/vespa/model/content/cluster/DomTuningDispatchBuilder.java
+++ b/config-model/src/main/java/com/yahoo/vespa/model/content/cluster/DomTuningDispatchBuilder.java
@@ -25,12 +25,11 @@ public class DomTuningDispatchBuilder {
         builder.setMaxHitsPerPartition(dispatchElement.childAsInteger("max-hits-per-partition"));
         builder.setTopKProbability(dispatchElement.childAsDouble("top-k-probability"));
         builder.setDispatchPolicy(dispatchElement.childAsString("dispatch-policy"));
-        builder.setMinGroupCoverage(dispatchElement.childAsDouble("min-group-coverage"));
         builder.setMinActiveDocsCoverage(dispatchElement.childAsDouble("min-active-docs-coverage"));
 
         if (dispatchElement.child("use-local-node") != null)
             logger.logApplicationPackage(Level.WARNING, "Attribute 'use-local-node' is deprecated and ignored: " +
-                                      "The local node will automatically be preferred when appropriate.");
+                                                        "The local node will automatically be preferred when appropriate.");
         return builder.build();
     }
 
diff --git a/config-model/src/main/java/com/yahoo/vespa/model/search/DispatchGroup.java b/config-model/src/main/java/com/yahoo/vespa/model/search/DispatchGroup.java
index 384f77737c1..3e70bda216b 100644
--- a/config-model/src/main/java/com/yahoo/vespa/model/search/DispatchGroup.java
+++ b/config-model/src/main/java/com/yahoo/vespa/model/search/DispatchGroup.java
@@ -54,19 +54,18 @@ public class DispatchGroup {
 
     public int getSearchableCopies() { return sc.getSearchableCopies(); }
 
-    public int getMaxNodesDownPerFixedRow() {
-        return sc.getMaxNodesDownPerFixedRow();
-    }
-
     static class Iterator implements java.util.Iterator<SearchInterface> {
+
         private java.util.Iterator<Map<Integer, SearchInterface>> it1;
         private java.util.Iterator<SearchInterface> it2;
+
         Iterator(Map<Integer, Map<Integer, SearchInterface> > s) {
             it1 = s.values().iterator();
             if (it1.hasNext()) {
                 it2 = it1.next().values().iterator();
             }
         }
+
         @Override
         public boolean hasNext() {
             if (it2 == null) {
diff --git a/config-model/src/main/java/com/yahoo/vespa/model/search/IndexedSearchCluster.java b/config-model/src/main/java/com/yahoo/vespa/model/search/IndexedSearchCluster.java
index c77f44d649c..c99549e82e9 100644
--- a/config-model/src/main/java/com/yahoo/vespa/model/search/IndexedSearchCluster.java
+++ b/config-model/src/main/java/com/yahoo/vespa/model/search/IndexedSearchCluster.java
@@ -46,7 +46,6 @@ public class IndexedSearchCluster extends SearchCluster
     private String routingSelector = null;
     private final List<DocumentDatabase> documentDbs = new LinkedList<>();
     private final UnionConfiguration unionCfg;
-    private int maxNodesDownPerFixedRow = 0;
 
     private int searchableCopies = 1;
 
@@ -261,13 +260,6 @@ public class IndexedSearchCluster extends SearchCluster
         return false;
     }
 
-    int getMaxNodesDownPerFixedRow() {
-        return maxNodesDownPerFixedRow;
-    }
-
-    public void setMaxNodesDownPerFixedRow(int value) {
-        maxNodesDownPerFixedRow = value;
-    }
     public int getSearchableCopies() {
         return searchableCopies;
     }
@@ -305,8 +297,6 @@ public class IndexedSearchCluster extends SearchCluster
         }
         if (tuning.dispatch.getMinActiveDocsCoverage() != null)
             builder.minActivedocsPercentage(tuning.dispatch.getMinActiveDocsCoverage());
-        if (tuning.dispatch.getMinGroupCoverage() != null)
-            builder.minGroupCoverage(tuning.dispatch.getMinGroupCoverage());
         if (tuning.dispatch.getDispatchPolicy() != null) {
             switch (tuning.dispatch.getDispatchPolicy()) {
                 case ADAPTIVE:
@@ -320,7 +310,6 @@ public class IndexedSearchCluster extends SearchCluster
         if (tuning.dispatch.getMaxHitsPerPartition() != null)
             builder.maxHitsPerNode(tuning.dispatch.getMaxHitsPerPartition());
 
-        builder.maxNodesDownPerGroup(rootDispatch.getMaxNodesDownPerFixedRow());
         builder.searchableCopies(rootDispatch.getSearchableCopies());
         if (searchCoverage != null) {
             if (searchCoverage.getMinimum() != null)