Skip to content

Commit dd8ba56

Browse files
thecoopalexey-ivanov-es
authored andcommitted
Remove transport versions fixup listener and associated code (elastic#116941)
1 parent a656b5e commit dd8ba56

File tree

9 files changed

+1
-774
lines changed

9 files changed

+1
-774
lines changed

qa/full-cluster-restart/src/javaRestTest/java/org/elasticsearch/upgrades/QueryBuilderBWCIT.java

Lines changed: 1 addition & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,6 @@
1212
import com.carrotsearch.randomizedtesting.annotations.Name;
1313

1414
import org.elasticsearch.TransportVersion;
15-
import org.elasticsearch.TransportVersions;
16-
import org.elasticsearch.Version;
1715
import org.elasticsearch.client.Request;
1816
import org.elasticsearch.client.Response;
1917
import org.elasticsearch.common.Strings;
@@ -23,7 +21,6 @@
2321
import org.elasticsearch.common.io.stream.StreamInput;
2422
import org.elasticsearch.common.settings.Settings;
2523
import org.elasticsearch.common.unit.Fuzziness;
26-
import org.elasticsearch.core.UpdateForV9;
2724
import org.elasticsearch.index.query.BoolQueryBuilder;
2825
import org.elasticsearch.index.query.ConstantScoreQueryBuilder;
2926
import org.elasticsearch.index.query.DisMaxQueryBuilder;
@@ -43,7 +40,6 @@
4340
import org.elasticsearch.test.cluster.FeatureFlag;
4441
import org.elasticsearch.test.cluster.local.LocalClusterConfigProvider;
4542
import org.elasticsearch.test.cluster.local.distribution.DistributionType;
46-
import org.elasticsearch.test.rest.RestTestLegacyFeatures;
4743
import org.elasticsearch.xcontent.XContentBuilder;
4844
import org.junit.ClassRule;
4945

@@ -249,23 +245,10 @@ public void testQueryBuilderBWC() throws Exception {
249245
InputStream in = new ByteArrayInputStream(qbSource, 0, qbSource.length);
250246
StreamInput input = new NamedWriteableAwareStreamInput(new InputStreamStreamInput(in), registry)
251247
) {
252-
253-
@UpdateForV9(owner = UpdateForV9.Owner.SEARCH_FOUNDATIONS) // condition will always be true
254-
var originalClusterHasTransportVersion = oldClusterHasFeature(RestTestLegacyFeatures.TRANSPORT_VERSION_SUPPORTED);
255-
final TransportVersion transportVersion;
256-
if (originalClusterHasTransportVersion == false) {
257-
transportVersion = TransportVersion.fromId(
258-
parseLegacyVersion(getOldClusterVersion()).map(Version::id).orElse(TransportVersions.MINIMUM_COMPATIBLE.id())
259-
);
260-
} else {
261-
transportVersion = TransportVersion.readVersion(input);
262-
}
263-
264-
input.setTransportVersion(transportVersion);
248+
input.setTransportVersion(TransportVersion.readVersion(input));
265249
QueryBuilder queryBuilder = input.readNamedWriteable(QueryBuilder.class);
266250
assert in.read() == -1;
267251
assertEquals(expectedQueryBuilder, queryBuilder);
268-
269252
}
270253
}
271254
}

server/src/main/java/module-info.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -423,7 +423,6 @@
423423
org.elasticsearch.action.bulk.BulkFeatures,
424424
org.elasticsearch.features.FeatureInfrastructureFeatures,
425425
org.elasticsearch.health.HealthFeatures,
426-
org.elasticsearch.cluster.service.TransportFeatures,
427426
org.elasticsearch.cluster.metadata.MetadataFeatures,
428427
org.elasticsearch.rest.RestFeatures,
429428
org.elasticsearch.repositories.RepositoriesFeatures,

server/src/main/java/org/elasticsearch/cluster/service/TransportFeatures.java

Lines changed: 0 additions & 25 deletions
This file was deleted.

server/src/main/java/org/elasticsearch/cluster/service/TransportVersionsFixupListener.java

Lines changed: 0 additions & 229 deletions
This file was deleted.

server/src/main/java/org/elasticsearch/node/NodeConstruction.java

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,6 @@
6262
import org.elasticsearch.cluster.routing.allocation.DiskThresholdMonitor;
6363
import org.elasticsearch.cluster.routing.allocation.WriteLoadForecaster;
6464
import org.elasticsearch.cluster.service.ClusterService;
65-
import org.elasticsearch.cluster.service.TransportVersionsFixupListener;
6665
import org.elasticsearch.cluster.version.CompatibilityVersions;
6766
import org.elasticsearch.common.breaker.CircuitBreaker;
6867
import org.elasticsearch.common.component.LifecycleComponent;
@@ -788,9 +787,6 @@ private void construct(
788787

789788
if (DiscoveryNode.isMasterNode(settings)) {
790789
clusterService.addListener(new SystemIndexMappingUpdateService(systemIndices, client));
791-
clusterService.addListener(
792-
new TransportVersionsFixupListener(clusterService, client.admin().cluster(), featureService, threadPool)
793-
);
794790
clusterService.addListener(new NodeFeaturesFixupListener(clusterService, client.admin().cluster(), threadPool));
795791
}
796792

server/src/main/resources/META-INF/services/org.elasticsearch.features.FeatureSpecification

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@ org.elasticsearch.action.admin.indices.stats.IndicesStatsFeatures
1111
org.elasticsearch.action.bulk.BulkFeatures
1212
org.elasticsearch.features.FeatureInfrastructureFeatures
1313
org.elasticsearch.health.HealthFeatures
14-
org.elasticsearch.cluster.service.TransportFeatures
1514
org.elasticsearch.cluster.metadata.MetadataFeatures
1615
org.elasticsearch.rest.RestFeatures
1716
org.elasticsearch.repositories.RepositoriesFeatures

0 commit comments

Comments
 (0)