Java dispatcher refactoring and cluster monitoring improvements

1 files changed, 22 insertions, 21 deletions

diff --git a/container-search/src/test/java/com/yahoo/search/dispatch/LoadBalancerTest.java b/container-search/src/test/java/com/yahoo/search/dispatch/LoadBalancerTest.java
index 9311ddab3c6..698cee743e4 100644
--- a/container-search/src/test/java/com/yahoo/search/dispatch/LoadBalancerTest.java
+++ b/container-search/src/test/java/com/yahoo/search/dispatch/LoadBalancerTest.java
@@ -2,8 +2,9 @@
 package com.yahoo.search.dispatch;
 
 import com.yahoo.search.Query;
-import com.yahoo.search.dispatch.SearchCluster.Group;
-import com.yahoo.search.dispatch.SearchCluster.Node;
+import com.yahoo.search.dispatch.searchcluster.Group;
+import com.yahoo.search.dispatch.searchcluster.Node;
+import com.yahoo.search.dispatch.searchcluster.SearchCluster;
 import junit.framework.AssertionFailedError;
 import org.junit.Test;
 
@@ -21,11 +22,11 @@ import static org.junit.Assert.assertThat;
 public class LoadBalancerTest {
     @Test
     public void requreThatLoadBalancerServesSingleNodeSetups() {
-        Node n1 = new SearchCluster.Node(0, "test-node1", 0, 0);
+        Node n1 = new Node(0, "test-node1", 0, 0);
         SearchCluster cluster = new SearchCluster(88.0, 99.0, 0, Arrays.asList(n1), null, 1, null);
         LoadBalancer lb = new LoadBalancer(cluster, true);
 
-        Optional<Group> grp = lb.takeGroupForQuery(new Query());
+        Optional<Group> grp = lb.takeGroupForQuery(new Query(), null);
         Group group = grp.orElseGet(() -> {
             throw new AssertionFailedError("Expected a SearchCluster.Group");
         });
@@ -34,12 +35,12 @@ public class LoadBalancerTest {
 
     @Test
     public void requreThatLoadBalancerServesMultiGroupSetups() {
-        Node n1 = new SearchCluster.Node(0, "test-node1", 0, 0);
-        Node n2 = new SearchCluster.Node(1, "test-node2", 1, 1);
+        Node n1 = new Node(0, "test-node1", 0, 0);
+        Node n2 = new Node(1, "test-node2", 1, 1);
         SearchCluster cluster = new SearchCluster(88.0, 99.0, 0, Arrays.asList(n1, n2), null, 1, null);
         LoadBalancer lb = new LoadBalancer(cluster, true);
 
-        Optional<Group> grp = lb.takeGroupForQuery(new Query());
+        Optional<Group> grp = lb.takeGroupForQuery(new Query(), null);
         Group group = grp.orElseGet(() -> {
             throw new AssertionFailedError("Expected a SearchCluster.Group");
         });
@@ -48,51 +49,51 @@ public class LoadBalancerTest {
 
     @Test
     public void requreThatLoadBalancerServesClusteredGroups() {
-        Node n1 = new SearchCluster.Node(0, "test-node1", 0, 0);
-        Node n2 = new SearchCluster.Node(1, "test-node2", 1, 0);
-        Node n3 = new SearchCluster.Node(0, "test-node3", 0, 1);
-        Node n4 = new SearchCluster.Node(1, "test-node4", 1, 1);
+        Node n1 = new Node(0, "test-node1", 0, 0);
+        Node n2 = new Node(1, "test-node2", 1, 0);
+        Node n3 = new Node(0, "test-node3", 0, 1);
+        Node n4 = new Node(1, "test-node4", 1, 1);
         SearchCluster cluster = new SearchCluster(88.0, 99.0, 0, Arrays.asList(n1, n2, n3, n4), null, 2, null);
         LoadBalancer lb = new LoadBalancer(cluster, true);
 
-        Optional<Group> grp = lb.takeGroupForQuery(new Query());
+        Optional<Group> grp = lb.takeGroupForQuery(new Query(), null);
         assertThat(grp.isPresent(), is(true));
     }
 
     @Test
     public void requreThatLoadBalancerReturnsDifferentGroups() {
-        Node n1 = new SearchCluster.Node(0, "test-node1", 0, 0);
-        Node n2 = new SearchCluster.Node(1, "test-node2", 1, 1);
+        Node n1 = new Node(0, "test-node1", 0, 0);
+        Node n2 = new Node(1, "test-node2", 1, 1);
         SearchCluster cluster = new SearchCluster(88.0, 99.0, 0, Arrays.asList(n1, n2), null, 1, null);
         LoadBalancer lb = new LoadBalancer(cluster, true);
 
         // get first group
-        Optional<Group> grp = lb.takeGroupForQuery(new Query());
+        Optional<Group> grp = lb.takeGroupForQuery(new Query(), null);
         Group group = grp.get();
         int id1 = group.id();
         // release allocation
         lb.releaseGroup(group);
 
         // get second group
-        grp = lb.takeGroupForQuery(new Query());
+        grp = lb.takeGroupForQuery(new Query(), null);
         group = grp.get();
         assertThat(group.id(), not(equalTo(id1)));
     }
 
     @Test
     public void requreThatLoadBalancerReturnsGroupWithShortestQueue() {
-        Node n1 = new SearchCluster.Node(0, "test-node1", 0, 0);
-        Node n2 = new SearchCluster.Node(1, "test-node2", 1, 1);
+        Node n1 = new Node(0, "test-node1", 0, 0);
+        Node n2 = new Node(1, "test-node2", 1, 1);
         SearchCluster cluster = new SearchCluster(88.0, 99.0, 0, Arrays.asList(n1, n2), null, 1, null);
         LoadBalancer lb = new LoadBalancer(cluster, true);
 
         // get first group
-        Optional<Group> grp = lb.takeGroupForQuery(new Query());
+        Optional<Group> grp = lb.takeGroupForQuery(new Query(), null);
         Group group = grp.get();
         int id1 = group.id();
 
         // get second group
-        grp = lb.takeGroupForQuery(new Query());
+        grp = lb.takeGroupForQuery(new Query(), null);
         group = grp.get();
         int id2 = group.id();
         assertThat(id2, not(equalTo(id1)));
@@ -100,7 +101,7 @@ public class LoadBalancerTest {
         lb.releaseGroup(group);
 
         // get third group
-        grp = lb.takeGroupForQuery(new Query());
+        grp = lb.takeGroupForQuery(new Query(), null);
         group = grp.get();
         assertThat(group.id(), equalTo(id2));
     }