honeymoose
/
OpenSearch
mirror of https://github.com/honeymoose/OpenSearch.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Rename Netty TCP transports thread factories from http_* to transport_* 

Netty3/4 TcpTransport implementations are creating thread factories with a "http_server" thread prefix whereas it should start with "transport_server" and let the "http_server" prefix for the HttpServerTransport implementations.
This commit is contained in:
Tanguy Leroux 2016-08-29 12:07:22 +02:00
parent f070c8727b
commit 9727f123b9
7 changed files with 19 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
core/src/main/java/org/elasticsearch/http/HttpServerTransport.java
View File

@ -24,6 +24,9 @@ import org.elasticsearch.common.transport.BoundTransportAddress;
public interface HttpServerTransport extends LifecycleComponent { public interface HttpServerTransport extends LifecycleComponent {
String HTTP_SERVER_WORKER_THREAD_NAME_PREFIX = "http_server_worker";
String HTTP_SERVER_BOSS_THREAD_NAME_PREFIX = "http_server_boss";
BoundTransportAddress boundAddress(); BoundTransportAddress boundAddress();
HttpInfo info(); HttpInfo info();

4
core/src/main/java/org/elasticsearch/transport/TcpTransport.java
View File

@ -106,8 +106,8 @@ import static org.elasticsearch.common.util.concurrent.ConcurrentCollections.new
public abstract class TcpTransport<Channel> extends AbstractLifecycleComponent implements Transport { public abstract class TcpTransport<Channel> extends AbstractLifecycleComponent implements Transport {
public static final String HTTP_SERVER_WORKER_THREAD_NAME_PREFIX = "http_server_worker"; public static final String TRANSPORT_SERVER_WORKER_THREAD_NAME_PREFIX = "transport_server_worker";
public static final String HTTP_SERVER_BOSS_THREAD_NAME_PREFIX = "http_server_boss"; public static final String TRANSPORT_SERVER_BOSS_THREAD_NAME_PREFIX = "transport_server_boss";
public static final String TRANSPORT_CLIENT_WORKER_THREAD_NAME_PREFIX = "transport_client_worker"; public static final String TRANSPORT_CLIENT_WORKER_THREAD_NAME_PREFIX = "transport_client_worker";
public static final String TRANSPORT_CLIENT_BOSS_THREAD_NAME_PREFIX = "transport_client_boss"; public static final String TRANSPORT_CLIENT_BOSS_THREAD_NAME_PREFIX = "transport_client_boss";

7
core/src/main/java/org/elasticsearch/transport/Transports.java
View File

@ -19,6 +19,7 @@
package org.elasticsearch.transport; package org.elasticsearch.transport;
import org.elasticsearch.http.HttpServerTransport;
import org.elasticsearch.transport.local.LocalTransport; import org.elasticsearch.transport.local.LocalTransport;
import java.util.Arrays; import java.util.Arrays;
@ -38,8 +39,10 @@ public enum Transports {
final String threadName = t.getName(); final String threadName = t.getName();
for (String s : Arrays.asList( for (String s : Arrays.asList(
LocalTransport.LOCAL_TRANSPORT_THREAD_NAME_PREFIX, LocalTransport.LOCAL_TRANSPORT_THREAD_NAME_PREFIX,
TcpTransport.HTTP_SERVER_BOSS_THREAD_NAME_PREFIX, HttpServerTransport.HTTP_SERVER_BOSS_THREAD_NAME_PREFIX,
TcpTransport.HTTP_SERVER_WORKER_THREAD_NAME_PREFIX, HttpServerTransport.HTTP_SERVER_WORKER_THREAD_NAME_PREFIX,
TcpTransport.TRANSPORT_SERVER_BOSS_THREAD_NAME_PREFIX,
TcpTransport.TRANSPORT_SERVER_WORKER_THREAD_NAME_PREFIX,
TcpTransport.TRANSPORT_CLIENT_WORKER_THREAD_NAME_PREFIX, TcpTransport.TRANSPORT_CLIENT_WORKER_THREAD_NAME_PREFIX,
TcpTransport.TRANSPORT_CLIENT_BOSS_THREAD_NAME_PREFIX, TcpTransport.TRANSPORT_CLIENT_BOSS_THREAD_NAME_PREFIX,
TEST_MOCK_TRANSPORT_THREAD_PREFIX)) { TEST_MOCK_TRANSPORT_THREAD_PREFIX)) {

8
modules/transport-netty3/src/main/java/org/elasticsearch/http/netty3/Netty3HttpServerTransport.java
View File

@ -285,13 +285,13 @@ public class Netty3HttpServerTransport extends AbstractLifecycleComponent implem
this.serverOpenChannels = new Netty3OpenChannelsHandler(logger); this.serverOpenChannels = new Netty3OpenChannelsHandler(logger);
if (blockingServer) { if (blockingServer) {
serverBootstrap = new ServerBootstrap(new OioServerSocketChannelFactory( serverBootstrap = new ServerBootstrap(new OioServerSocketChannelFactory(
Executors.newCachedThreadPool(daemonThreadFactory(settings, "http_server_boss")), Executors.newCachedThreadPool(daemonThreadFactory(settings, HTTP_SERVER_BOSS_THREAD_NAME_PREFIX)),
Executors.newCachedThreadPool(daemonThreadFactory(settings, "http_server_worker")) Executors.newCachedThreadPool(daemonThreadFactory(settings, HTTP_SERVER_WORKER_THREAD_NAME_PREFIX))
)); ));
} else { } else {
serverBootstrap = new ServerBootstrap(new NioServerSocketChannelFactory( serverBootstrap = new ServerBootstrap(new NioServerSocketChannelFactory(
Executors.newCachedThreadPool(daemonThreadFactory(settings, "http_server_boss")), Executors.newCachedThreadPool(daemonThreadFactory(settings, HTTP_SERVER_BOSS_THREAD_NAME_PREFIX)),
Executors.newCachedThreadPool(daemonThreadFactory(settings, "http_server_worker")), Executors.newCachedThreadPool(daemonThreadFactory(settings, HTTP_SERVER_WORKER_THREAD_NAME_PREFIX)),
workerCount)); workerCount));
} }
serverBootstrap.setPipelineFactory(configureServerChannelPipelineFactory()); serverBootstrap.setPipelineFactory(configureServerChannelPipelineFactory());

4
modules/transport-netty3/src/main/java/org/elasticsearch/transport/netty3/Netty3Transport.java
View File

@ -286,8 +286,8 @@ public class Netty3Transport extends TcpTransport<Channel> {
receivePredictorMax); receivePredictorMax);
} }
final ThreadFactory bossFactory = daemonThreadFactory(this.settings, HTTP_SERVER_BOSS_THREAD_NAME_PREFIX, name); final ThreadFactory bossFactory = daemonThreadFactory(this.settings, TRANSPORT_SERVER_BOSS_THREAD_NAME_PREFIX, name);
final ThreadFactory workerFactory = daemonThreadFactory(this.settings, HTTP_SERVER_WORKER_THREAD_NAME_PREFIX, name); final ThreadFactory workerFactory = daemonThreadFactory(this.settings, TRANSPORT_SERVER_WORKER_THREAD_NAME_PREFIX, name);
final ServerBootstrap serverBootstrap; final ServerBootstrap serverBootstrap;
if (blockingServer) { if (blockingServer) {
serverBootstrap = new ServerBootstrap(new OioServerSocketChannelFactory( serverBootstrap = new ServerBootstrap(new OioServerSocketChannelFactory(

4
modules/transport-netty4/src/main/java/org/elasticsearch/http/netty4/Netty4HttpServerTransport.java
View File

@ -290,10 +290,10 @@ public class Netty4HttpServerTransport extends AbstractLifecycleComponent implem
serverBootstrap = new ServerBootstrap(); serverBootstrap = new ServerBootstrap();
if (blockingServer) { if (blockingServer) {
serverBootstrap.group(new OioEventLoopGroup(workerCount, daemonThreadFactory(settings, "http_server_worker"))); serverBootstrap.group(new OioEventLoopGroup(workerCount, daemonThreadFactory(settings, HTTP_SERVER_WORKER_THREAD_NAME_PREFIX)));
serverBootstrap.channel(OioServerSocketChannel.class); serverBootstrap.channel(OioServerSocketChannel.class);
} else { } else {
serverBootstrap.group(new NioEventLoopGroup(workerCount, daemonThreadFactory(settings, "http_server_worker"))); serverBootstrap.group(new NioEventLoopGroup(workerCount, daemonThreadFactory(settings, HTTP_SERVER_WORKER_THREAD_NAME_PREFIX)));
serverBootstrap.channel(NioServerSocketChannel.class); serverBootstrap.channel(NioServerSocketChannel.class);
} }

2
modules/transport-netty4/src/main/java/org/elasticsearch/transport/netty4/Netty4Transport.java
View File

@ -272,7 +272,7 @@ public class Netty4Transport extends TcpTransport<Channel> {
connectionsPerNodePing, receivePredictorMin, receivePredictorMax); connectionsPerNodePing, receivePredictorMin, receivePredictorMax);
} }
final ThreadFactory workerFactory = daemonThreadFactory(this.settings, HTTP_SERVER_WORKER_THREAD_NAME_PREFIX, name); final ThreadFactory workerFactory = daemonThreadFactory(this.settings, TRANSPORT_SERVER_WORKER_THREAD_NAME_PREFIX, name);
final ServerBootstrap serverBootstrap = new ServerBootstrap(); final ServerBootstrap serverBootstrap = new ServerBootstrap();