Skip to content

Commit 3c9a53f

Browse files
gmaroulicbuescher
authored andcommitted
Add missing transport versions (elastic#122506)
1 parent 48161d1 commit 3c9a53f

File tree

3 files changed

+5
-46
lines changed

3 files changed

+5
-46
lines changed

muted-tests.yml

Lines changed: 0 additions & 45 deletions
Original file line numberDiff line numberDiff line change
@@ -389,51 +389,6 @@ tests:
389389
issue: https://github.com/elastic/elasticsearch/issues/122377
390390
- class: org.elasticsearch.repositories.blobstore.testkit.analyze.HdfsRepositoryAnalysisRestIT
391391
issue: https://github.com/elastic/elasticsearch/issues/122378
392-
- class: org.elasticsearch.lucene.RollingUpgradeLuceneIndexCompatibilityTestCase
393-
method: testClosedIndexUpgrade {p0=[9.1.0, 8.19.0, 8.19.0]}
394-
issue: https://github.com/elastic/elasticsearch/issues/122481
395-
- class: org.elasticsearch.lucene.RollingUpgradeLuceneIndexCompatibilityTestCase
396-
method: testRestoreIndex {p0=[9.1.0, 9.1.0, 8.19.0]}
397-
issue: https://github.com/elastic/elasticsearch/issues/122482
398-
- class: org.elasticsearch.lucene.RollingUpgradeLuceneIndexCompatibilityTestCase
399-
method: testRestoreIndex {p0=[9.1.0, 8.19.0, 8.19.0]}
400-
issue: https://github.com/elastic/elasticsearch/issues/122483
401-
- class: org.elasticsearch.lucene.RollingUpgradeLuceneIndexCompatibilityTestCase
402-
method: testIndexUpgrade {p0=[9.1.0, 8.19.0, 8.19.0]}
403-
issue: https://github.com/elastic/elasticsearch/issues/122484
404-
- class: org.elasticsearch.lucene.RollingUpgradeLuceneIndexCompatibilityTestCase
405-
method: testIndexUpgrade {p0=[9.1.0, 9.1.0, 9.1.0]}
406-
issue: https://github.com/elastic/elasticsearch/issues/122487
407-
- class: org.elasticsearch.lucene.RollingUpgradeLuceneIndexCompatibilityTestCase
408-
method: testClosedIndexUpgrade {p0=[9.1.0, 9.1.0, 8.19.0]}
409-
issue: https://github.com/elastic/elasticsearch/issues/122488
410-
- class: org.elasticsearch.lucene.RollingUpgradeLuceneIndexCompatibilityTestCase
411-
method: testIndexUpgrade {p0=[9.1.0, 9.1.0, 8.19.0]}
412-
issue: https://github.com/elastic/elasticsearch/issues/122489
413-
- class: org.elasticsearch.lucene.RollingUpgradeLuceneIndexCompatibilityTestCase
414-
method: testRestoreIndex {p0=[9.1.0, 9.1.0, 9.1.0]}
415-
issue: https://github.com/elastic/elasticsearch/issues/122490
416-
- class: org.elasticsearch.lucene.RollingUpgradeLuceneIndexCompatibilityTestCase
417-
method: testClosedIndexUpgrade {p0=[9.1.0, 9.1.0, 9.1.0]}
418-
issue: https://github.com/elastic/elasticsearch/issues/122495
419-
- class: org.elasticsearch.lucene.RollingUpgradeSearchableSnapshotIndexCompatibilityIT
420-
method: testSearchableSnapshotUpgrade {p0=[9.1.0, 8.19.0, 8.19.0]}
421-
issue: https://github.com/elastic/elasticsearch/issues/122500
422-
- class: org.elasticsearch.lucene.RollingUpgradeSearchableSnapshotIndexCompatibilityIT
423-
method: testMountSearchableSnapshot {p0=[9.1.0, 9.1.0, 8.19.0]}
424-
issue: https://github.com/elastic/elasticsearch/issues/122501
425-
- class: org.elasticsearch.lucene.RollingUpgradeSearchableSnapshotIndexCompatibilityIT
426-
method: testMountSearchableSnapshot {p0=[9.1.0, 8.19.0, 8.19.0]}
427-
issue: https://github.com/elastic/elasticsearch/issues/122502
428-
- class: org.elasticsearch.lucene.RollingUpgradeSearchableSnapshotIndexCompatibilityIT
429-
method: testSearchableSnapshotUpgrade {p0=[9.1.0, 9.1.0, 8.19.0]}
430-
issue: https://github.com/elastic/elasticsearch/issues/122503
431-
- class: org.elasticsearch.lucene.RollingUpgradeSearchableSnapshotIndexCompatibilityIT
432-
method: testMountSearchableSnapshot {p0=[9.1.0, 9.1.0, 9.1.0]}
433-
issue: https://github.com/elastic/elasticsearch/issues/122504
434-
- class: org.elasticsearch.lucene.RollingUpgradeSearchableSnapshotIndexCompatibilityIT
435-
method: testSearchableSnapshotUpgrade {p0=[9.1.0, 9.1.0, 9.1.0]}
436-
issue: https://github.com/elastic/elasticsearch/issues/122505
437392

438393
# Examples:
439394
#

server/src/main/java/org/elasticsearch/TransportVersions.java

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -173,11 +173,13 @@ static TransportVersion def(int id) {
173173
public static final TransportVersion INFERENCE_REQUEST_ADAPTIVE_RATE_LIMITING = def(8_839_0_00);
174174
public static final TransportVersion ML_INFERENCE_IBM_WATSONX_RERANK_ADDED = def(8_840_0_00);
175175
public static final TransportVersion COHERE_BIT_EMBEDDING_TYPE_SUPPORT_ADDED_BACKPORT_8_X = def(8_840_0_01);
176+
public static final TransportVersion REMOVE_ALL_APPLICABLE_SELECTOR_BACKPORT_8_X = def(8_840_0_02);
176177
public static final TransportVersion ELASTICSEARCH_9_0 = def(9_000_0_00);
177178
public static final TransportVersion REMOVE_SNAPSHOT_FAILURES_90 = def(9_000_0_01);
178179
public static final TransportVersion TRANSPORT_STATS_HANDLING_TIME_REQUIRED_90 = def(9_000_0_02);
179180
public static final TransportVersion REMOVE_DESIRED_NODE_VERSION_90 = def(9_000_0_03);
180181
public static final TransportVersion ESQL_DRIVER_TASK_DESCRIPTION_90 = def(9_000_0_04);
182+
public static final TransportVersion REMOVE_ALL_APPLICABLE_SELECTOR_9_0 = def(9_000_0_05);
181183
public static final TransportVersion COHERE_BIT_EMBEDDING_TYPE_SUPPORT_ADDED = def(9_001_0_00);
182184
public static final TransportVersion REMOVE_SNAPSHOT_FAILURES = def(9_002_0_00);
183185
public static final TransportVersion TRANSPORT_STATS_HANDLING_TIME_REQUIRED = def(9_003_0_00);

server/src/main/java/org/elasticsearch/action/support/IndexComponentSelector.java

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,9 @@ public static IndexComponentSelector getByKey(String key) {
7474

7575
public static IndexComponentSelector read(StreamInput in) throws IOException {
7676
byte id = in.readByte();
77-
if (in.getTransportVersion().onOrAfter(TransportVersions.REMOVE_ALL_APPLICABLE_SELECTOR)) {
77+
if (in.getTransportVersion().onOrAfter(TransportVersions.REMOVE_ALL_APPLICABLE_SELECTOR)
78+
|| in.getTransportVersion().isPatchFrom(TransportVersions.REMOVE_ALL_APPLICABLE_SELECTOR_9_0)
79+
|| in.getTransportVersion().isPatchFrom(TransportVersions.REMOVE_ALL_APPLICABLE_SELECTOR_BACKPORT_8_X)) {
7880
return getById(id);
7981
} else {
8082
// Legacy value ::*, converted to ::data

0 commit comments

Comments
 (0)