Skip to content

Commit 475227a

Browse files
committed
Remove nio transport from 6.x (#34756)
This commit removes the nio transport work from 6.x This work will never be enabled outside of the test framework. Additionally, we get sufficient testing on master/7.0 right now. So there is no need to have it on 6.x. This is motivated by the fact that this work has diverged significantly from master. This makes backports difficult. Additionally, the nio transport uses many connections increasing the timeouts due to resource exhaustion in the build.
1 parent 305459a commit 475227a

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

51 files changed

+9
-5601
lines changed

qa/smoke-test-client/src/test/java/org/elasticsearch/smoketest/ESSmokeClientTestCase.java

Lines changed: 4 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,8 @@
1919

2020
package org.elasticsearch.smoketest;
2121

22-
import org.apache.logging.log4j.Logger;
2322
import org.apache.logging.log4j.LogManager;
23+
import org.apache.logging.log4j.Logger;
2424
import org.apache.lucene.util.LuceneTestCase;
2525
import org.elasticsearch.action.admin.cluster.health.ClusterHealthResponse;
2626
import org.elasticsearch.client.Client;
@@ -32,7 +32,6 @@
3232
import org.elasticsearch.plugins.Plugin;
3333
import org.elasticsearch.transport.MockTcpTransportPlugin;
3434
import org.elasticsearch.transport.client.PreBuiltTransportClient;
35-
import org.elasticsearch.transport.nio.NioTransportPlugin;
3635
import org.junit.After;
3736
import org.junit.AfterClass;
3837
import org.junit.Before;
@@ -82,16 +81,9 @@ private static Client startClient(Path tempDir, TransportAddress... transportAdd
8281
.put("client.transport.ignore_cluster_name", true)
8382
.put(Environment.PATH_HOME_SETTING.getKey(), tempDir);
8483
final Collection<Class<? extends Plugin>> plugins;
85-
boolean usNio = random().nextBoolean();
86-
String transportKey;
87-
Class<? extends Plugin> transportPlugin;
88-
if (usNio) {
89-
transportKey = NioTransportPlugin.NIO_TRANSPORT_NAME;
90-
transportPlugin = NioTransportPlugin.class;
91-
} else {
92-
transportKey = MockTcpTransportPlugin.MOCK_TCP_TRANSPORT_NAME;
93-
transportPlugin = MockTcpTransportPlugin.class;
94-
}
84+
String transportKey = MockTcpTransportPlugin.MOCK_TCP_TRANSPORT_NAME;
85+
Class<? extends Plugin> transportPlugin = MockTcpTransportPlugin.class;
86+
9587
if (random().nextBoolean()) {
9688
builder.put(NetworkModule.TRANSPORT_TYPE_KEY, transportKey);
9789
plugins = Collections.singleton(transportPlugin);

qa/smoke-test-http/src/test/java/org/elasticsearch/http/HttpSmokeTestCase.java

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,6 @@
2424
import org.elasticsearch.test.ESIntegTestCase;
2525
import org.elasticsearch.transport.MockTcpTransportPlugin;
2626
import org.elasticsearch.transport.Netty4Plugin;
27-
import org.elasticsearch.transport.nio.NioTransportPlugin;
2827
import org.junit.BeforeClass;
2928

3029
import java.util.Arrays;
@@ -47,8 +46,6 @@ public static void setUpTransport() {
4746
private static String getTypeKey(Class<? extends Plugin> clazz) {
4847
if (clazz.equals(MockTcpTransportPlugin.class)) {
4948
return MockTcpTransportPlugin.MOCK_TCP_TRANSPORT_NAME;
50-
} else if (clazz.equals(NioTransportPlugin.class)) {
51-
return NioTransportPlugin.NIO_TRANSPORT_NAME;
5249
} else {
5350
assert clazz.equals(Netty4Plugin.class);
5451
return Netty4Plugin.NETTY_TRANSPORT_NAME;

test/framework/src/main/java/org/elasticsearch/test/ESTestCase.java

Lines changed: 3 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -114,7 +114,6 @@
114114
import org.elasticsearch.test.junit.listeners.ReproduceInfoPrinter;
115115
import org.elasticsearch.threadpool.ThreadPool;
116116
import org.elasticsearch.transport.MockTcpTransportPlugin;
117-
import org.elasticsearch.transport.nio.NioTransportPlugin;
118117
import org.joda.time.DateTimeZone;
119118
import org.junit.After;
120119
import org.junit.AfterClass;
@@ -130,8 +129,8 @@
130129
import java.nio.file.DirectoryStream;
131130
import java.nio.file.Files;
132131
import java.nio.file.Path;
133-
import java.time.ZoneId;
134132
import java.security.Security;
133+
import java.time.ZoneId;
135134
import java.util.ArrayList;
136135
import java.util.Arrays;
137136
import java.util.Collection;
@@ -1008,19 +1007,12 @@ public static String randomGeohash(int minPrecision, int maxPrecision) {
10081007
return geohashGenerator.ofStringLength(random(), minPrecision, maxPrecision);
10091008
}
10101009

1011-
private static boolean useNio;
1012-
1013-
@BeforeClass
1014-
public static void setUseNio() throws Exception {
1015-
useNio = randomBoolean();
1016-
}
1017-
10181010
public static String getTestTransportType() {
1019-
return useNio ? NioTransportPlugin.NIO_TRANSPORT_NAME : MockTcpTransportPlugin.MOCK_TCP_TRANSPORT_NAME;
1011+
return MockTcpTransportPlugin.MOCK_TCP_TRANSPORT_NAME;
10201012
}
10211013

10221014
public static Class<? extends Plugin> getTestTransportPlugin() {
1023-
return useNio ? NioTransportPlugin.class : MockTcpTransportPlugin.class;
1015+
return MockTcpTransportPlugin.class;
10241016
}
10251017

10261018
private static final GeohashGenerator geohashGenerator = new GeohashGenerator();

test/framework/src/main/java/org/elasticsearch/test/ExternalTestCluster.java

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,6 @@
3636
import org.elasticsearch.plugins.Plugin;
3737
import org.elasticsearch.transport.MockTcpTransportPlugin;
3838
import org.elasticsearch.transport.MockTransportClient;
39-
import org.elasticsearch.transport.nio.NioTransportPlugin;
4039

4140
import java.io.IOException;
4241
import java.net.InetSocketAddress;
@@ -84,12 +83,9 @@ public ExternalTestCluster(Path tempDir, Settings additionalSettings, Collection
8483
if (addMockTcpTransport) {
8584
String transport = getTestTransportType();
8685
clientSettingsBuilder.put(NetworkModule.TRANSPORT_TYPE_KEY, transport);
87-
if (pluginClasses.contains(MockTcpTransportPlugin.class) == false &&
88-
pluginClasses.contains(NioTransportPlugin.class) == false) {
86+
if (pluginClasses.contains(MockTcpTransportPlugin.class) == false) {
8987
pluginClasses = new ArrayList<>(pluginClasses);
90-
if (transport.equals(NioTransportPlugin.NIO_TRANSPORT_NAME)) {
91-
pluginClasses.add(NioTransportPlugin.class);
92-
} else {
88+
if (transport.equals(MockTcpTransportPlugin.MOCK_TCP_TRANSPORT_NAME)) {
9389
pluginClasses.add(MockTcpTransportPlugin.class);
9490
}
9591
}

test/framework/src/main/java/org/elasticsearch/transport/MockTransportClient.java

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,6 @@
2323
import org.elasticsearch.common.network.NetworkModule;
2424
import org.elasticsearch.common.settings.Settings;
2525
import org.elasticsearch.plugins.Plugin;
26-
import org.elasticsearch.transport.nio.NioTransportPlugin;
2726

2827
import java.util.ArrayList;
2928
import java.util.Arrays;
@@ -59,14 +58,6 @@ private static Collection<Class<? extends Plugin>> addMockTransportIfMissing(Set
5958
plugins.add(MockTcpTransportPlugin.class);
6059
return plugins;
6160
}
62-
} else if (NioTransportPlugin.NIO_TRANSPORT_NAME.equals(transportType)) {
63-
if (plugins.contains(NioTransportPlugin.class)) {
64-
return plugins;
65-
} else {
66-
plugins = new ArrayList<>(plugins);
67-
plugins.add(NioTransportPlugin.class);
68-
return plugins;
69-
}
7061
}
7162
return plugins;
7263
}

test/framework/src/main/java/org/elasticsearch/transport/nio/AcceptingSelector.java

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

test/framework/src/main/java/org/elasticsearch/transport/nio/AcceptorEventHandler.java

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

0 commit comments

Comments
 (0)