diff options
| author | Jon Marius Venstad <venstad@gmail.com> | 2020-12-23 12:56:32 +0100 |
|---|---|---|
| committer | Jon Marius Venstad <venstad@gmail.com> | 2020-12-30 11:59:56 +0100 |
| commit | 7efd5dfa1111e0aa94b97fbca06852de95258aa5 (patch) | |
| tree | 8e88711c3a6eb071f9c1db989f6a06c463879585 /clustercontroller-reindexer/src/main | |
| parent | 7bf09c3200422d047100362c82de6e1fdf2b323c (diff) | |
Replace use of [Storage... with [Content... and avoid overriding config id
Diffstat (limited to 'clustercontroller-reindexer/src/main')
| -rw-r--r-- | clustercontroller-reindexer/src/main/java/ai/vespa/reindexing/Reindexer.java | 10 | ||||
| -rw-r--r-- | clustercontroller-reindexer/src/main/java/ai/vespa/reindexing/ReindexingMaintainer.java | 1 |
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..3b7c9160b53 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 "[Content:cluster=" + name + "]"; } 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()), |