Skip to content

Commit a2a4e7c

Browse files
thecoopthecoop
authored
Remove the 8.15 transport conditions for event ingested range setting (#119502)
1 parent e0cefb8 commit a2a4e7c

File tree

14 files changed

+27
-179
lines changed

14 files changed

+27
-179
lines changed

‎server/src/internalClusterTest/java/org/elasticsearch/cluster/ClusterStateDiffIT.java‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@
99

1010
package org.elasticsearch.cluster;
1111

12-
import org.elasticsearch.TransportVersion;
1312
import org.elasticsearch.Version;
1413
import org.elasticsearch.cluster.block.ClusterBlock;
1514
import org.elasticsearch.cluster.block.ClusterBlocks;
@@ -565,7 +564,7 @@ public IndexMetadata randomCreate(String name) {
565564
settingsBuilder.put(randomSettings(Settings.EMPTY)).put(IndexMetadata.SETTING_VERSION_CREATED, randomWriteVersion());
566565
builder.settings(settingsBuilder);
567566
builder.numberOfShards(randomIntBetween(1, 10)).numberOfReplicas(randomInt(10));
568-
builder.eventIngestedRange(IndexLongFieldRange.UNKNOWN, TransportVersion.current());
567+
builder.eventIngestedRange(IndexLongFieldRange.UNKNOWN);
569568
int aliasCount = randomInt(10);
570569
for (int i = 0; i < aliasCount; i++) {
571570
builder.putAlias(randomAlias());

‎server/src/main/java/org/elasticsearch/action/admin/indices/template/post/TransportSimulateIndexTemplateAction.java‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -214,8 +214,7 @@ public static ClusterState resolveTemporaryState(
214214
.build();
215215

216216
final IndexMetadata indexMetadata = IndexMetadata.builder(indexName)
217-
// handle mixed-cluster states by passing in minTransportVersion to reset event.ingested range to UNKNOWN if an older version
218-
.eventIngestedRange(getEventIngestedRange(indexName, simulatedState), simulatedState.getMinTransportVersion())
217+
.eventIngestedRange(getEventIngestedRange(indexName, simulatedState))
219218
.settings(dummySettings)
220219
.build();
221220
return ClusterState.builder(simulatedState)
@@ -304,8 +303,7 @@ public static Template resolveTemplate(
304303
dummySettings.put(templateSettings);
305304

306305
final IndexMetadata indexMetadata = IndexMetadata.builder(indexName)
307-
// handle mixed-cluster states by passing in minTransportVersion to reset event.ingested range to UNKNOWN if an older version
308-
.eventIngestedRange(getEventIngestedRange(indexName, simulatedState), simulatedState.getMinTransportVersion())
306+
.eventIngestedRange(getEventIngestedRange(indexName, simulatedState))
309307
.settings(dummySettings)
310308
.build();
311309

‎server/src/main/java/org/elasticsearch/cluster/action/shard/ShardStateAction.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -754,7 +754,7 @@ public ClusterState execute(BatchExecutionContext<StartedShardUpdateTask> batchE
754754
metadataBuilder.put(
755755
IndexMetadata.builder(metadataBuilder.getSafe(updatedTimeRangesEntry.getKey()))
756756
.timestampRange(timeRanges.timestampRange())
757-
.eventIngestedRange(timeRanges.eventIngestedRange(), maybeUpdatedState.getMinTransportVersion())
757+
.eventIngestedRange(timeRanges.eventIngestedRange())
758758
);
759759
}
760760
maybeUpdatedState = ClusterState.builder(maybeUpdatedState).metadata(metadataBuilder).build();

‎server/src/main/java/org/elasticsearch/cluster/metadata/IndexMetadata.java‎

Lines changed: 3 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -1703,12 +1703,7 @@ public void writeTo(StreamOutput out) throws IOException {
17031703
out.writeOptionalDouble(indexWriteLoadForecast);
17041704
out.writeOptionalLong(shardSizeInBytesForecast);
17051705
}
1706-
if (out.getTransportVersion().onOrAfter(TransportVersions.V_8_15_0)) {
1707-
eventIngestedRange.writeTo(out);
1708-
} else {
1709-
assert eventIngestedRange == IndexLongFieldRange.UNKNOWN
1710-
: "eventIngestedRange should be UNKNOWN until all nodes are on the new version but is " + eventIngestedRange;
1711-
}
1706+
eventIngestedRange.writeTo(out);
17121707
}
17131708

17141709
@Override
@@ -1813,11 +1808,7 @@ public static IndexMetadata readFrom(StreamInput in, @Nullable Function<String,
18131808
builder.indexWriteLoadForecast(in.readOptionalDouble());
18141809
builder.shardSizeInBytesForecast(in.readOptionalLong());
18151810
}
1816-
if (in.getTransportVersion().onOrAfter(TransportVersions.V_8_15_0)) {
1817-
builder.eventIngestedRange(IndexLongFieldRange.readFrom(in), in.getTransportVersion());
1818-
} else {
1819-
builder.eventIngestedRange(IndexLongFieldRange.UNKNOWN, in.getTransportVersion());
1820-
}
1811+
builder.eventIngestedRange(IndexLongFieldRange.readFrom(in));
18211812
return builder.build(true);
18221813
}
18231814

@@ -2180,28 +2171,12 @@ public Builder timestampRange(IndexLongFieldRange timestampRange) {
21802171
return this;
21812172
}
21822173

2183-
// only for use within this class file where minClusterTransportVersion is not known (e.g., IndexMetadataDiff.apply)
2184-
Builder eventIngestedRange(IndexLongFieldRange eventIngestedRange) {
2174+
public Builder eventIngestedRange(IndexLongFieldRange eventIngestedRange) {
21852175
assert eventIngestedRange != null : "eventIngestedRange cannot be null";
21862176
this.eventIngestedRange = eventIngestedRange;
21872177
return this;
21882178
}
21892179

2190-
public Builder eventIngestedRange(IndexLongFieldRange eventIngestedRange, TransportVersion minClusterTransportVersion) {
2191-
assert eventIngestedRange != null : "eventIngestedRange cannot be null";
2192-
assert minClusterTransportVersion != null || eventIngestedRange == IndexLongFieldRange.UNKNOWN
2193-
: "eventIngestedRange must be UNKNOWN when minClusterTransportVersion is null, but minClusterTransportVersion: "
2194-
+ minClusterTransportVersion
2195-
+ "; eventIngestedRange = "
2196-
+ eventIngestedRange;
2197-
if (minClusterTransportVersion != null && minClusterTransportVersion.before(TransportVersions.V_8_15_0)) {
2198-
this.eventIngestedRange = IndexLongFieldRange.UNKNOWN;
2199-
} else {
2200-
this.eventIngestedRange = eventIngestedRange;
2201-
}
2202-
return this;
2203-
}
2204-
22052180
public Builder stats(IndexMetadataStats stats) {
22062181
this.stats = stats;
22072182
return this;

‎server/src/main/java/org/elasticsearch/cluster/metadata/MetadataCreateIndexService.java‎

Lines changed: 2 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,6 @@
7171
import org.elasticsearch.index.mapper.MapperService.MergeReason;
7272
import org.elasticsearch.index.mapper.SourceFieldMapper;
7373
import org.elasticsearch.index.query.SearchExecutionContext;
74-
import org.elasticsearch.index.shard.IndexLongFieldRange;
7574
import org.elasticsearch.indices.IndexCreationException;
7675
import org.elasticsearch.indices.IndicesService;
7776
import org.elasticsearch.indices.InvalidIndexNameException;
@@ -529,8 +528,7 @@ private ClusterState applyCreateIndexWithTemporaryService(
529528
temporaryIndexMeta.getSettings(),
530529
temporaryIndexMeta.getRoutingNumShards(),
531530
sourceMetadata,
532-
temporaryIndexMeta.isSystem(),
533-
currentState.getMinTransportVersion()
531+
temporaryIndexMeta.isSystem()
534532
);
535533
} catch (Exception e) {
536534
logger.info("failed to build index metadata [{}]", request.index());
@@ -1340,15 +1338,10 @@ static IndexMetadata buildIndexMetadata(
13401338
Settings indexSettings,
13411339
int routingNumShards,
13421340
@Nullable IndexMetadata sourceMetadata,
1343-
boolean isSystem,
1344-
TransportVersion minClusterTransportVersion
1341+
boolean isSystem
13451342
) {
13461343
IndexMetadata.Builder indexMetadataBuilder = createIndexMetadataBuilder(indexName, sourceMetadata, indexSettings, routingNumShards);
13471344
indexMetadataBuilder.system(isSystem);
1348-
if (minClusterTransportVersion.before(TransportVersions.V_8_15_0)) {
1349-
// promote to UNKNOWN for older versions since they don't know how to handle event.ingested in cluster state
1350-
indexMetadataBuilder.eventIngestedRange(IndexLongFieldRange.UNKNOWN, minClusterTransportVersion);
1351-
}
13521345
// now, update the mappings with the actual source
13531346
Map<String, MappingMetadata> mappingsMetadata = new HashMap<>();
13541347
DocumentMapper docMapper = documentMapperSupplier.get();

‎server/src/main/java/org/elasticsearch/cluster/metadata/MetadataIndexStateService.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -885,7 +885,7 @@ static Tuple<ClusterState, List<IndexResult>> closeRoutingTable(
885885
final IndexMetadata.Builder updatedMetadata = IndexMetadata.builder(indexMetadata).state(IndexMetadata.State.CLOSE);
886886
metadata.put(
887887
updatedMetadata.timestampRange(IndexLongFieldRange.NO_SHARDS)
888-
.eventIngestedRange(IndexLongFieldRange.NO_SHARDS, currentState.getMinTransportVersion())
888+
.eventIngestedRange(IndexLongFieldRange.NO_SHARDS)
889889
.settingsVersion(indexMetadata.getSettingsVersion() + 1)
890890
.settings(Settings.builder().put(indexMetadata.getSettings()).put(VERIFIED_BEFORE_CLOSE_SETTING.getKey(), true))
891891
);
@@ -1133,7 +1133,7 @@ private ClusterState openIndices(final Index[] indices, final ClusterState curre
11331133
.settingsVersion(indexMetadata.getSettingsVersion() + 1)
11341134
.settings(updatedSettings)
11351135
.timestampRange(IndexLongFieldRange.NO_SHARDS)
1136-
.eventIngestedRange(IndexLongFieldRange.NO_SHARDS, currentState.getMinTransportVersion())
1136+
.eventIngestedRange(IndexLongFieldRange.NO_SHARDS)
11371137
.build();
11381138

11391139
// The index might be closed because we couldn't import it due to an old incompatible

‎server/src/main/java/org/elasticsearch/cluster/metadata/MetadataIndexTemplateService.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1784,7 +1784,7 @@ private static void validateCompositeTemplate(
17841784
.put(
17851785
IndexMetadata.builder(temporaryIndexName)
17861786
// necessary to pass asserts in ClusterState constructor
1787-
.eventIngestedRange(IndexLongFieldRange.UNKNOWN, state.getMinTransportVersion())
1787+
.eventIngestedRange(IndexLongFieldRange.UNKNOWN)
17881788
.settings(finalResolvedSettings)
17891789
)
17901790
.build()

‎server/src/main/java/org/elasticsearch/snapshots/RestoreService.java‎

Lines changed: 6 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@
1111
import org.apache.logging.log4j.Level;
1212
import org.apache.logging.log4j.LogManager;
1313
import org.apache.logging.log4j.Logger;
14-
import org.elasticsearch.TransportVersion;
1514
import org.elasticsearch.action.ActionListener;
1615
import org.elasticsearch.action.admin.cluster.snapshots.restore.RestoreSnapshotRequest;
1716
import org.elasticsearch.action.support.IndicesOptions;
@@ -1399,11 +1398,7 @@ public ClusterState execute(ClusterState currentState) {
13991398
currentState.metadata()
14001399
);
14011400

1402-
final IndexMetadata.Builder indexMdBuilder = restoreToCreateNewIndex(
1403-
snapshotIndexMetadata,
1404-
renamedIndexName,
1405-
currentState.getMinTransportVersion()
1406-
);
1401+
final IndexMetadata.Builder indexMdBuilder = restoreToCreateNewIndex(snapshotIndexMetadata, renamedIndexName);
14071402
if (request.includeAliases() == false
14081403
&& snapshotIndexMetadata.getAliases().isEmpty() == false
14091404
&& isSystemIndex(snapshotIndexMetadata) == false) {
@@ -1421,11 +1416,7 @@ && isSystemIndex(snapshotIndexMetadata) == false) {
14211416
} else {
14221417
// Index exists and it's closed - open it in metadata and start recovery
14231418
validateExistingClosedIndex(currentIndexMetadata, snapshotIndexMetadata, renamedIndexName, partial);
1424-
final IndexMetadata.Builder indexMdBuilder = restoreOverClosedIndex(
1425-
snapshotIndexMetadata,
1426-
currentIndexMetadata,
1427-
currentState.getMinTransportVersion()
1428-
);
1419+
final IndexMetadata.Builder indexMdBuilder = restoreOverClosedIndex(snapshotIndexMetadata, currentIndexMetadata);
14291420

14301421
if (request.includeAliases() == false && isSystemIndex(snapshotIndexMetadata) == false) {
14311422
// Remove all snapshot aliases
@@ -1800,26 +1791,18 @@ private static IndexMetadata convertLegacyIndex(
18001791
return convertedIndexMetadataBuilder.build();
18011792
}
18021793

1803-
private static IndexMetadata.Builder restoreToCreateNewIndex(
1804-
IndexMetadata snapshotIndexMetadata,
1805-
String renamedIndexName,
1806-
TransportVersion minClusterTransportVersion
1807-
) {
1794+
private static IndexMetadata.Builder restoreToCreateNewIndex(IndexMetadata snapshotIndexMetadata, String renamedIndexName) {
18081795
return IndexMetadata.builder(snapshotIndexMetadata)
18091796
.state(IndexMetadata.State.OPEN)
18101797
.index(renamedIndexName)
18111798
.settings(
18121799
Settings.builder().put(snapshotIndexMetadata.getSettings()).put(IndexMetadata.SETTING_INDEX_UUID, UUIDs.randomBase64UUID())
18131800
)
18141801
.timestampRange(IndexLongFieldRange.NO_SHARDS)
1815-
.eventIngestedRange(IndexLongFieldRange.NO_SHARDS, minClusterTransportVersion);
1802+
.eventIngestedRange(IndexLongFieldRange.NO_SHARDS);
18161803
}
18171804

1818-
private static IndexMetadata.Builder restoreOverClosedIndex(
1819-
IndexMetadata snapshotIndexMetadata,
1820-
IndexMetadata currentIndexMetadata,
1821-
TransportVersion minTransportVersion
1822-
) {
1805+
private static IndexMetadata.Builder restoreOverClosedIndex(IndexMetadata snapshotIndexMetadata, IndexMetadata currentIndexMetadata) {
18231806
final IndexMetadata.Builder indexMdBuilder = IndexMetadata.builder(snapshotIndexMetadata)
18241807
.state(IndexMetadata.State.OPEN)
18251808
.version(Math.max(snapshotIndexMetadata.getVersion(), 1 + currentIndexMetadata.getVersion()))
@@ -1828,7 +1811,7 @@ private static IndexMetadata.Builder restoreOverClosedIndex(
18281811
.settingsVersion(Math.max(snapshotIndexMetadata.getSettingsVersion(), 1 + currentIndexMetadata.getSettingsVersion()))
18291812
.aliasesVersion(Math.max(snapshotIndexMetadata.getAliasesVersion(), 1 + currentIndexMetadata.getAliasesVersion()))
18301813
.timestampRange(IndexLongFieldRange.NO_SHARDS)
1831-
.eventIngestedRange(IndexLongFieldRange.NO_SHARDS, minTransportVersion)
1814+
.eventIngestedRange(IndexLongFieldRange.NO_SHARDS)
18321815
.index(currentIndexMetadata.getIndex().getName())
18331816
.settings(
18341817
Settings.builder()

‎server/src/test/java/org/elasticsearch/action/admin/cluster/reroute/ClusterRerouteResponseTests.java‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@
99

1010
package org.elasticsearch.action.admin.cluster.reroute;
1111

12-
import org.elasticsearch.TransportVersion;
1312
import org.elasticsearch.TransportVersions;
1413
import org.elasticsearch.Version;
1514
import org.elasticsearch.cluster.ClusterName;
@@ -347,7 +346,7 @@ private static ClusterState createClusterState() {
347346
.put(IndexMetadata.SETTING_VERSION_CREATED, IndexVersion.current())
348347
.build()
349348
)
350-
.eventIngestedRange(IndexLongFieldRange.UNKNOWN, TransportVersion.current())
349+
.eventIngestedRange(IndexLongFieldRange.UNKNOWN)
351350
.build(),
352351
false
353352
)

‎server/src/test/java/org/elasticsearch/action/search/CanMatchPreFilterSearchPhaseTests.java‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@
1010
package org.elasticsearch.action.search;
1111

1212
import org.apache.lucene.util.BytesRef;
13-
import org.elasticsearch.TransportVersion;
1413
import org.elasticsearch.action.ActionListener;
1514
import org.elasticsearch.action.OriginalIndices;
1615
import org.elasticsearch.action.search.CanMatchNodeResponse.ResponseOrFailure;
@@ -1462,7 +1461,7 @@ private void addIndexMinMaxTimestamps(Index index, String fieldName, long minTim
14621461
indexMetadataBuilder.timestampRange(timestampRange);
14631462
fields.put(index, new DateFieldRangeInfo(new DateFieldMapper.DateFieldType(fieldName), null, null, null));
14641463
} else if (fieldName.equals(IndexMetadata.EVENT_INGESTED_FIELD_NAME)) {
1465-
indexMetadataBuilder.eventIngestedRange(timestampRange, TransportVersion.current());
1464+
indexMetadataBuilder.eventIngestedRange(timestampRange);
14661465
fields.put(index, new DateFieldRangeInfo(null, null, new DateFieldMapper.DateFieldType(fieldName), null));
14671466
}
14681467

@@ -1502,7 +1501,7 @@ private void addIndexMinMaxForTimestampAndEventIngested(
15021501
.numberOfShards(1)
15031502
.numberOfReplicas(0)
15041503
.timestampRange(tsTimestampRange)
1505-
.eventIngestedRange(eventIngestedTimestampRange, TransportVersion.current());
1504+
.eventIngestedRange(eventIngestedTimestampRange);
15061505

15071506
Metadata.Builder metadataBuilder = Metadata.builder(clusterState.metadata()).put(indexMetadataBuilder);
15081507
clusterState = ClusterState.builder(clusterState).metadata(metadataBuilder).build();

0 commit comments

Comments
 (0)