- Name the monitor thread and make it a daemon.

1 files changed, 6 insertions, 3 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 51ae2ee432d..097d714b47b 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
@@ -51,7 +51,7 @@ public abstract class ClusterSearcher<T> extends PingableSearcher implements Nod
      * @param internal whether or not this cluster is internal (part of the same installation)
      */
     public ClusterSearcher(ComponentId id, List<T> connections, boolean internal) {
-        this(id, connections, new Hasher<T>(), internal);
+        this(id, connections, new Hasher<>(), internal);
     }
 
     public ClusterSearcher(ComponentId id, List<T> connections, Hasher<T> hasher, boolean internal) {
@@ -68,6 +68,9 @@ public abstract class ClusterSearcher<T> extends PingableSearcher implements Nod
         }
     }
 
+    @Override
+    public String name() { return getIdString(); }
+
     /** Pinging a node, called from ClusterMonitor */
     @Override
     public final void ping(ClusterMonitor<T> clusterMonitor, T p, Executor executor) {
@@ -112,7 +115,7 @@ public abstract class ClusterSearcher<T> extends PingableSearcher implements Nod
                     if (k == null) {
                         b.append("null\n");
                     } else {
-                        b.append(k.toString()).append('\n');
+                        b.append(k).append('\n');
                     }
                 }
                 traceAsString = b.toString();
@@ -303,7 +306,7 @@ public abstract class ClusterSearcher<T> extends PingableSearcher implements Nod
 
     private class Pinger implements Callable<Pong> {
 
-        private T connection;
+        private final T connection;
 
         public Pinger(T connection) {
             this.connection = connection;