aboutsummaryrefslogtreecommitdiffstats
path: root/clustercontroller-reindexer
diff options
context:
space:
mode:
authorJon Marius Venstad <venstad@gmail.com>2021-01-05 14:57:03 +0100
committerJon Marius Venstad <venstad@gmail.com>2021-01-05 14:57:03 +0100
commit56f4cf889caf4802ae0ed4d403e3c5b08bb341d0 (patch)
tree6d3630613800d8005ea9666b3783a6bd37bd00d9 /clustercontroller-reindexer
parentbe5ea0ad39c15c13fb85a70d9990165499a92896 (diff)
Use "[Content:cluster=...]" for routes instead of (only-sometimes-)generated -direct route
Diffstat (limited to 'clustercontroller-reindexer')
-rw-r--r--clustercontroller-reindexer/src/main/java/ai/vespa/reindexing/Reindexer.java2
-rw-r--r--clustercontroller-reindexer/src/test/java/ai/vespa/reindexing/ReindexerTest.java2
2 files changed, 2 insertions, 2 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 2f769143e6e..3b7c9160b53 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 + "-direct";
+ return "[Content:cluster=" + name + "]";
}
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 160022cc996..01586e06015 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-direct", parameters.getRoute().toString());
+ assertEquals("[Content:cluster=cluster]", parameters.getRoute().toString());
assertEquals("cluster", parameters.getRemoteDataHandler());
assertEquals("music", parameters.getDocumentSelection());
assertEquals(DocumentProtocol.Priority.NORMAL_3, parameters.getPriority());