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

3 files changed, 7 insertions, 4 deletions

diff --git a/container-search/src/main/java/com/yahoo/search/cluster/BaseNodeMonitor.java b/container-search/src/main/java/com/yahoo/search/cluster/BaseNodeMonitor.java
index 0d491d2f0c1..8eee7c11d3e 100644
--- a/container-search/src/main/java/com/yahoo/search/cluster/BaseNodeMonitor.java
+++ b/container-search/src/main/java/com/yahoo/search/cluster/BaseNodeMonitor.java
@@ -44,7 +44,7 @@ public abstract class BaseNodeMonitor<T> {
     protected MonitorConfiguration configuration;
 
     /** Is the node we monitor part of an internal Vespa cluster or not */
-    private boolean internal;
+    private final boolean internal;
 
     public BaseNodeMonitor(boolean internal) {
         this.internal=internal;
diff --git a/container-search/src/main/java/com/yahoo/search/cluster/ClusterMonitor.java b/container-search/src/main/java/com/yahoo/search/cluster/ClusterMonitor.java
index 27d8bb27ee8..c9b8aeee417 100644
--- a/container-search/src/main/java/com/yahoo/search/cluster/ClusterMonitor.java
+++ b/container-search/src/main/java/com/yahoo/search/cluster/ClusterMonitor.java
@@ -25,9 +25,9 @@ import java.util.logging.Logger;
  */
 public class ClusterMonitor<T> {
 
-    private final MonitorConfiguration configuration = new MonitorConfiguration();
+    private static final Logger log = Logger.getLogger(ClusterMonitor.class.getName());
 
-    private static Logger log = Logger.getLogger(ClusterMonitor.class.getName());
+    private final MonitorConfiguration configuration = new MonitorConfiguration();
 
     private final NodeManager<T> nodeManager;
 
diff --git a/container-search/src/main/java/com/yahoo/search/cluster/MonitorConfiguration.java b/container-search/src/main/java/com/yahoo/search/cluster/MonitorConfiguration.java
index a2fb982e3c5..95f51b374d6 100644
--- a/container-search/src/main/java/com/yahoo/search/cluster/MonitorConfiguration.java
+++ b/container-search/src/main/java/com/yahoo/search/cluster/MonitorConfiguration.java
@@ -9,7 +9,7 @@ package com.yahoo.search.cluster;
 public class MonitorConfiguration  {
 
     /** The interval in ms between consecutive checks of the monitored nodes */
-    private long checkInterval=1000;
+    private long checkInterval = 1000;
 
     /** The number of milliseconds to attempt to complete a request before giving up */
     private final long requestTimeout = 980;
@@ -18,6 +18,7 @@ public class MonitorConfiguration  {
     private long failLimit = 5000;
 
     /** Sets the interval between each ping of idle or failing nodes. Default is 1000 ms. */
+    @Deprecated // TODO: Remove on Vespa 8
     public void setCheckInterval(long intervalMs) { this.checkInterval = intervalMs; }
 
     /** Returns the interval between each ping of idle or failing nodes. Default is 1000 ms. */
@@ -59,6 +60,7 @@ public class MonitorConfiguration  {
      * Sets the number of milliseconds a node is allowed to fail before we
      * mark it as not working
      */
+    @Deprecated // TODO: Remove on Vespa 8
     public void setFailLimit(long failLimit) { this.failLimit=failLimit; }
 
     /**
@@ -86,6 +88,7 @@ public class MonitorConfiguration  {
     @Deprecated // TODO: Remove on Vespa 8
     public void setQuarantineTime(long quarantineTime) { }
 
+    @Override
     public String toString() {
         return "monitor configuration [" +
                "checkInterval: " + checkInterval +