Non-functional changes only

5 files changed, 38 insertions, 69 deletions

diff --git a/container-search/src/main/java/com/yahoo/search/cluster/ClusterSearcher.java b/container-search/src/main/java/com/yahoo/search/cluster/ClusterSearcher.java
index 2d05168731a..645c6446ef1 100644
--- a/container-search/src/main/java/com/yahoo/search/cluster/ClusterSearcher.java
+++ b/container-search/src/main/java/com/yahoo/search/cluster/ClusterSearcher.java
@@ -220,14 +220,6 @@ public abstract class ClusterSearcher<T> extends PingableSearcher implements Nod
         if (result == null)
             result = new Result(query, ErrorMessage.createBackendCommunicationError("No result returned in " + this +
                                                                                     " from " + connection + " for " + query));
-
-        if (result.hits().getError() != null) {
-            log(LogLevel.FINE, "FAILED: ", query);
-        } else if ( ! result.isCached()) {
-            log(LogLevel.FINE, "WORKING: ", query);
-        } else {
-            log(LogLevel.FINE, "CACHE HIT: ", query);
-        }
         return result;
     }
 
@@ -263,13 +255,6 @@ public abstract class ClusterSearcher<T> extends PingableSearcher implements Nod
             result.hits().addError(ErrorMessage.createBackendCommunicationError("Error filling " + result + " from " + connection + ": " +
                                                                                 Exceptions.toMessageString(e)));
         }
-        if (result.hits().getError() != null) {
-            log(LogLevel.FINE, "FAILED: ", result.getQuery());
-        } else if ( ! result.isCached()) {
-            log(LogLevel.FINE, "WORKING: ", result.getQuery());
-        } else {
-            log(LogLevel.FINE, "CACHE HIT: " + result.getQuery());
-        }
     }
 
     /**
diff --git a/container-search/src/main/java/com/yahoo/search/cluster/Hasher.java b/container-search/src/main/java/com/yahoo/search/cluster/Hasher.java
index 46752b0bedb..6c83e1c64e3 100644
--- a/container-search/src/main/java/com/yahoo/search/cluster/Hasher.java
+++ b/container-search/src/main/java/com/yahoo/search/cluster/Hasher.java
@@ -11,6 +11,7 @@ package com.yahoo.search.cluster;
 public class Hasher<T> {
 
     public static class NodeFactor<T> {
+
         private final T node;
 
         /**
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 21e5fe3bc7f..a2fb982e3c5 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
@@ -8,62 +8,43 @@ package com.yahoo.search.cluster;
  */
 public class MonitorConfiguration  {
 
-    /**
-     * The interval in ms between consecutive checks of the monitored
-     * nodes
-     */
+    /** The interval in ms between consecutive checks of the monitored nodes */
     private long checkInterval=1000;
 
-    /**
-     * The number of milliseconds to attempt to complete a request
-     * before giving up
-     */
+    /** The number of milliseconds to attempt to complete a request before giving up */
     private final long requestTimeout = 980;
 
-    /**
-     * The number of milliseconds a node is allowed to fail before we
-     * mark it as not working
-     */
-    private long failLimit=5000;
+    /** The number of milliseconds a node is allowed to fail before we mark it as not working */
+    private long failLimit = 5000;
 
-    /**
-     * Sets the interval between each ping of idle or failing nodes
-     * Default is 1000ms
-     */
-    public void setCheckInterval(long intervalMs) {
-        this.checkInterval=intervalMs;
-    }
+    /** Sets the interval between each ping of idle or failing nodes. Default is 1000 ms. */
+    public void setCheckInterval(long intervalMs) { this.checkInterval = intervalMs; }
 
-    /**
-     * Returns the interval between each ping of idle or failing nodes
-     * Default is 1000ms
-     */
-    public long getCheckInterval() {
-        return checkInterval;
-    }
+    /** Returns the interval between each ping of idle or failing nodes. Default is 1000 ms. */
+    public long getCheckInterval() { return checkInterval; }
 
     /**
-     * Sets the number of times a failed node must respond before it is put
-     * back in service. Default is 3.
-     * @deprecated Will go away in Vespa 8
+     * Sets the number of times a failed node must respond before it is put  back in service. Default is 3.
+     *
+     * @deprecated will go away in Vespa 8
      */
-    @Deprecated
+    @Deprecated // TODO: Remove on Vespa 8
     public void setResponseAfterFailLimit(int responseAfterFailLimit) { }
 
     /**
-     * Sets the number of ms a node (failing or working) is allowed to
-     * stay idle before it is pinged. Default is 3000
+     * Sets the number of ms a node (failing or working) is allowed to stay idle before it is pinged. Default is 3000.
+     *
      * @deprecated Will go away in Vespa 8
      */
-    @Deprecated
+    @Deprecated // TODO: Remove on Vespa 8
     public void setIdleLimit(int idleLimit) { }
 
     /**
-     * Gets the number of ms a node (failing or working)
-     * is allowed to stay idle before it is pinged. Default is 3000
+     * Gets the number of ms a node (failing or working) is allowed to stay idle before it is pinged. Default is 3000.
+     *
      * @deprecated Will go away in Vespa 8
      */
-    @Deprecated
+    @Deprecated // TODO: Remove on Vespa 8
     public long getIdleLimit() {
         return 3000;
     }
@@ -91,25 +72,26 @@ public class MonitorConfiguration  {
      * in quarantine.  Once in quarantine it won't be put back in
      * productuion before quarantineTime has expired even if it is
      * working. Default is 3
+     *
      * @deprecated Will go away in Vespa 8
      */
-    @Deprecated
+    @Deprecated // TODO: Remove on Vespa 8
     public void setFailQuarantineLimit(int failQuarantineLimit) { }
 
     /**
-     * The number of ms an unstable node is quarantined. Default is
-     * 100*60*60
+     * The number of ms an unstable node is quarantined. Default is 100*60*60
+     *
      * @deprecated Will go away in Vespa 8
      */
-    @Deprecated
+    @Deprecated // TODO: Remove on Vespa 8
     public void setQuarantineTime(long quarantineTime) { }
 
     public String toString() {
         return "monitor configuration [" +
-            "checkInterval: " + checkInterval +
-            " requestTimeout " + requestTimeout +
-            " failLimit " + failLimit +
-            "]";
+               "checkInterval: " + checkInterval +
+               " requestTimeout " + requestTimeout +
+               " failLimit " + failLimit +
+               "]";
     }
 
 }
diff --git a/container-search/src/main/java/com/yahoo/search/cluster/NodeManager.java b/container-search/src/main/java/com/yahoo/search/cluster/NodeManager.java
index 481f1e1b5a5..836c71089c1 100644
--- a/container-search/src/main/java/com/yahoo/search/cluster/NodeManager.java
+++ b/container-search/src/main/java/com/yahoo/search/cluster/NodeManager.java
@@ -7,7 +7,7 @@ import java.util.concurrent.Executor;
  * Must be implemented by a node collection which wants
  * it's node state monitored by a ClusterMonitor
  *
- * @author  bratseth
+ * @author bratseth
  */
 public interface NodeManager<T> {
 
@@ -20,9 +20,10 @@ public interface NodeManager<T> {
     /** 
      * Called when a node should be pinged. 
      * This *must* lead to either a call to NodeMonitor.failed or NodeMonitor.responded
+     *
      * @deprecated Use ping(ClusterMonitor clusterMonitor, T node, Executor executor) instead.
      */
-    @Deprecated
+    @Deprecated // TODO: Remove on Vespa 8
     default void ping(T node, Executor executor) {
         throw new IllegalStateException("If you have not overrriden ping(ClusterMonitor<T> clusterMonitor, T node, Executor executor), you should at least have overriden this method.");
     }
diff --git a/container-search/src/main/java/com/yahoo/search/cluster/TrafficNodeMonitor.java b/container-search/src/main/java/com/yahoo/search/cluster/TrafficNodeMonitor.java
index ccf3e863ff3..d17f6bfbaa8 100644
--- a/container-search/src/main/java/com/yahoo/search/cluster/TrafficNodeMonitor.java
+++ b/container-search/src/main/java/com/yahoo/search/cluster/TrafficNodeMonitor.java
@@ -52,8 +52,8 @@ public class TrafficNodeMonitor<T> extends BaseNodeMonitor<T> {
      * Called when a response is received from this node.
      */
     public void responded() {
-        respondedAt=now();
-        succeededAt=respondedAt;
+        respondedAt = now();
+        succeededAt = respondedAt;
 
         setWorking(true,"Responds correctly");
     }
@@ -69,20 +69,20 @@ public class TrafficNodeMonitor<T> extends BaseNodeMonitor<T> {
         atStartUp = false;
         if (this.isWorking == working) return; // Old news
 
-        if (explanation==null) {
-            explanation="";
+        if (explanation == null) {
+            explanation = "";
         } else {
-            explanation=": " + explanation;
+            explanation = ": " + explanation;
         }
 
         if (working) {
             log.info("Putting " + node + " in service" + explanation);
         } else {
             log.warning("Taking " + node + " out of service" + explanation);
-            failedAt=now();
+            failedAt = now();
         }
 
-        this.isWorking=working;
+        this.isWorking = working;
     }
 
 }