Revert "Jonmv/remove storage policy"

4 files changed, 12 insertions, 7 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..fd887a4196b 100644
--- a/clustercontroller-reindexer/src/main/java/ai/vespa/reindexing/Reindexer.java
+++ b/clustercontroller-reindexer/src/main/java/ai/vespa/reindexing/Reindexer.java
@@ -217,10 +217,12 @@ public class Reindexer {
     static class Cluster {
 
         private final String name;
+        private final String configId;
         private final Map<DocumentType, String> documentBuckets;
 
-        Cluster(String name, Map<DocumentType, String> documentBuckets) {
+        Cluster(String name, String configId, Map<DocumentType, String> documentBuckets) {
             this.name = requireNonNull(name);
+            this.configId = requireNonNull(configId);
             this.documentBuckets = Map.copyOf(documentBuckets);
         }
 
@@ -229,7 +231,7 @@ public class Reindexer {
         }
 
         String route() {
-            return name + "-direct";
+            return "[Storage:cluster=" + name + ";clusterconfigid=" + configId + "]";
         }
 
         String bucketSpaceOf(DocumentType documentType) {
@@ -242,18 +244,20 @@ public class Reindexer {
             if (o == null || getClass() != o.getClass()) return false;
             Cluster cluster = (Cluster) o;
             return name.equals(cluster.name) &&
+                   configId.equals(cluster.configId) &&
                    documentBuckets.equals(cluster.documentBuckets);
         }
 
         @Override
         public int hashCode() {
-            return Objects.hash(name, documentBuckets);
+            return Objects.hash(name, configId, documentBuckets);
         }
 
         @Override
         public String toString() {
             return "Cluster{" +
                    "name='" + name + '\'' +
+                   ", configId='" + configId + '\'' +
                    ", documentBuckets=" + documentBuckets +
                    '}';
         }
diff --git a/clustercontroller-reindexer/src/main/java/ai/vespa/reindexing/ReindexingMaintainer.java b/clustercontroller-reindexer/src/main/java/ai/vespa/reindexing/ReindexingMaintainer.java
index e62314429fb..8668ed037ef 100644
--- a/clustercontroller-reindexer/src/main/java/ai/vespa/reindexing/ReindexingMaintainer.java
+++ b/clustercontroller-reindexer/src/main/java/ai/vespa/reindexing/ReindexingMaintainer.java
@@ -141,6 +141,7 @@ public class ReindexingMaintainer extends AbstractComponent {
         return clusters.storage().stream()
                        .filter(storage -> storage.name().equals(name))
                        .map(storage -> new Cluster(name,
+                                                   storage.configid(),
                                                    bucketSpaces.cluster(name)
                                                                .documentType().entrySet().stream()
                                                                .collect(toMap(entry -> manager.getDocumentType(entry.getKey()),
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..9a88d8aad1f 100644
--- a/clustercontroller-reindexer/src/test/java/ai/vespa/reindexing/ReindexerTest.java
+++ b/clustercontroller-reindexer/src/test/java/ai/vespa/reindexing/ReindexerTest.java
@@ -45,7 +45,7 @@ class ReindexerTest {
     final DocumentmanagerConfig musicConfig = Deriver.getDocumentManagerConfig("src/test/resources/schemas/music.sd").build();
     final DocumentTypeManager manager = new DocumentTypeManager(musicConfig);
     final DocumentType music = manager.getDocumentType("music");
-    final Cluster cluster = new Cluster("cluster", Map.of(music, "default"));
+    final Cluster cluster = new Cluster("cluster", "id", Map.of(music, "default"));
     final MockMetric metric = new MockMetric();
     final ManualClock clock = new ManualClock(Instant.EPOCH);
 
@@ -59,7 +59,7 @@ class ReindexerTest {
     @Test
     void throwsWhenUnknownBuckets() {
         assertThrows(NullPointerException.class,
-                     () -> new Reindexer(new Cluster("cluster", Map.of()), Map.of(music, Instant.EPOCH), database, failIfCalled, metric, clock, 0.2));
+                     () -> new Reindexer(new Cluster("cluster", "id", Map.of()), Map.of(music, Instant.EPOCH), database, failIfCalled, metric, clock, 0.2));
     }
 
     @Test
@@ -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("[Storage:cluster=cluster;clusterconfigid=id]", parameters.getRoute().toString());
         assertEquals("cluster", parameters.getRemoteDataHandler());
         assertEquals("music", parameters.getDocumentSelection());
         assertEquals(DocumentProtocol.Priority.NORMAL_3, parameters.getPriority());
diff --git a/clustercontroller-reindexer/src/test/java/ai/vespa/reindexing/ReindexingMaintainerTest.java b/clustercontroller-reindexer/src/test/java/ai/vespa/reindexing/ReindexingMaintainerTest.java
index f69c5d28a01..afa68debadb 100644
--- a/clustercontroller-reindexer/src/test/java/ai/vespa/reindexing/ReindexingMaintainerTest.java
+++ b/clustercontroller-reindexer/src/test/java/ai/vespa/reindexing/ReindexingMaintainerTest.java
@@ -43,7 +43,7 @@ class ReindexingMaintainerTest {
                                               .build(),
                                       manager));
 
-        assertEquals(new Cluster("cluster", Map.of(manager.getDocumentType("music"), "default")),
+        assertEquals(new Cluster("cluster", "configId", Map.of(manager.getDocumentType("music"), "default")),
                      parseCluster("cluster",
                                   new ClusterListConfig.Builder()
                                           .storage(new ClusterListConfig.Storage.Builder()