From 424b9147adcc164ca74ab41c6e6968147e76e8ec Mon Sep 17 00:00:00 2001
From: jonmv <venstad@gmail.com>
Date: Fri, 1 Sep 2023 12:23:51 +0200
Subject: Show search cluster name in Node.toString

---
 .../src/main/java/com/yahoo/search/dispatch/Dispatcher.java    | 10 +++++-----
 .../java/com/yahoo/search/dispatch/searchcluster/Node.java     |  8 +++++---
 2 files changed, 10 insertions(+), 8 deletions(-)

(limited to 'container-search/src/main/java/com')

diff --git a/container-search/src/main/java/com/yahoo/search/dispatch/Dispatcher.java b/container-search/src/main/java/com/yahoo/search/dispatch/Dispatcher.java
index 6f6b0fc2b79..eca0c8058a1 100644
--- a/container-search/src/main/java/com/yahoo/search/dispatch/Dispatcher.java
+++ b/container-search/src/main/java/com/yahoo/search/dispatch/Dispatcher.java
@@ -121,7 +121,7 @@ public class Dispatcher extends AbstractComponent {
                DispatchNodesConfig nodesConfig, VipStatus vipStatus, InvokerFactoryFactory invokerFactories) {
         this(dispatchConfig, rpcConnectionPool,
              new SearchCluster(clusterId.stringValue(), dispatchConfig.minActivedocsPercentage(),
-                               toNodes(nodesConfig), vipStatus, new RpcPingFactory(rpcConnectionPool)),
+                               toNodes(clusterId.stringValue(), nodesConfig), vipStatus, new RpcPingFactory(rpcConnectionPool)),
              invokerFactories);
     }
 
@@ -180,7 +180,7 @@ public class Dispatcher extends AbstractComponent {
      *    under the assumption that this is the common case, i.e., new nodes have no documents yet.
      */
     void updateWithNewConfig(DispatchNodesConfig nodesConfig) {
-        try (var items = volatileItems()) { // Marking a reference to the old snapshot, which we want to have cleaned up.
+        try (var items = volatileItems()) { // Mark a reference to the old snapshot, which we want to have cleaned up.
             items.get().countDown();        // Decrement for its initial creation reference, so it may reach 0.
 
             // Let the RPC pool know about the new nodes, and set up the delayed cleanup that we need to do.
@@ -192,7 +192,7 @@ public class Dispatcher extends AbstractComponent {
             };
 
             // Update the nodes the search cluster keeps track of, and what nodes are monitored.
-            ClusterMonitor<Node> newMonitor = searchCluster.updateNodes(toNodes(nodesConfig), dispatchConfig.minActivedocsPercentage());
+            ClusterMonitor<Node> newMonitor = searchCluster.updateNodes(toNodes(searchCluster.name(), nodesConfig), dispatchConfig.minActivedocsPercentage());
 
             // Update the snapshot to use the new nodes set in the search cluster; the RPC pool is ready for this.
             this.volatileItems = update(newMonitor);
@@ -234,9 +234,9 @@ public class Dispatcher extends AbstractComponent {
             case LATENCY_AMORTIZED_OVER_TIME -> LoadBalancer.Policy.LATENCY_AMORTIZED_OVER_TIME;
         };
     }
-    private static List<Node> toNodes(DispatchNodesConfig nodesConfig) {
+    private static List<Node> toNodes(String clusterName, DispatchNodesConfig nodesConfig) {
         return nodesConfig.node().stream()
-                .map(n -> new Node(n.key(), n.host(), n.group()))
+                .map(n -> new Node(clusterName, n.key(), n.host(), n.group()))
                 .toList();
     }
 
diff --git a/container-search/src/main/java/com/yahoo/search/dispatch/searchcluster/Node.java b/container-search/src/main/java/com/yahoo/search/dispatch/searchcluster/Node.java
index aeb04bfb141..c93f2f4c491 100644
--- a/container-search/src/main/java/com/yahoo/search/dispatch/searchcluster/Node.java
+++ b/container-search/src/main/java/com/yahoo/search/dispatch/searchcluster/Node.java
@@ -12,6 +12,7 @@ import java.util.concurrent.atomic.AtomicLong;
  */
 public class Node {
 
+    private final String clusterName;
     private final int key;
     private final String hostname;
     private final int group;
@@ -25,7 +26,8 @@ public class Node {
     private volatile boolean working = true;
     private volatile boolean isBlockingWrites = false;
 
-    public Node(int key, String hostname, int group) {
+    public Node(String clusterName, int key, String hostname, int group) {
+        this.clusterName = clusterName;
         this.key = key;
         this.hostname = hostname;
         this.group = group;
@@ -103,8 +105,8 @@ public class Node {
 
     @Override
     public String toString() {
-        return "search node key = " + key + " hostname = "+ hostname + " path = " + pathIndex + " in group " + group +
-               " statusIsKnown = " + statusIsKnown + " working = " + working +
+        return "search node in cluster = " + clusterName + " key = " + key + " hostname = "+ hostname +
+               " path = " + pathIndex + " in group " + group + " statusIsKnown = " + statusIsKnown + " working = " + working +
                " activeDocs = " + getActiveDocuments() + " targetActiveDocs = " + getTargetActiveDocuments();
     }
 
-- 
cgit v1.2.3