Pass IndexReshardingMetadata over the wire

bcully · bcully · commit 7de0a2b45371 · 2025-03-13T17:57:06.000-07:00
When I introduced IndexReshardingMetadata I inadvertently
only covered local serialization. It was not getting sent or
received over the wire. This fixes that.
diff --git a/server/src/internalClusterTest/java/org/elasticsearch/cluster/ClusterStateDiffIT.java b/server/src/internalClusterTest/java/org/elasticsearch/cluster/ClusterStateDiffIT.java
@@ -22,6 +22,7 @@
 import org.elasticsearch.cluster.metadata.IndexGraveyard;
 import org.elasticsearch.cluster.metadata.IndexGraveyardTests;
 import org.elasticsearch.cluster.metadata.IndexMetadata;
+import org.elasticsearch.cluster.metadata.IndexReshardingMetadata;
 import org.elasticsearch.cluster.metadata.IndexTemplateMetadata;
 import org.elasticsearch.cluster.metadata.Metadata;
 import org.elasticsearch.cluster.metadata.NodesShutdownMetadata;
@@ -586,13 +587,18 @@ public IndexMetadata randomCreate(String name) {
                 for (int i = 0; i < aliasCount; i++) {
                     builder.putAlias(randomAlias());
                 }
+                if (randomBoolean()) {
+                    builder.reshardingMetadata(
+                        IndexReshardingMetadata.newSplitByMultiple(builder.numberOfShards(), randomIntBetween(2, 5))
+                    );
+                }
                 return builder.build();
             }
 
             @Override
             public IndexMetadata randomChange(IndexMetadata part) {
                 IndexMetadata.Builder builder = IndexMetadata.builder(part);
-                switch (randomIntBetween(0, 3)) {
+                switch (randomIntBetween(0, 4)) {
                     case 0:
                         builder.settings(Settings.builder().put(part.getSettings()).put(randomSettings(Settings.EMPTY)));
                         break;
@@ -609,6 +615,15 @@ public IndexMetadata randomChange(IndexMetadata part) {
                     case 3:
                         builder.putInferenceFields(randomInferenceFields());
                         break;
+                    case 4:
+                        if (randomBoolean()) {
+                            builder.reshardingMetadata(
+                                IndexReshardingMetadata.newSplitByMultiple(builder.numberOfShards(), randomIntBetween(2, 5))
+                            );
+                        } else {
+                            builder.reshardingMetadata(null);
+                        }
+                        break;
                     default:
                         throw new IllegalArgumentException("Shouldn't be here");
                 }
diff --git a/server/src/main/java/org/elasticsearch/TransportVersions.java b/server/src/main/java/org/elasticsearch/TransportVersions.java
@@ -185,6 +185,7 @@ static TransportVersion def(int id) {
     public static final TransportVersion ESQL_THREAD_NAME_IN_DRIVER_PROFILE = def(9_027_0_00);
     public static final TransportVersion INFERENCE_CONTEXT = def(9_028_0_00);
     public static final TransportVersion ML_INFERENCE_DEEPSEEK = def(9_029_00_0);
+    public static final TransportVersion INDEX_RESHARDING_METADATA = def(9_030_0_00);
 
     /*
      * STOP! READ THIS FIRST! No, really,
diff --git a/server/src/main/java/org/elasticsearch/cluster/metadata/IndexMetadata.java b/server/src/main/java/org/elasticsearch/cluster/metadata/IndexMetadata.java
@@ -1424,6 +1424,11 @@ public IndexLongFieldRange getTimeSeriesTimestampRange(DateFieldMapper.DateField
         }
     }
 
+    @Nullable
+    public IndexReshardingMetadata getReshardingMetadata() {
+        return reshardingMetadata;
+    }
+
     @Override
     public boolean equals(Object o) {
         if (this == o) {
@@ -1558,6 +1563,7 @@ private static class IndexMetadataDiff implements Diff<IndexMetadata> {
         private final IndexMetadataStats stats;
         private final Double indexWriteLoadForecast;
         private final Long shardSizeInBytesForecast;
+        private final IndexReshardingMetadata reshardingMetadata;
 
         IndexMetadataDiff(IndexMetadata before, IndexMetadata after) {
             index = after.index.getName();
@@ -1597,6 +1603,7 @@ private static class IndexMetadataDiff implements Diff<IndexMetadata> {
             stats = after.stats;
             indexWriteLoadForecast = after.writeLoadForecast;
             shardSizeInBytesForecast = after.shardSizeInBytesForecast;
+            reshardingMetadata = after.reshardingMetadata;
         }
 
         private static final DiffableUtils.DiffableValueReader<String, AliasMetadata> ALIAS_METADATA_DIFF_VALUE_READER =
@@ -1669,6 +1676,11 @@ private static class IndexMetadataDiff implements Diff<IndexMetadata> {
             } else {
                 eventIngestedRange = IndexLongFieldRange.UNKNOWN;
             }
+            if (in.getTransportVersion().onOrAfter(TransportVersions.INDEX_RESHARDING_METADATA)) {
+                reshardingMetadata = in.readOptionalWriteable(IndexReshardingMetadata::new);
+            } else {
+                reshardingMetadata = null;
+            }
         }
 
         @Override
@@ -1707,6 +1719,9 @@ public void writeTo(StreamOutput out) throws IOException {
                 out.writeOptionalLong(shardSizeInBytesForecast);
             }
             eventIngestedRange.writeTo(out);
+            if (out.getTransportVersion().onOrAfter(TransportVersions.INDEX_RESHARDING_METADATA)) {
+                out.writeOptionalWriteable(reshardingMetadata);
+            }
         }
 
         @Override
@@ -1739,6 +1754,7 @@ public IndexMetadata apply(IndexMetadata part) {
             builder.stats(stats);
             builder.indexWriteLoadForecast(indexWriteLoadForecast);
             builder.shardSizeInBytesForecast(shardSizeInBytesForecast);
+            builder.reshardingMetadata(reshardingMetadata);
             return builder.build(true);
         }
     }
@@ -1810,6 +1826,9 @@ public static IndexMetadata readFrom(StreamInput in, @Nullable Function<String,
             builder.shardSizeInBytesForecast(in.readOptionalLong());
         }
         builder.eventIngestedRange(IndexLongFieldRange.readFrom(in));
+        if (in.getTransportVersion().onOrAfter(TransportVersions.INDEX_RESHARDING_METADATA)) {
+            builder.reshardingMetadata(in.readOptionalWriteable(IndexReshardingMetadata::new));
+        }
         return builder.build(true);
     }
 
@@ -1859,6 +1878,9 @@ public void writeTo(StreamOutput out, boolean mappingsAsHash) throws IOException
             out.writeOptionalLong(shardSizeInBytesForecast);
         }
         eventIngestedRange.writeTo(out);
+        if (out.getTransportVersion().onOrAfter(TransportVersions.INDEX_RESHARDING_METADATA)) {
+            out.writeOptionalWriteable(reshardingMetadata);
+        }
     }
 
     @Override
diff --git a/server/src/test/java/org/elasticsearch/cluster/metadata/IndexMetadataTests.java b/server/src/test/java/org/elasticsearch/cluster/metadata/IndexMetadataTests.java
@@ -166,6 +166,7 @@ public void testIndexMetadataSerialization() throws IOException {
         assertEquals(metadata.getForecastedWriteLoad(), fromXContentMeta.getForecastedWriteLoad());
         assertEquals(metadata.getForecastedShardSizeInBytes(), fromXContentMeta.getForecastedShardSizeInBytes());
         assertEquals(metadata.getInferenceFields(), fromXContentMeta.getInferenceFields());
+        assertEquals(metadata.getReshardingMetadata(), fromXContentMeta.getReshardingMetadata());
 
         final BytesStreamOutput out = new BytesStreamOutput();
         metadata.writeTo(out);
@@ -192,6 +193,7 @@ public void testIndexMetadataSerialization() throws IOException {
             assertEquals(metadata.getForecastedShardSizeInBytes(), deserialized.getForecastedShardSizeInBytes());
             assertEquals(metadata.getInferenceFields(), deserialized.getInferenceFields());
             assertEquals(metadata.getEventIngestedRange(), deserialized.getEventIngestedRange());
+            assertEquals(metadata.getReshardingMetadata(), deserialized.getReshardingMetadata());
         }
     }
 

Original file line number	Diff line number	Diff line change
`@@ -1424,6 +1424,11 @@ public IndexLongFieldRange getTimeSeriesTimestampRange(DateFieldMapper.DateField`
`1424`	`1424`	`}`
`1425`	`1425`	`}`
`1426`	`1426`
	`1427`	`+ @Nullable`
	`1428`	`+ public IndexReshardingMetadata getReshardingMetadata() {`
	`1429`	`+ return reshardingMetadata;`
	`1430`	`+ }`
	`1431`	`+`
`1427`	`1432`	`@Override`
`1428`	`1433`	`public boolean equals(Object o) {`
`1429`	`1434`	`if (this == o) {`
`@@ -1558,6 +1563,7 @@ private static class IndexMetadataDiff implements Diff<IndexMetadata> {`
`1558`	`1563`	`private final IndexMetadataStats stats;`
`1559`	`1564`	`private final Double indexWriteLoadForecast;`
`1560`	`1565`	`private final Long shardSizeInBytesForecast;`
	`1566`	`+ private final IndexReshardingMetadata reshardingMetadata;`
`1561`	`1567`
`1562`	`1568`	`IndexMetadataDiff(IndexMetadata before, IndexMetadata after) {`
`1563`	`1569`	`index = after.index.getName();`
`@@ -1597,6 +1603,7 @@ private static class IndexMetadataDiff implements Diff<IndexMetadata> {`
`1597`	`1603`	`stats = after.stats;`
`1598`	`1604`	`indexWriteLoadForecast = after.writeLoadForecast;`
`1599`	`1605`	`shardSizeInBytesForecast = after.shardSizeInBytesForecast;`
	`1606`	`+ reshardingMetadata = after.reshardingMetadata;`
`1600`	`1607`	`}`
`1601`	`1608`
`1602`	`1609`	`private static final DiffableUtils.DiffableValueReader<String, AliasMetadata> ALIAS_METADATA_DIFF_VALUE_READER =`
`@@ -1669,6 +1676,11 @@ private static class IndexMetadataDiff implements Diff<IndexMetadata> {`
`1669`	`1676`	`} else {`
`1670`	`1677`	`eventIngestedRange = IndexLongFieldRange.UNKNOWN;`
`1671`	`1678`	`}`
	`1679`	`+ if (in.getTransportVersion().onOrAfter(TransportVersions.INDEX_RESHARDING_METADATA)) {`
	`1680`	`+ reshardingMetadata = in.readOptionalWriteable(IndexReshardingMetadata::new);`
	`1681`	`+ } else {`
	`1682`	`+ reshardingMetadata = null;`
	`1683`	`+ }`
`1672`	`1684`	`}`
`1673`	`1685`
`1674`	`1686`	`@Override`
`@@ -1707,6 +1719,9 @@ public void writeTo(StreamOutput out) throws IOException {`
`1707`	`1719`	`out.writeOptionalLong(shardSizeInBytesForecast);`
`1708`	`1720`	`}`
`1709`	`1721`	`eventIngestedRange.writeTo(out);`
	`1722`	`+ if (out.getTransportVersion().onOrAfter(TransportVersions.INDEX_RESHARDING_METADATA)) {`
	`1723`	`+ out.writeOptionalWriteable(reshardingMetadata);`
	`1724`	`+ }`
`1710`	`1725`	`}`
`1711`	`1726`
`1712`	`1727`	`@Override`
`@@ -1739,6 +1754,7 @@ public IndexMetadata apply(IndexMetadata part) {`
`1739`	`1754`	`builder.stats(stats);`
`1740`	`1755`	`builder.indexWriteLoadForecast(indexWriteLoadForecast);`
`1741`	`1756`	`builder.shardSizeInBytesForecast(shardSizeInBytesForecast);`
	`1757`	`+ builder.reshardingMetadata(reshardingMetadata);`
`1742`	`1758`	`return builder.build(true);`
`1743`	`1759`	`}`
`1744`	`1760`	`}`
`@@ -1810,6 +1826,9 @@ public static IndexMetadata readFrom(StreamInput in, @Nullable Function<String,`
`1810`	`1826`	`builder.shardSizeInBytesForecast(in.readOptionalLong());`
`1811`	`1827`	`}`
`1812`	`1828`	`builder.eventIngestedRange(IndexLongFieldRange.readFrom(in));`
	`1829`	`+ if (in.getTransportVersion().onOrAfter(TransportVersions.INDEX_RESHARDING_METADATA)) {`
	`1830`	`+ builder.reshardingMetadata(in.readOptionalWriteable(IndexReshardingMetadata::new));`
	`1831`	`+ }`
`1813`	`1832`	`return builder.build(true);`
`1814`	`1833`	`}`
`1815`	`1834`
`@@ -1859,6 +1878,9 @@ public void writeTo(StreamOutput out, boolean mappingsAsHash) throws IOException`
`1859`	`1878`	`out.writeOptionalLong(shardSizeInBytesForecast);`
`1860`	`1879`	`}`
`1861`	`1880`	`eventIngestedRange.writeTo(out);`
	`1881`	`+ if (out.getTransportVersion().onOrAfter(TransportVersions.INDEX_RESHARDING_METADATA)) {`
	`1882`	`+ out.writeOptionalWriteable(reshardingMetadata);`
	`1883`	`+ }`
`1862`	`1884`	`}`
`1863`	`1885`
`1864`	`1886`	`@Override`
Original file line number	Diff line number	Diff line change
`@@ -166,6 +166,7 @@ public void testIndexMetadataSerialization() throws IOException {`
`166`	`166`	`assertEquals(metadata.getForecastedWriteLoad(), fromXContentMeta.getForecastedWriteLoad());`
`167`	`167`	`assertEquals(metadata.getForecastedShardSizeInBytes(), fromXContentMeta.getForecastedShardSizeInBytes());`
`168`	`168`	`assertEquals(metadata.getInferenceFields(), fromXContentMeta.getInferenceFields());`
	`169`	`+ assertEquals(metadata.getReshardingMetadata(), fromXContentMeta.getReshardingMetadata());`
`169`	`170`
`170`	`171`	`final BytesStreamOutput out = new BytesStreamOutput();`
`171`	`172`	`metadata.writeTo(out);`
`@@ -192,6 +193,7 @@ public void testIndexMetadataSerialization() throws IOException {`
`192`	`193`	`assertEquals(metadata.getForecastedShardSizeInBytes(), deserialized.getForecastedShardSizeInBytes());`
`193`	`194`	`assertEquals(metadata.getInferenceFields(), deserialized.getInferenceFields());`
`194`	`195`	`assertEquals(metadata.getEventIngestedRange(), deserialized.getEventIngestedRange());`
	`196`	`+ assertEquals(metadata.getReshardingMetadata(), deserialized.getReshardingMetadata());`
`195`	`197`	`}`
`196`	`198`	`}`
`197`	`199`