From 56f4cf889caf4802ae0ed4d403e3c5b08bb341d0 Mon Sep 17 00:00:00 2001 From: Jon Marius Venstad Date: Tue, 5 Jan 2021 14:57:03 +0100 Subject: Use "[Content:cluster=...]" for routes instead of (only-sometimes-)generated -direct route --- .../src/main/java/ai/vespa/reindexing/Reindexer.java | 2 +- .../src/test/java/ai/vespa/reindexing/ReindexerTest.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'clustercontroller-reindexer') 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()); -- cgit v1.2.3