Use clustername-direct routes for visitors

9 files changed, 14 insertions, 17 deletions

diff --git a/clustercontroller-reindexer/src/main/java/ai/vespa/reindexing/Reindexer.java b/clustercontroller-reindexer/src/main/java/ai/vespa/reindexing/Reindexer.java
index cd2260331e6..2f769143e6e 100644
--- a/clustercontroller-reindexer/src/main/java/ai/vespa/reindexing/Reindexer.java
+++ b/clustercontroller-reindexer/src/main/java/ai/vespa/reindexing/Reindexer.java
@@ -229,7 +229,7 @@ public class Reindexer {
         }
 
         String route() {
-            return name;
+            return name + "-direct";
         }
 
         String bucketSpaceOf(DocumentType documentType) {
diff --git a/clustercontroller-reindexer/src/test/java/ai/vespa/reindexing/ReindexerTest.java b/clustercontroller-reindexer/src/test/java/ai/vespa/reindexing/ReindexerTest.java
index 03f93b814a8..160022cc996 100644
--- a/clustercontroller-reindexer/src/test/java/ai/vespa/reindexing/ReindexerTest.java
+++ b/clustercontroller-reindexer/src/test/java/ai/vespa/reindexing/ReindexerTest.java
@@ -84,7 +84,7 @@ class ReindexerTest {
         assertEquals("music:[document]", parameters.getFieldSet());
         assertSame(token, parameters.getResumeToken());
         assertEquals("default", parameters.getBucketSpace());
-        assertEquals("cluster", parameters.getRoute().toString());
+        assertEquals("cluster-direct", parameters.getRoute().toString());
         assertEquals("cluster", parameters.getRemoteDataHandler());
         assertEquals("music", parameters.getDocumentSelection());
         assertEquals(DocumentProtocol.Priority.NORMAL_3, parameters.getPriority());
diff --git a/vespaclient-container-plugin/src/main/java/com/yahoo/document/restapi/resource/DocumentV1ApiHandler.java b/vespaclient-container-plugin/src/main/java/com/yahoo/document/restapi/resource/DocumentV1ApiHandler.java
index 7ce3a7ede08..2988ce07ae6 100644
--- a/vespaclient-container-plugin/src/main/java/com/yahoo/document/restapi/resource/DocumentV1ApiHandler.java
+++ b/vespaclient-container-plugin/src/main/java/com/yahoo/document/restapi/resource/DocumentV1ApiHandler.java
@@ -952,7 +952,7 @@ public class DocumentV1ApiHandler extends AbstractRequestHandler {
         }
 
         String name() { return name; }
-        String route() { return name(); }
+        String route() { return name() + "-direct"; }
         Optional<String> bucketOf(String documentType) { return Optional.ofNullable(documentBuckets.get(documentType)); }
 
     }
diff --git a/vespaclient-container-plugin/src/test/java/com/yahoo/document/restapi/resource/DocumentV1ApiTest.java b/vespaclient-container-plugin/src/test/java/com/yahoo/document/restapi/resource/DocumentV1ApiTest.java
index 85ff1bec2d4..2b47f9c92c2 100644
--- a/vespaclient-container-plugin/src/test/java/com/yahoo/document/restapi/resource/DocumentV1ApiTest.java
+++ b/vespaclient-container-plugin/src/test/java/com/yahoo/document/restapi/resource/DocumentV1ApiTest.java
@@ -138,7 +138,7 @@ public class DocumentV1ApiTest {
     public void testResolveCluster() {
         assertEquals("content",
                      DocumentV1ApiHandler.resolveCluster(Optional.empty(), clusters).name());
-        assertEquals("content",
+        assertEquals("content-direct",
                      DocumentV1ApiHandler.resolveCluster(Optional.of("content"), clusters).route());
         try {
             DocumentV1ApiHandler.resolveCluster(Optional.empty(), Map.of());
@@ -192,7 +192,7 @@ public class DocumentV1ApiTest {
 
         // GET at root is a visit. Numeric parameters have an upper bound.
         access.expect(parameters -> {
-            assertEquals("content", parameters.getRoute().toString());
+            assertEquals("content-direct", parameters.getRoute().toString());
             assertEquals("default", parameters.getBucketSpace());
             assertEquals(1024, parameters.getMaxTotalHits());
             assertEquals(100, ((StaticThrottlePolicy) parameters.getThrottlePolicy()).getMaxPendingCount());
@@ -274,7 +274,7 @@ public class DocumentV1ApiTest {
         // GET with full document ID is a document get operation which returns 404 when no document is found
         access.session.expect((id, parameters) -> {
             assertEquals(doc1.getId(), id);
-            assertEquals(parameters().withRoute("content").withFieldSet("go"), parameters);
+            assertEquals(parameters().withRoute("content-direct").withFieldSet("go"), parameters);
             parameters.responseHandler().get().handleResponse(new DocumentResponse(0, null));
             return new Result(Result.ResultType.SUCCESS, null);
         });
diff --git a/vespaclient-core/src/main/java/com/yahoo/vespaclient/ClusterDef.java b/vespaclient-core/src/main/java/com/yahoo/vespaclient/ClusterDef.java
index 3860941d0ec..f3b8c189fc5 100644
--- a/vespaclient-core/src/main/java/com/yahoo/vespaclient/ClusterDef.java
+++ b/vespaclient-core/src/main/java/com/yahoo/vespaclient/ClusterDef.java
@@ -2,11 +2,8 @@
 package com.yahoo.vespaclient;
 
 public class ClusterDef {
-    public ClusterDef(String name) {
-        this.name = name;
-    }
-
-    String name;
-
+    private final String name;
+    public ClusterDef(String name) { this.name = name; }
     public String getName() { return name; }
+    public String getRoute() { return name + "-direct"; }
 }
diff --git a/vespaclient-java/src/main/java/com/yahoo/vespaget/DocumentRetriever.java b/vespaclient-java/src/main/java/com/yahoo/vespaget/DocumentRetriever.java
index 21424ac335c..ebed1685a5f 100644
--- a/vespaclient-java/src/main/java/com/yahoo/vespaget/DocumentRetriever.java
+++ b/vespaclient-java/src/main/java/com/yahoo/vespaget/DocumentRetriever.java
@@ -116,7 +116,7 @@ public class DocumentRetriever {
                     "The Vespa cluster contains the content clusters %s, not %s. Please select a valid vespa cluster.",
                     names, clusterName));
         }
-        return clusterDef.getName();
+        return clusterDef.getRoute();
     }
 
     private LoadType resolveLoadType(String loadTypeName) throws DocumentRetrieverException {
diff --git a/vespaclient-java/src/main/java/com/yahoo/vespavisit/VdsVisit.java b/vespaclient-java/src/main/java/com/yahoo/vespavisit/VdsVisit.java
index 386679abc94..b1f91e44e5c 100644
--- a/vespaclient-java/src/main/java/com/yahoo/vespavisit/VdsVisit.java
+++ b/vespaclient-java/src/main/java/com/yahoo/vespavisit/VdsVisit.java
@@ -600,7 +600,7 @@ public class VdsVisit {
                                                names + ". Please use the -c option to select one of them as a target for visiting.");
         }
 
-        return found.getName();
+        return found.getRoute();
     }
 
     protected static void verbosePrintParameters(VdsVisitParameters vdsParams, PrintStream out) {
diff --git a/vespaclient-java/src/test/java/com/yahoo/vespaget/DocumentRetrieverTest.java b/vespaclient-java/src/test/java/com/yahoo/vespaget/DocumentRetrieverTest.java
index ea7781e657c..d6bda4b8bc1 100644
--- a/vespaclient-java/src/test/java/com/yahoo/vespaget/DocumentRetrieverTest.java
+++ b/vespaclient-java/src/test/java/com/yahoo/vespaget/DocumentRetrieverTest.java
@@ -235,7 +235,7 @@ public class DocumentRetrieverTest {
     @Test
     public void testClusterLookup() throws DocumentRetrieverException {
         final String cluster = "storage",
-                expectedRoute = "storage";
+                expectedRoute = "storage-direct";
 
         ClientParameters params = createParameters()
                 .setCluster(cluster)
diff --git a/vespaclient-java/src/test/java/com/yahoo/vespavisit/VdsVisitTestCase.java b/vespaclient-java/src/test/java/com/yahoo/vespavisit/VdsVisitTestCase.java
index b7412fe9905..7828fbb249d 100644
--- a/vespaclient-java/src/test/java/com/yahoo/vespavisit/VdsVisitTestCase.java
+++ b/vespaclient-java/src/test/java/com/yahoo/vespavisit/VdsVisitTestCase.java
@@ -232,7 +232,7 @@ public class VdsVisitTestCase {
         ClusterList clusterList = new ClusterList(clusterDefs);
 
         String route = VdsVisit.resolveClusterRoute(clusterList, null);
-        assertEquals("storage", route);
+        assertEquals("storage-direct", route);
     }
 
     @Test
@@ -270,7 +270,7 @@ public class VdsVisitTestCase {
         ClusterList clusterList = new ClusterList(clusterDefs);
 
         String route = VdsVisit.resolveClusterRoute(clusterList, "storage2");
-        assertEquals("storage2", route);
+        assertEquals("storage2-direct", route);
     }
 
     @Test