mirror of
https://github.com/honeymoose/OpenSearch.git
synced 2025-02-25 14:26:27 +00:00
[Rename] modules/transport-netty4 (#225)
This commit refactors the transport-netty4 module as part of the Elasticsearch to OpenSearch renaming. Signed-off-by: Rabi Panda <adnapibar@gmail.com>
This commit is contained in:
parent
8c2f6f9d1e
commit
95f5997433
@ -31,7 +31,7 @@ import org.elasticsearch.join.ParentJoinPlugin;
|
||||
import org.opensearch.percolator.PercolatorPlugin;
|
||||
import org.elasticsearch.plugins.Plugin;
|
||||
import org.opensearch.script.mustache.MustachePlugin;
|
||||
import org.elasticsearch.transport.Netty4Plugin;
|
||||
import org.opensearch.transport.Netty4Plugin;
|
||||
|
||||
import java.util.Arrays;
|
||||
import java.util.Collection;
|
||||
|
@ -28,7 +28,7 @@ import org.elasticsearch.join.ParentJoinPlugin;
|
||||
import org.opensearch.percolator.PercolatorPlugin;
|
||||
import org.elasticsearch.plugins.Plugin;
|
||||
import org.opensearch.script.mustache.MustachePlugin;
|
||||
import org.elasticsearch.transport.Netty4Plugin;
|
||||
import org.opensearch.transport.Netty4Plugin;
|
||||
import org.junit.Test;
|
||||
|
||||
import java.util.Arrays;
|
||||
|
@ -52,7 +52,7 @@ import org.elasticsearch.script.ScriptService;
|
||||
import org.elasticsearch.tasks.Task;
|
||||
import org.elasticsearch.test.ESSingleNodeTestCase;
|
||||
import org.elasticsearch.threadpool.ThreadPool;
|
||||
import org.elasticsearch.transport.Netty4Plugin;
|
||||
import org.opensearch.transport.Netty4Plugin;
|
||||
import org.elasticsearch.watcher.ResourceWatcherService;
|
||||
import org.junit.Before;
|
||||
|
||||
|
@ -36,7 +36,7 @@ import org.elasticsearch.index.query.QueryBuilders;
|
||||
import org.elasticsearch.plugins.Plugin;
|
||||
import org.elasticsearch.test.ESIntegTestCase;
|
||||
import org.elasticsearch.threadpool.ThreadPool;
|
||||
import org.elasticsearch.transport.Netty4Plugin;
|
||||
import org.opensearch.transport.Netty4Plugin;
|
||||
import org.junit.After;
|
||||
|
||||
import java.util.ArrayList;
|
||||
|
@ -18,14 +18,14 @@
|
||||
*/
|
||||
|
||||
|
||||
import org.elasticsearch.gradle.info.BuildParams
|
||||
import org.elasticsearch.gradle.test.RestIntegTestTask
|
||||
import org.elasticsearch.gradle.test.rest.JavaRestTestPlugin
|
||||
import org.elasticsearch.gradle.test.InternalClusterTestPlugin
|
||||
import org.opensearch.gradle.info.BuildParams
|
||||
import org.opensearch.gradle.test.RestIntegTestTask
|
||||
import org.opensearch.gradle.test.rest.JavaRestTestPlugin
|
||||
import org.opensearch.gradle.test.InternalClusterTestPlugin
|
||||
|
||||
apply plugin: 'elasticsearch.yaml-rest-test'
|
||||
apply plugin: 'elasticsearch.java-rest-test'
|
||||
apply plugin: 'elasticsearch.internal-cluster-test'
|
||||
apply plugin: 'opensearch.yaml-rest-test'
|
||||
apply plugin: 'opensearch.java-rest-test'
|
||||
apply plugin: 'opensearch.internal-cluster-test'
|
||||
|
||||
/*
|
||||
TODOs:
|
||||
@ -35,7 +35,7 @@ apply plugin: 'elasticsearch.internal-cluster-test'
|
||||
*/
|
||||
esplugin {
|
||||
description 'Netty 4 based transport implementation'
|
||||
classname 'org.elasticsearch.transport.Netty4Plugin'
|
||||
classname 'org.opensearch.transport.Netty4Plugin'
|
||||
hasClientJar = true
|
||||
}
|
||||
|
||||
|
@ -16,19 +16,19 @@
|
||||
* specific language governing permissions and limitations
|
||||
* under the License.
|
||||
*/
|
||||
package org.elasticsearch;
|
||||
package org.opensearch;
|
||||
|
||||
import org.elasticsearch.common.network.NetworkModule;
|
||||
import org.elasticsearch.common.settings.Settings;
|
||||
import org.elasticsearch.plugins.Plugin;
|
||||
import org.elasticsearch.test.ESIntegTestCase;
|
||||
import org.elasticsearch.transport.Netty4Plugin;
|
||||
import org.elasticsearch.transport.netty4.Netty4Transport;
|
||||
import org.opensearch.transport.Netty4Plugin;
|
||||
import org.opensearch.transport.netty4.Netty4Transport;
|
||||
|
||||
import java.util.Collection;
|
||||
import java.util.Collections;
|
||||
|
||||
public abstract class ESNetty4IntegTestCase extends ESIntegTestCase {
|
||||
public abstract class OpenSearchNetty4IntegTestCase extends ESIntegTestCase {
|
||||
|
||||
@Override
|
||||
protected boolean ignoreExternalCluster() {
|
@ -17,12 +17,12 @@
|
||||
* under the License.
|
||||
*/
|
||||
|
||||
package org.elasticsearch.http.netty4;
|
||||
package org.opensearch.http.netty4;
|
||||
|
||||
import io.netty.handler.codec.http.FullHttpResponse;
|
||||
import io.netty.handler.codec.http.HttpResponseStatus;
|
||||
import io.netty.util.ReferenceCounted;
|
||||
import org.elasticsearch.ESNetty4IntegTestCase;
|
||||
import org.opensearch.OpenSearchNetty4IntegTestCase;
|
||||
import org.elasticsearch.common.collect.Tuple;
|
||||
import org.elasticsearch.common.settings.Settings;
|
||||
import org.elasticsearch.common.transport.TransportAddress;
|
||||
@ -48,7 +48,7 @@ import static org.hamcrest.Matchers.hasSize;
|
||||
* a single node "cluster". We also force test infrastructure to use the node client instead of the transport client for the same reason.
|
||||
*/
|
||||
@ClusterScope(scope = Scope.TEST, supportsDedicatedMasters = false, numClientNodes = 0, numDataNodes = 1, transportClientRatio = 0)
|
||||
public class Netty4HttpRequestSizeLimitIT extends ESNetty4IntegTestCase {
|
||||
public class Netty4HttpRequestSizeLimitIT extends OpenSearchNetty4IntegTestCase {
|
||||
|
||||
private static final ByteSizeValue LIMIT = new ByteSizeValue(2, ByteSizeUnit.KB);
|
||||
|
@ -17,11 +17,11 @@
|
||||
* under the License.
|
||||
*/
|
||||
|
||||
package org.elasticsearch.http.netty4;
|
||||
package org.opensearch.http.netty4;
|
||||
|
||||
import io.netty.handler.codec.http.FullHttpResponse;
|
||||
import io.netty.util.ReferenceCounted;
|
||||
import org.elasticsearch.ESNetty4IntegTestCase;
|
||||
import org.opensearch.OpenSearchNetty4IntegTestCase;
|
||||
import org.elasticsearch.common.transport.TransportAddress;
|
||||
import org.elasticsearch.http.HttpServerTransport;
|
||||
import org.elasticsearch.test.ESIntegTestCase.ClusterScope;
|
||||
@ -34,7 +34,7 @@ import static org.hamcrest.Matchers.hasSize;
|
||||
import static org.hamcrest.Matchers.is;
|
||||
|
||||
@ClusterScope(scope = Scope.TEST, supportsDedicatedMasters = false, numDataNodes = 1)
|
||||
public class Netty4PipeliningIT extends ESNetty4IntegTestCase {
|
||||
public class Netty4PipeliningIT extends OpenSearchNetty4IntegTestCase {
|
||||
|
||||
@Override
|
||||
protected boolean addMockHttpTransport() {
|
@ -17,10 +17,10 @@
|
||||
* under the License.
|
||||
*/
|
||||
|
||||
package org.elasticsearch.rest.discovery;
|
||||
package org.opensearch.rest.discovery;
|
||||
|
||||
import org.apache.http.HttpHost;
|
||||
import org.elasticsearch.ESNetty4IntegTestCase;
|
||||
import org.opensearch.OpenSearchNetty4IntegTestCase;
|
||||
import org.elasticsearch.action.admin.cluster.health.ClusterHealthResponse;
|
||||
import org.elasticsearch.client.Client;
|
||||
import org.elasticsearch.client.Node;
|
||||
@ -48,7 +48,7 @@ import static org.hamcrest.core.Is.is;
|
||||
// proper transport implementation, and they cannot be REST tests today since they need to restart nodes. When #35599 and friends land we
|
||||
// should be able to move these tests to run against a proper cluster instead. TODO do this.
|
||||
@ESIntegTestCase.ClusterScope(scope = ESIntegTestCase.Scope.TEST, numDataNodes = 0, transportClientRatio = 0, autoManageMasterNodes = false)
|
||||
public class Zen2RestApiIT extends ESNetty4IntegTestCase {
|
||||
public class Zen2RestApiIT extends OpenSearchNetty4IntegTestCase {
|
||||
|
||||
@Override
|
||||
protected boolean addMockHttpTransport() {
|
@ -16,9 +16,9 @@
|
||||
* specific language governing permissions and limitations
|
||||
* under the License.
|
||||
*/
|
||||
package org.elasticsearch.transport.netty4;
|
||||
package org.opensearch.transport.netty4;
|
||||
|
||||
import org.elasticsearch.ESNetty4IntegTestCase;
|
||||
import org.opensearch.OpenSearchNetty4IntegTestCase;
|
||||
import org.elasticsearch.action.admin.cluster.health.ClusterHealthResponse;
|
||||
import org.elasticsearch.action.admin.cluster.node.info.NodeInfo;
|
||||
import org.elasticsearch.action.admin.cluster.node.info.NodesInfoResponse;
|
||||
@ -34,7 +34,7 @@ import org.elasticsearch.test.ESIntegTestCase.ClusterScope;
|
||||
import org.elasticsearch.test.ESIntegTestCase.Scope;
|
||||
import org.elasticsearch.test.junit.annotations.Network;
|
||||
import org.elasticsearch.transport.MockTransportClient;
|
||||
import org.elasticsearch.transport.Netty4Plugin;
|
||||
import org.opensearch.transport.Netty4Plugin;
|
||||
import org.elasticsearch.transport.TransportInfo;
|
||||
|
||||
import java.net.InetAddress;
|
||||
@ -51,7 +51,7 @@ import static org.hamcrest.Matchers.is;
|
||||
import static org.hamcrest.Matchers.lessThanOrEqualTo;
|
||||
|
||||
@ClusterScope(scope = Scope.SUITE, supportsDedicatedMasters = false, numDataNodes = 1, numClientNodes = 0)
|
||||
public class Netty4TransportMultiPortIntegrationIT extends ESNetty4IntegTestCase {
|
||||
public class Netty4TransportMultiPortIntegrationIT extends OpenSearchNetty4IntegTestCase {
|
||||
|
||||
private static int randomPort = -1;
|
||||
private static String randomPortRange;
|
@ -17,9 +17,9 @@
|
||||
* under the License.
|
||||
*/
|
||||
|
||||
package org.elasticsearch.transport.netty4;
|
||||
package org.opensearch.transport.netty4;
|
||||
|
||||
import org.elasticsearch.ESNetty4IntegTestCase;
|
||||
import org.opensearch.OpenSearchNetty4IntegTestCase;
|
||||
import org.elasticsearch.action.admin.cluster.node.info.NodeInfo;
|
||||
import org.elasticsearch.action.admin.cluster.node.info.NodesInfoResponse;
|
||||
import org.elasticsearch.common.network.NetworkModule;
|
||||
@ -28,7 +28,7 @@ import org.elasticsearch.common.settings.Settings;
|
||||
import org.elasticsearch.common.transport.BoundTransportAddress;
|
||||
import org.elasticsearch.common.transport.TransportAddress;
|
||||
import org.elasticsearch.test.ESIntegTestCase;
|
||||
import org.elasticsearch.transport.Netty4Plugin;
|
||||
import org.opensearch.transport.Netty4Plugin;
|
||||
import org.elasticsearch.transport.TransportInfo;
|
||||
|
||||
import java.net.Inet4Address;
|
||||
@ -38,11 +38,11 @@ import static org.hamcrest.Matchers.greaterThan;
|
||||
import static org.hamcrest.Matchers.instanceOf;
|
||||
|
||||
/**
|
||||
* Checks that Elasticsearch produces a sane publish_address when it binds to
|
||||
* Checks that OpenSearch produces a sane publish_address when it binds to
|
||||
* different ports on ipv4 and ipv6.
|
||||
*/
|
||||
@ESIntegTestCase.ClusterScope(scope = ESIntegTestCase.Scope.TEST, numDataNodes = 0)
|
||||
public class Netty4TransportPublishAddressIT extends ESNetty4IntegTestCase {
|
||||
public class Netty4TransportPublishAddressIT extends OpenSearchNetty4IntegTestCase {
|
||||
@Override
|
||||
protected Settings nodeSettings(int nodeOrdinal) {
|
||||
return Settings.builder()
|
@ -17,11 +17,11 @@
|
||||
* under the License.
|
||||
*/
|
||||
|
||||
package org.elasticsearch.transport.netty4;
|
||||
package org.opensearch.transport.netty4;
|
||||
|
||||
import org.apache.logging.log4j.Level;
|
||||
import org.apache.logging.log4j.LogManager;
|
||||
import org.elasticsearch.ESNetty4IntegTestCase;
|
||||
import org.opensearch.OpenSearchNetty4IntegTestCase;
|
||||
import org.elasticsearch.action.admin.cluster.node.hotthreads.NodesHotThreadsRequest;
|
||||
import org.elasticsearch.common.logging.Loggers;
|
||||
import org.elasticsearch.test.ESIntegTestCase;
|
||||
@ -34,21 +34,21 @@ import org.elasticsearch.transport.TransportLogger;
|
||||
import java.io.IOException;
|
||||
|
||||
@ESIntegTestCase.ClusterScope(numDataNodes = 2, scope = ESIntegTestCase.Scope.TEST)
|
||||
public class ESLoggingHandlerIT extends ESNetty4IntegTestCase {
|
||||
public class OpenSearchLoggingHandlerIT extends OpenSearchNetty4IntegTestCase {
|
||||
|
||||
private MockLogAppender appender;
|
||||
|
||||
public void setUp() throws Exception {
|
||||
super.setUp();
|
||||
appender = new MockLogAppender();
|
||||
Loggers.addAppender(LogManager.getLogger(ESLoggingHandler.class), appender);
|
||||
Loggers.addAppender(LogManager.getLogger(OpenSearchLoggingHandler.class), appender);
|
||||
Loggers.addAppender(LogManager.getLogger(TransportLogger.class), appender);
|
||||
Loggers.addAppender(LogManager.getLogger(TcpTransport.class), appender);
|
||||
appender.start();
|
||||
}
|
||||
|
||||
public void tearDown() throws Exception {
|
||||
Loggers.removeAppender(LogManager.getLogger(ESLoggingHandler.class), appender);
|
||||
Loggers.removeAppender(LogManager.getLogger(OpenSearchLoggingHandler.class), appender);
|
||||
Loggers.removeAppender(LogManager.getLogger(TransportLogger.class), appender);
|
||||
Loggers.removeAppender(LogManager.getLogger(TcpTransport.class), appender);
|
||||
appender.stop();
|
||||
@ -56,7 +56,7 @@ public class ESLoggingHandlerIT extends ESNetty4IntegTestCase {
|
||||
}
|
||||
|
||||
@TestLogging(
|
||||
value = "org.elasticsearch.transport.netty4.ESLoggingHandler:trace,org.elasticsearch.transport.TransportLogger:trace",
|
||||
value = "org.opensearch.transport.netty4.ESLoggingHandler:trace,org.opensearch.transport.TransportLogger:trace",
|
||||
reason = "to ensure we log network events on TRACE level")
|
||||
public void testLoggingHandler() {
|
||||
final String writePattern =
|
||||
@ -71,7 +71,7 @@ public class ESLoggingHandlerIT extends ESNetty4IntegTestCase {
|
||||
"hot threads request", TransportLogger.class.getCanonicalName(), Level.TRACE, writePattern);
|
||||
|
||||
final MockLogAppender.LoggingExpectation flushExpectation =
|
||||
new MockLogAppender.SeenEventExpectation("flush", ESLoggingHandler.class.getCanonicalName(), Level.TRACE, "*FLUSH*");
|
||||
new MockLogAppender.SeenEventExpectation("flush", OpenSearchLoggingHandler.class.getCanonicalName(), Level.TRACE, "*FLUSH*");
|
||||
|
||||
final String readPattern =
|
||||
".*\\[length: \\d+" +
|
||||
@ -92,7 +92,7 @@ public class ESLoggingHandlerIT extends ESNetty4IntegTestCase {
|
||||
appender.assertAllExpectationsMatched();
|
||||
}
|
||||
|
||||
@TestLogging(value = "org.elasticsearch.transport.TcpTransport:DEBUG", reason = "to ensure we log connection events on DEBUG level")
|
||||
@TestLogging(value = "org.opensearch.transport.TcpTransport:DEBUG", reason = "to ensure we log connection events on DEBUG level")
|
||||
public void testConnectionLogging() throws IOException {
|
||||
appender.addExpectation(new MockLogAppender.PatternSeenEventExpectation("open connection log",
|
||||
TcpTransport.class.getCanonicalName(), Level.DEBUG,
|
@ -17,7 +17,7 @@
|
||||
* under the License.
|
||||
*/
|
||||
|
||||
package org.elasticsearch.rest;
|
||||
package org.opensearch.rest;
|
||||
|
||||
import org.elasticsearch.client.Request;
|
||||
import org.elasticsearch.client.RequestOptions;
|
@ -17,7 +17,7 @@
|
||||
* under the License.
|
||||
*/
|
||||
|
||||
package org.elasticsearch.rest;
|
||||
package org.opensearch.rest;
|
||||
|
||||
import org.elasticsearch.client.Request;
|
||||
import org.elasticsearch.client.Response;
|
@ -17,14 +17,14 @@
|
||||
* under the License.
|
||||
*/
|
||||
|
||||
package org.elasticsearch.http.netty4;
|
||||
package org.opensearch.http.netty4;
|
||||
|
||||
import io.netty.channel.Channel;
|
||||
import org.elasticsearch.action.ActionListener;
|
||||
import org.elasticsearch.common.concurrent.CompletableContext;
|
||||
import org.elasticsearch.http.HttpChannel;
|
||||
import org.elasticsearch.http.HttpResponse;
|
||||
import org.elasticsearch.transport.netty4.Netty4TcpChannel;
|
||||
import org.opensearch.transport.netty4.Netty4TcpChannel;
|
||||
|
||||
import java.net.InetSocketAddress;
|
||||
|
@ -17,7 +17,7 @@
|
||||
* under the License.
|
||||
*/
|
||||
|
||||
package org.elasticsearch.http.netty4;
|
||||
package org.opensearch.http.netty4;
|
||||
|
||||
import io.netty.channel.ChannelDuplexHandler;
|
||||
import io.netty.channel.ChannelHandlerContext;
|
@ -17,7 +17,7 @@
|
||||
* under the License.
|
||||
*/
|
||||
|
||||
package org.elasticsearch.http.netty4;
|
||||
package org.opensearch.http.netty4;
|
||||
|
||||
import io.netty.buffer.ByteBuf;
|
||||
import io.netty.buffer.Unpooled;
|
||||
@ -34,7 +34,7 @@ import org.elasticsearch.common.bytes.BytesReference;
|
||||
import org.elasticsearch.http.HttpRequest;
|
||||
import org.elasticsearch.rest.RestRequest;
|
||||
import org.elasticsearch.rest.RestStatus;
|
||||
import org.elasticsearch.transport.netty4.Netty4Utils;
|
||||
import org.opensearch.transport.netty4.Netty4Utils;
|
||||
|
||||
import java.util.AbstractMap;
|
||||
import java.util.Collection;
|
@ -17,7 +17,7 @@
|
||||
* under the License.
|
||||
*/
|
||||
|
||||
package org.elasticsearch.http.netty4;
|
||||
package org.opensearch.http.netty4;
|
||||
|
||||
import io.netty.channel.ChannelHandler;
|
||||
import io.netty.channel.ChannelHandlerContext;
|
@ -17,7 +17,7 @@
|
||||
* under the License.
|
||||
*/
|
||||
|
||||
package org.elasticsearch.http.netty4;
|
||||
package org.opensearch.http.netty4;
|
||||
|
||||
import io.netty.channel.ChannelHandler;
|
||||
import io.netty.channel.ChannelHandlerContext;
|
@ -17,7 +17,7 @@
|
||||
* under the License.
|
||||
*/
|
||||
|
||||
package org.elasticsearch.http.netty4;
|
||||
package org.opensearch.http.netty4;
|
||||
|
||||
import io.netty.handler.codec.http.DefaultFullHttpResponse;
|
||||
import io.netty.handler.codec.http.HttpHeaders;
|
||||
@ -26,7 +26,7 @@ import io.netty.handler.codec.http.HttpVersion;
|
||||
import org.elasticsearch.common.bytes.BytesReference;
|
||||
import org.elasticsearch.http.HttpResponse;
|
||||
import org.elasticsearch.rest.RestStatus;
|
||||
import org.elasticsearch.transport.netty4.Netty4Utils;
|
||||
import org.opensearch.transport.netty4.Netty4Utils;
|
||||
|
||||
public class Netty4HttpResponse extends DefaultFullHttpResponse implements HttpResponse {
|
||||
|
@ -17,7 +17,7 @@
|
||||
* under the License.
|
||||
*/
|
||||
|
||||
package org.elasticsearch.http.netty4;
|
||||
package org.opensearch.http.netty4;
|
||||
|
||||
import io.netty.buffer.ByteBuf;
|
||||
import io.netty.channel.ChannelHandler;
|
||||
@ -29,7 +29,7 @@ import io.netty.handler.codec.http.DefaultHttpResponse;
|
||||
import io.netty.handler.codec.http.DefaultLastHttpContent;
|
||||
import io.netty.handler.codec.http.HttpResponse;
|
||||
import org.elasticsearch.common.Booleans;
|
||||
import org.elasticsearch.transport.NettyAllocator;
|
||||
import org.opensearch.transport.NettyAllocator;
|
||||
|
||||
import java.util.List;
|
||||
|
@ -17,13 +17,13 @@
|
||||
* under the License.
|
||||
*/
|
||||
|
||||
package org.elasticsearch.http.netty4;
|
||||
package org.opensearch.http.netty4;
|
||||
|
||||
import io.netty.channel.Channel;
|
||||
import org.elasticsearch.action.ActionListener;
|
||||
import org.elasticsearch.common.concurrent.CompletableContext;
|
||||
import org.elasticsearch.http.HttpServerChannel;
|
||||
import org.elasticsearch.transport.netty4.Netty4TcpChannel;
|
||||
import org.opensearch.transport.netty4.Netty4TcpChannel;
|
||||
|
||||
import java.net.InetSocketAddress;
|
||||
|
@ -17,7 +17,7 @@
|
||||
* under the License.
|
||||
*/
|
||||
|
||||
package org.elasticsearch.http.netty4;
|
||||
package org.opensearch.http.netty4;
|
||||
|
||||
import io.netty.bootstrap.ServerBootstrap;
|
||||
import io.netty.channel.Channel;
|
||||
@ -60,10 +60,10 @@ import org.elasticsearch.http.HttpHandlingSettings;
|
||||
import org.elasticsearch.http.HttpReadTimeoutException;
|
||||
import org.elasticsearch.http.HttpServerChannel;
|
||||
import org.elasticsearch.threadpool.ThreadPool;
|
||||
import org.elasticsearch.transport.NettyAllocator;
|
||||
import org.elasticsearch.transport.NettyByteBufSizer;
|
||||
import org.elasticsearch.transport.SharedGroupFactory;
|
||||
import org.elasticsearch.transport.netty4.Netty4Utils;
|
||||
import org.opensearch.transport.NettyAllocator;
|
||||
import org.opensearch.transport.NettyByteBufSizer;
|
||||
import org.opensearch.transport.SharedGroupFactory;
|
||||
import org.opensearch.transport.netty4.Netty4Utils;
|
||||
|
||||
import java.net.InetSocketAddress;
|
||||
import java.net.SocketOption;
|
||||
@ -112,7 +112,7 @@ public class Netty4HttpServerTransport extends AbstractHttpServerTransport {
|
||||
* io.netty.handler.codec.MessageAggregator#DEFAULT_MAX_COMPOSITEBUFFER_COMPONENTS). To determine a proper default capacity for
|
||||
* that buffer, we need to consider that the upper bound for the size of HTTP requests is determined by `maxContentLength`. The
|
||||
* number of buffers that are needed depend on how often Netty reads network packets which depends on the network type (MTU).
|
||||
* We assume here that Elasticsearch receives HTTP requests via an Ethernet connection which has a MTU of 1500 bytes.
|
||||
* We assume here that OpenSearch receives HTTP requests via an Ethernet connection which has a MTU of 1500 bytes.
|
||||
*
|
||||
* Note that we are *not* pre-allocating any memory based on this setting but rather determine the CompositeByteBuf's capacity.
|
||||
* The tradeoff is between less (but larger) buffers that are contained in the CompositeByteBuf and more (but smaller) buffers.
|
@ -31,7 +31,7 @@
|
||||
* License for the specific language governing permissions and limitations
|
||||
* under the License.
|
||||
*/
|
||||
package org.elasticsearch.transport;
|
||||
package org.opensearch.transport;
|
||||
|
||||
import io.netty.channel.socket.nio.NioServerSocketChannel;
|
||||
import io.netty.util.internal.SocketUtils;
|
@ -31,7 +31,7 @@
|
||||
* License for the specific language governing permissions and limitations
|
||||
* under the License.
|
||||
*/
|
||||
package org.elasticsearch.transport;
|
||||
package org.opensearch.transport;
|
||||
|
||||
import io.netty.buffer.ByteBuf;
|
||||
import io.netty.channel.Channel;
|
@ -17,7 +17,7 @@
|
||||
* under the License.
|
||||
*/
|
||||
|
||||
package org.elasticsearch.transport;
|
||||
package org.opensearch.transport;
|
||||
|
||||
import io.netty.channel.Channel;
|
||||
import io.netty.channel.socket.nio.NioSocketChannel;
|
@ -17,7 +17,7 @@
|
||||
* under the License.
|
||||
*/
|
||||
|
||||
package org.elasticsearch.transport;
|
||||
package org.opensearch.transport;
|
||||
|
||||
import org.apache.lucene.util.SetOnce;
|
||||
import org.elasticsearch.Version;
|
||||
@ -31,12 +31,13 @@ import org.elasticsearch.common.util.BigArrays;
|
||||
import org.elasticsearch.common.util.PageCacheRecycler;
|
||||
import org.elasticsearch.common.xcontent.NamedXContentRegistry;
|
||||
import org.elasticsearch.http.HttpServerTransport;
|
||||
import org.elasticsearch.http.netty4.Netty4HttpServerTransport;
|
||||
import org.opensearch.http.netty4.Netty4HttpServerTransport;
|
||||
import org.elasticsearch.indices.breaker.CircuitBreakerService;
|
||||
import org.elasticsearch.plugins.NetworkPlugin;
|
||||
import org.elasticsearch.plugins.Plugin;
|
||||
import org.elasticsearch.threadpool.ThreadPool;
|
||||
import org.elasticsearch.transport.netty4.Netty4Transport;
|
||||
import org.elasticsearch.transport.Transport;
|
||||
import org.opensearch.transport.netty4.Netty4Transport;
|
||||
|
||||
import java.util.Arrays;
|
||||
import java.util.Collections;
|
@ -17,7 +17,7 @@
|
||||
* under the License.
|
||||
*/
|
||||
|
||||
package org.elasticsearch.transport;
|
||||
package org.opensearch.transport;
|
||||
|
||||
import io.netty.buffer.ByteBuf;
|
||||
import io.netty.buffer.ByteBufAllocator;
|
||||
@ -106,7 +106,7 @@ public class NettyAllocator {
|
||||
int chunkSizeInBytes = pageSize << maxOrder;
|
||||
ByteSizeValue chunkSize = new ByteSizeValue(chunkSizeInBytes);
|
||||
SUGGESTED_MAX_ALLOCATION_SIZE = chunkSizeInBytes;
|
||||
DESCRIPTION = "[name=elasticsearch_configured, chunk_size=" + chunkSize
|
||||
DESCRIPTION = "[name=opensearch_configured, chunk_size=" + chunkSize
|
||||
+ ", suggested_max_allocation_size=" + new ByteSizeValue(SUGGESTED_MAX_ALLOCATION_SIZE)
|
||||
+ ", factors={es.unsafe.use_netty_default_chunk_and_page_size=" + useDefaultChunkAndPageSize()
|
||||
+ ", g1gc_enabled=" + g1gcEnabled
|
@ -17,7 +17,7 @@
|
||||
* under the License.
|
||||
*/
|
||||
|
||||
package org.elasticsearch.transport;
|
||||
package org.opensearch.transport;
|
||||
|
||||
import io.netty.buffer.ByteBuf;
|
||||
import io.netty.channel.ChannelHandler;
|
@ -17,7 +17,7 @@
|
||||
* under the License.
|
||||
*/
|
||||
|
||||
package org.elasticsearch.transport;
|
||||
package org.opensearch.transport;
|
||||
|
||||
import io.netty.channel.EventLoopGroup;
|
||||
import io.netty.channel.nio.NioEventLoopGroup;
|
||||
@ -26,9 +26,11 @@ import org.apache.logging.log4j.LogManager;
|
||||
import org.apache.logging.log4j.Logger;
|
||||
import org.elasticsearch.common.settings.Settings;
|
||||
import org.elasticsearch.common.util.concurrent.AbstractRefCounted;
|
||||
import org.elasticsearch.common.util.concurrent.EsExecutors;
|
||||
import org.elasticsearch.http.HttpServerTransport;
|
||||
import org.elasticsearch.http.netty4.Netty4HttpServerTransport;
|
||||
import org.elasticsearch.transport.netty4.Netty4Transport;
|
||||
import org.opensearch.http.netty4.Netty4HttpServerTransport;
|
||||
import org.elasticsearch.transport.TcpTransport;
|
||||
import org.opensearch.transport.netty4.Netty4Transport;
|
||||
|
||||
import java.util.concurrent.TimeUnit;
|
||||
import java.util.concurrent.atomic.AtomicBoolean;
|
||||
@ -38,7 +40,7 @@ import static org.elasticsearch.common.util.concurrent.EsExecutors.daemonThreadF
|
||||
/**
|
||||
* Creates and returns {@link io.netty.channel.EventLoopGroup} instances. It will return a shared group for
|
||||
* both {@link #getHttpGroup()} and {@link #getTransportGroup()} if
|
||||
* {@link org.elasticsearch.http.netty4.Netty4HttpServerTransport#SETTING_HTTP_WORKER_COUNT} is configured to be 0.
|
||||
* {@link org.opensearch.http.netty4.Netty4HttpServerTransport#SETTING_HTTP_WORKER_COUNT} is configured to be 0.
|
||||
* If that setting is not 0, then it will return a different group in the {@link #getHttpGroup()} call.
|
||||
*/
|
||||
public final class SharedGroupFactory {
|
@ -7,7 +7,7 @@
|
||||
* not use this file except in compliance with the License.
|
||||
* You may obtain a copy of the License at
|
||||
*
|
||||
* http://www.apache.org/licenses/LICENSE-2.0
|
||||
* http://www.apache.org/licenses/LICENSE-2.0
|
||||
*
|
||||
* Unless required by applicable law or agreed to in writing,
|
||||
* software distributed under the License is distributed on an
|
||||
@ -17,7 +17,7 @@
|
||||
* under the License.
|
||||
*/
|
||||
|
||||
package org.elasticsearch.transport.netty4;
|
||||
package org.opensearch.transport.netty4;
|
||||
|
||||
import io.netty.buffer.ByteBuf;
|
||||
import io.netty.channel.Channel;
|
@ -17,7 +17,7 @@
|
||||
* under the License.
|
||||
*/
|
||||
|
||||
package org.elasticsearch.transport.netty4;
|
||||
package org.opensearch.transport.netty4;
|
||||
|
||||
import io.netty.channel.Channel;
|
||||
import io.netty.channel.ChannelFuture;
|
@ -17,7 +17,7 @@
|
||||
* under the License.
|
||||
*/
|
||||
|
||||
package org.elasticsearch.transport.netty4;
|
||||
package org.opensearch.transport.netty4;
|
||||
|
||||
import io.netty.channel.Channel;
|
||||
import org.elasticsearch.action.ActionListener;
|
@ -16,7 +16,7 @@
|
||||
* specific language governing permissions and limitations
|
||||
* under the License.
|
||||
*/
|
||||
package org.elasticsearch.transport.netty4;
|
||||
package org.opensearch.transport.netty4;
|
||||
|
||||
import io.netty.bootstrap.Bootstrap;
|
||||
import io.netty.bootstrap.ServerBootstrap;
|
||||
@ -52,10 +52,10 @@ import org.elasticsearch.common.util.concurrent.EsExecutors;
|
||||
import org.elasticsearch.core.internal.net.NetUtils;
|
||||
import org.elasticsearch.indices.breaker.CircuitBreakerService;
|
||||
import org.elasticsearch.threadpool.ThreadPool;
|
||||
import org.elasticsearch.transport.Netty4NioSocketChannel;
|
||||
import org.elasticsearch.transport.NettyAllocator;
|
||||
import org.elasticsearch.transport.NettyByteBufSizer;
|
||||
import org.elasticsearch.transport.SharedGroupFactory;
|
||||
import org.opensearch.transport.Netty4NioSocketChannel;
|
||||
import org.opensearch.transport.NettyAllocator;
|
||||
import org.opensearch.transport.NettyByteBufSizer;
|
||||
import org.opensearch.transport.SharedGroupFactory;
|
||||
import org.elasticsearch.transport.TcpTransport;
|
||||
import org.elasticsearch.transport.TransportSettings;
|
||||
|
||||
@ -312,7 +312,7 @@ public class Netty4Transport extends TcpTransport {
|
||||
addClosedExceptionLogger(ch);
|
||||
assert ch instanceof Netty4NioSocketChannel;
|
||||
NetUtils.tryEnsureReasonableKeepAliveConfig(((Netty4NioSocketChannel) ch).javaChannel());
|
||||
ch.pipeline().addLast("logging", new ESLoggingHandler());
|
||||
ch.pipeline().addLast("logging", new OpenSearchLoggingHandler());
|
||||
// using a dot as a prefix means this cannot come from any settings parsed
|
||||
ch.pipeline().addLast("dispatcher", new Netty4MessageChannelHandler(pageCacheRecycler, Netty4Transport.this));
|
||||
}
|
||||
@ -341,7 +341,7 @@ public class Netty4Transport extends TcpTransport {
|
||||
Netty4TcpChannel nettyTcpChannel = new Netty4TcpChannel(ch, true, name, ch.newSucceededFuture());
|
||||
ch.attr(CHANNEL_KEY).set(nettyTcpChannel);
|
||||
ch.pipeline().addLast("byte_buf_sizer", sizer);
|
||||
ch.pipeline().addLast("logging", new ESLoggingHandler());
|
||||
ch.pipeline().addLast("logging", new OpenSearchLoggingHandler());
|
||||
ch.pipeline().addLast("dispatcher", new Netty4MessageChannelHandler(pageCacheRecycler, Netty4Transport.this));
|
||||
serverAcceptedChannel(nettyTcpChannel);
|
||||
}
|
@ -17,7 +17,7 @@
|
||||
* under the License.
|
||||
*/
|
||||
|
||||
package org.elasticsearch.transport.netty4;
|
||||
package org.opensearch.transport.netty4;
|
||||
|
||||
import io.netty.buffer.ByteBuf;
|
||||
import io.netty.buffer.CompositeByteBuf;
|
@ -17,15 +17,15 @@
|
||||
* under the License.
|
||||
*/
|
||||
|
||||
package org.elasticsearch.transport.netty4;
|
||||
package org.opensearch.transport.netty4;
|
||||
|
||||
import io.netty.channel.ChannelHandlerContext;
|
||||
import io.netty.handler.logging.LogLevel;
|
||||
import io.netty.handler.logging.LoggingHandler;
|
||||
|
||||
final class ESLoggingHandler extends LoggingHandler {
|
||||
final class OpenSearchLoggingHandler extends LoggingHandler {
|
||||
|
||||
ESLoggingHandler() {
|
||||
OpenSearchLoggingHandler() {
|
||||
super(LogLevel.TRACE);
|
||||
}
|
||||
|
@ -17,7 +17,7 @@
|
||||
* under the License.
|
||||
*/
|
||||
|
||||
package org.elasticsearch.http.netty4;
|
||||
package org.opensearch.http.netty4;
|
||||
|
||||
import io.netty.handler.codec.http.FullHttpResponse;
|
||||
import io.netty.util.ReferenceCounted;
|
||||
@ -39,7 +39,7 @@ import org.elasticsearch.rest.RestStatus;
|
||||
import org.elasticsearch.test.ESTestCase;
|
||||
import org.elasticsearch.threadpool.TestThreadPool;
|
||||
import org.elasticsearch.threadpool.ThreadPool;
|
||||
import org.elasticsearch.transport.SharedGroupFactory;
|
||||
import org.opensearch.transport.SharedGroupFactory;
|
||||
import org.junit.After;
|
||||
import org.junit.Before;
|
||||
|
@ -17,7 +17,7 @@
|
||||
* under the License.
|
||||
*/
|
||||
|
||||
package org.elasticsearch.http.netty4;
|
||||
package org.opensearch.http.netty4;
|
||||
|
||||
import io.netty.bootstrap.Bootstrap;
|
||||
import io.netty.buffer.ByteBuf;
|
||||
@ -46,7 +46,7 @@ import org.elasticsearch.common.collect.Tuple;
|
||||
import org.elasticsearch.common.unit.ByteSizeUnit;
|
||||
import org.elasticsearch.common.unit.ByteSizeValue;
|
||||
import org.elasticsearch.tasks.Task;
|
||||
import org.elasticsearch.transport.NettyAllocator;
|
||||
import org.opensearch.transport.NettyAllocator;
|
||||
|
||||
import java.io.Closeable;
|
||||
import java.net.SocketAddress;
|
@ -17,7 +17,7 @@
|
||||
* under the License.
|
||||
*/
|
||||
|
||||
package org.elasticsearch.http.netty4;
|
||||
package org.opensearch.http.netty4;
|
||||
|
||||
import io.netty.buffer.ByteBufUtil;
|
||||
import io.netty.channel.ChannelHandlerContext;
|
@ -17,7 +17,7 @@
|
||||
* under the License.
|
||||
*/
|
||||
|
||||
package org.elasticsearch.http.netty4;
|
||||
package org.opensearch.http.netty4;
|
||||
|
||||
import io.netty.buffer.ByteBuf;
|
||||
import io.netty.buffer.Unpooled;
|
||||
@ -44,7 +44,7 @@ import org.elasticsearch.rest.RestStatus;
|
||||
import org.elasticsearch.test.ESTestCase;
|
||||
import org.elasticsearch.threadpool.TestThreadPool;
|
||||
import org.elasticsearch.threadpool.ThreadPool;
|
||||
import org.elasticsearch.transport.SharedGroupFactory;
|
||||
import org.opensearch.transport.SharedGroupFactory;
|
||||
import org.junit.After;
|
||||
import org.junit.Before;
|
||||
|
||||
@ -59,7 +59,7 @@ import java.util.concurrent.Executors;
|
||||
import static org.hamcrest.Matchers.contains;
|
||||
|
||||
/**
|
||||
* This test just tests, if he pipelining works in general with out any connection the Elasticsearch handler
|
||||
* This test just tests, if he pipelining works in general with out any connection the OpenSearch handler
|
||||
*/
|
||||
public class Netty4HttpServerPipeliningTests extends ESTestCase {
|
||||
private NetworkService networkService;
|
@ -17,7 +17,7 @@
|
||||
* under the License.
|
||||
*/
|
||||
|
||||
package org.elasticsearch.http.netty4;
|
||||
package org.opensearch.http.netty4;
|
||||
|
||||
import io.netty.bootstrap.Bootstrap;
|
||||
import io.netty.buffer.ByteBufAllocator;
|
||||
@ -70,8 +70,8 @@ import org.elasticsearch.test.ESTestCase;
|
||||
import org.elasticsearch.test.rest.FakeRestRequest;
|
||||
import org.elasticsearch.threadpool.TestThreadPool;
|
||||
import org.elasticsearch.threadpool.ThreadPool;
|
||||
import org.elasticsearch.transport.SharedGroupFactory;
|
||||
import org.elasticsearch.transport.NettyAllocator;
|
||||
import org.opensearch.transport.SharedGroupFactory;
|
||||
import org.opensearch.transport.NettyAllocator;
|
||||
import org.junit.After;
|
||||
import org.junit.Before;
|
||||
|
@ -16,7 +16,7 @@
|
||||
* specific language governing permissions and limitations
|
||||
* under the License.
|
||||
*/
|
||||
package org.elasticsearch.transport;
|
||||
package org.opensearch.transport;
|
||||
|
||||
import io.netty.bootstrap.Bootstrap;
|
||||
import io.netty.bootstrap.ServerBootstrap;
|
@ -17,10 +17,10 @@
|
||||
* under the License.
|
||||
*/
|
||||
|
||||
package org.elasticsearch.transport;
|
||||
package org.opensearch.transport;
|
||||
|
||||
import org.elasticsearch.common.settings.Settings;
|
||||
import org.elasticsearch.http.netty4.Netty4HttpServerTransport;
|
||||
import org.opensearch.http.netty4.Netty4HttpServerTransport;
|
||||
import org.elasticsearch.test.ESTestCase;
|
||||
|
||||
public final class SharedGroupFactoryTests extends ESTestCase {
|
@ -17,7 +17,7 @@
|
||||
* under the License.
|
||||
*/
|
||||
|
||||
package org.elasticsearch.transport.netty4;
|
||||
package org.opensearch.transport.netty4;
|
||||
|
||||
import org.elasticsearch.Version;
|
||||
import org.elasticsearch.common.io.stream.NamedWriteableRegistry;
|
||||
@ -30,7 +30,7 @@ import org.elasticsearch.indices.breaker.NoneCircuitBreakerService;
|
||||
import org.elasticsearch.mocksocket.MockSocket;
|
||||
import org.elasticsearch.test.ESTestCase;
|
||||
import org.elasticsearch.threadpool.ThreadPool;
|
||||
import org.elasticsearch.transport.SharedGroupFactory;
|
||||
import org.opensearch.transport.SharedGroupFactory;
|
||||
import org.elasticsearch.transport.TransportSettings;
|
||||
import org.junit.After;
|
||||
import org.junit.Before;
|
@ -17,7 +17,7 @@
|
||||
* under the License.
|
||||
*/
|
||||
|
||||
package org.elasticsearch.transport.netty4;
|
||||
package org.opensearch.transport.netty4;
|
||||
|
||||
import io.netty.buffer.ByteBuf;
|
||||
import io.netty.buffer.CompositeByteBuf;
|
@ -16,7 +16,7 @@
|
||||
* specific language governing permissions and limitations
|
||||
* under the License.
|
||||
*/
|
||||
package org.elasticsearch.transport.netty4;
|
||||
package org.opensearch.transport.netty4;
|
||||
|
||||
import org.elasticsearch.Version;
|
||||
import org.elasticsearch.common.component.Lifecycle;
|
||||
@ -30,7 +30,7 @@ import org.elasticsearch.indices.breaker.NoneCircuitBreakerService;
|
||||
import org.elasticsearch.test.ESTestCase;
|
||||
import org.elasticsearch.threadpool.TestThreadPool;
|
||||
import org.elasticsearch.threadpool.ThreadPool;
|
||||
import org.elasticsearch.transport.SharedGroupFactory;
|
||||
import org.opensearch.transport.SharedGroupFactory;
|
||||
import org.elasticsearch.transport.TcpTransport;
|
||||
import org.elasticsearch.transport.TransportSettings;
|
||||
import org.junit.Before;
|
@ -17,7 +17,7 @@
|
||||
* under the License.
|
||||
*/
|
||||
|
||||
package org.elasticsearch.transport.netty4;
|
||||
package org.opensearch.transport.netty4;
|
||||
|
||||
import org.elasticsearch.Version;
|
||||
import org.elasticsearch.action.ActionListener;
|
||||
@ -37,8 +37,8 @@ import org.elasticsearch.test.transport.StubbableTransport;
|
||||
import org.elasticsearch.transport.AbstractSimpleTransportTestCase;
|
||||
import org.elasticsearch.transport.ConnectTransportException;
|
||||
import org.elasticsearch.transport.ConnectionProfile;
|
||||
import org.elasticsearch.transport.Netty4NioSocketChannel;
|
||||
import org.elasticsearch.transport.SharedGroupFactory;
|
||||
import org.opensearch.transport.Netty4NioSocketChannel;
|
||||
import org.opensearch.transport.SharedGroupFactory;
|
||||
import org.elasticsearch.transport.TcpChannel;
|
||||
import org.elasticsearch.transport.TcpTransport;
|
||||
import org.elasticsearch.transport.TestProfiles;
|
@ -17,7 +17,7 @@
|
||||
* under the License.
|
||||
*/
|
||||
|
||||
package org.elasticsearch.http.netty4;
|
||||
package org.opensearch.http.netty4;
|
||||
|
||||
import com.carrotsearch.randomizedtesting.annotations.Name;
|
||||
import com.carrotsearch.randomizedtesting.annotations.ParametersFactory;
|
Loading…
x
Reference in New Issue
Block a user