Revert "Revert "Jonmv/remove storage policy""

This reverts commit 75b2e4c11ea6463c335f1c77dab3fdb5493e5600.

2 files changed, 3 insertions, 8 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 fd887a4196b..2f769143e6e 100644
--- a/clustercontroller-reindexer/src/main/java/ai/vespa/reindexing/Reindexer.java
+++ b/clustercontroller-reindexer/src/main/java/ai/vespa/reindexing/Reindexer.java
@@ -217,12 +217,10 @@ public class Reindexer {
     static class Cluster {
 
         private final String name;
-        private final String configId;
         private final Map<DocumentType, String> documentBuckets;
 
-        Cluster(String name, String configId, Map<DocumentType, String> documentBuckets) {
+        Cluster(String name, Map<DocumentType, String> documentBuckets) {
             this.name = requireNonNull(name);
-            this.configId = requireNonNull(configId);
             this.documentBuckets = Map.copyOf(documentBuckets);
         }
 
@@ -231,7 +229,7 @@ public class Reindexer {
         }
 
         String route() {
-            return "[Storage:cluster=" + name + ";clusterconfigid=" + configId + "]";
+            return name + "-direct";
         }
 
         String bucketSpaceOf(DocumentType documentType) {
@@ -244,20 +242,18 @@ 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, configId, documentBuckets);
+            return Objects.hash(name, 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 8668ed037ef..e62314429fb 100644
--- a/clustercontroller-reindexer/src/main/java/ai/vespa/reindexing/ReindexingMaintainer.java
+++ b/clustercontroller-reindexer/src/main/java/ai/vespa/reindexing/ReindexingMaintainer.java
@@ -141,7 +141,6 @@ 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()),