Show search cluster name in Node.toString

2 files changed, 17 insertions, 19 deletions

diff --git a/container-search/src/test/java/com/yahoo/search/dispatch/searchcluster/MockSearchCluster.java b/container-search/src/test/java/com/yahoo/search/dispatch/searchcluster/MockSearchCluster.java
index cd0791a3881..6900cc5dd52 100644
--- a/container-search/src/test/java/com/yahoo/search/dispatch/searchcluster/MockSearchCluster.java
+++ b/container-search/src/test/java/com/yahoo/search/dispatch/searchcluster/MockSearchCluster.java
@@ -79,7 +79,7 @@ public class MockSearchCluster extends SearchCluster {
         for (int group = 0; group < numGroups; group++) {
             List<Node> groupNodes = new ArrayList<>();
             for (int i = 0; i < nodesPerGroup; i++) {
-                Node node = new Node(distributionKey, "host" + distributionKey, group);
+                Node node = new Node("test", distributionKey, "host" + distributionKey, group);
                 node.setWorking(true);
                 groupNodes.add(node);
                 distributionKey++;
diff --git a/container-search/src/test/java/com/yahoo/search/dispatch/searchcluster/SearchClusterTest.java b/container-search/src/test/java/com/yahoo/search/dispatch/searchcluster/SearchClusterTest.java
index bfe1aed1084..65b0261b1f8 100644
--- a/container-search/src/test/java/com/yahoo/search/dispatch/searchcluster/SearchClusterTest.java
+++ b/container-search/src/test/java/com/yahoo/search/dispatch/searchcluster/SearchClusterTest.java
@@ -19,8 +19,6 @@ import java.util.concurrent.ExecutorService;
 import java.util.concurrent.Executors;
 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.atomic.AtomicInteger;
-import java.util.function.Function;
-import java.util.stream.Collectors;
 import java.util.stream.IntStream;
 
 import static java.util.function.Function.identity;
@@ -58,7 +56,7 @@ public class SearchClusterTest {
             for (String name : nodeNames) {
                 int key = nodes.size() % nodesPerGroup;
                 int group = nodes.size() / nodesPerGroup;
-                nodes.add(new Node(key, name, group));
+                nodes.add(new Node("test", key, name, group));
                 numDocsPerNode.add(new AtomicInteger(1));
                 pingCounts.add(new AtomicInteger(0));
             }
@@ -326,7 +324,7 @@ public class SearchClusterTest {
 
     @Test
     void requireThatPingSequenceIsUpHeld() {
-        Node node = new Node(1, "n", 1);
+        Node node = new Node("test", 1, "n", 1);
         assertEquals(1, node.createPingSequenceId());
         assertEquals(2, node.createPingSequenceId());
         assertEquals(0, node.getLastReceivedPongId());
@@ -348,7 +346,7 @@ public class SearchClusterTest {
 
     @Test
     void requireThatSingleNodeGroupIsInBalance() {
-        Group group = new Group(0, List.of(new Node(1, "n", 1)));
+        Group group = new Group(0, List.of(new Node("test", 1, "n", 1)));
         group.nodes().forEach(node -> node.setWorking(true));
         assertTrue(group.isBalanced());
         group.aggregateNodeValues();
@@ -360,7 +358,7 @@ public class SearchClusterTest {
 
     @Test
     void requireThatMultiNodeGroupDetectsBalance() {
-        Group group = new Group(0, List.of(new Node(1, "n1", 1), new Node(2, "n2", 1)));
+        Group group = new Group(0, List.of(new Node("test", 1, "n1", 1), new Node("test", 2, "n2", 1)));
         assertTrue(group.isBalanced());
         group.nodes().forEach(node -> node.setWorking(true));
         assertTrue(group.isBalanced());
@@ -386,21 +384,21 @@ public class SearchClusterTest {
     @Test
     void requireThatPreciselyTheRetainedNodesAreKeptWhenNodesAreUpdated() {
         try (State state = new State("query", 2, IntStream.range(0, 6).mapToObj(i -> "node-" + i).toList())) {
-            List<Node> referenceNodes = List.of(new Node(0, "node-0", 0),
-                                                new Node(1, "node-1", 0),
-                                                new Node(0, "node-2", 1),
-                                                new Node(1, "node-3", 1),
-                                                new Node(0, "node-4", 2),
-                                                new Node(1, "node-5", 2));
+            List<Node> referenceNodes = List.of(new Node("test", 0, "node-0", 0),
+                                                new Node("test", 1, "node-1", 0),
+                                                new Node("test", 0, "node-2", 1),
+                                                new Node("test", 1, "node-3", 1),
+                                                new Node("test", 0, "node-4", 2),
+                                                new Node("test", 1, "node-5", 2));
             SearchGroups oldGroups = state.searchCluster.groupList();
             assertEquals(Set.copyOf(referenceNodes), oldGroups.nodes());
 
-            List<Node> updatedNodes = List.of(new Node(0, "node-1", 0),  // Swap node-0 and node-1
-                                              new Node(1, "node-0", 0),  // Swap node-1 and node-0
-                                              new Node(0, "node-4", 1),  // Swap node-2 and node-4
-                                              new Node(1, "node-3", 1),
-                                              new Node(0, "node-2", 2),  // Swap node-4 and node-2
-                                              new Node(1, "node-6", 2)); // Replace node-6
+            List<Node> updatedNodes = List.of(new Node("test", 0, "node-1", 0),  // Swap node-0 and node-1
+                                              new Node("test", 1, "node-0", 0),  // Swap node-1 and node-0
+                                              new Node("test", 0, "node-4", 1),  // Swap node-2 and node-4
+                                              new Node("test", 1, "node-3", 1),
+                                              new Node("test", 0, "node-2", 2),  // Swap node-4 and node-2
+                                              new Node("test", 1, "node-6", 2)); // Replace node-6
             state.searchCluster.updateNodes(updatedNodes, 100.0);
             SearchGroups newGroups = state.searchCluster.groupList();
             assertEquals(Set.copyOf(updatedNodes), newGroups.nodes());