Consolidate network settings, common tcp settings, and generalized port settings, closes #174.

Author: kimchy

modules/elasticsearch/src/main/java/org/elasticsearch/http/netty/NettyHttpServerTransport.java

@@ -51,6 +51,7 @@
 import java.util.concurrent.atomic.AtomicReference;
 
 import static org.elasticsearch.util.concurrent.DynamicExecutors.*;
+import static org.elasticsearch.util.network.NetworkService.TcpSettings.*;
 
 /**
  * @author kimchy (shay.banon)
@@ -102,14 +103,14 @@ public class NettyHttpServerTransport extends AbstractLifecycleComponent<HttpSer
         this.networkService = networkService;
         SizeValue maxContentLength = componentSettings.getAsSize("max_content_length", new SizeValue(100, SizeUnit.MB));
         this.workerCount = componentSettings.getAsInt("worker_count", Runtime.getRuntime().availableProcessors());
-        this.port = componentSettings.get("port", "9200-9300");
+        this.port = componentSettings.get("port", settings.get("http.port", "9200-9300"));
         this.bindHost = componentSettings.get("bind_host");
         this.publishHost = componentSettings.get("publish_host");
-        this.tcpNoDelay = componentSettings.getAsBoolean("tcp_no_delay", true);
-        this.tcpKeepAlive = componentSettings.getAsBoolean("tcp_keep_alive", null);
-        this.reuseAddress = componentSettings.getAsBoolean("reuse_address", NetworkUtils.defaultReuseAddress());
-        this.tcpSendBufferSize = componentSettings.getAsSize("tcp_send_buffer_size", null);
-        this.tcpReceiveBufferSize = componentSettings.getAsSize("tcp_receive_buffer_size", null);
+        this.tcpNoDelay = componentSettings.getAsBoolean("tcp_no_delay", settings.getAsBoolean(TCP_NO_DELAY, true));
+        this.tcpKeepAlive = componentSettings.getAsBoolean("tcp_keep_alive", settings.getAsBoolean(TCP_KEEP_ALIVE, null));
+        this.reuseAddress = componentSettings.getAsBoolean("reuse_address", settings.getAsBoolean(TCP_REUSE_ADDRESS, NetworkUtils.defaultReuseAddress()));
+        this.tcpSendBufferSize = componentSettings.getAsSize("tcp_send_buffer_size", settings.getAsSize(TCP_SEND_BUFFER_SIZE, null));
+        this.tcpReceiveBufferSize = componentSettings.getAsSize("tcp_receive_buffer_size", settings.getAsSize(TCP_RECEIVE_BUFFER_SIZE, null));
 
         // validate max content length
         if (maxContentLength.bytes() > Integer.MAX_VALUE) {

modules/elasticsearch/src/main/java/org/elasticsearch/transport/netty/NettyTransport.java

@@ -69,6 +69,7 @@
 import static org.elasticsearch.util.collect.Lists.*;
 import static org.elasticsearch.util.concurrent.ConcurrentCollections.*;
 import static org.elasticsearch.util.concurrent.DynamicExecutors.*;
+import static org.elasticsearch.util.network.NetworkService.TcpSettings.*;
 import static org.elasticsearch.util.settings.ImmutableSettings.Builder.*;
 import static org.elasticsearch.util.transport.NetworkExceptionHelper.*;
 
@@ -141,16 +142,16 @@ public NettyTransport(Settings settings, ThreadPool threadPool) {
         this.networkService = networkService;
 
         this.workerCount = componentSettings.getAsInt("worker_count", Runtime.getRuntime().availableProcessors());
-        this.port = componentSettings.get("port", "9300-9400");
+        this.port = componentSettings.get("port", settings.get("transport.tcp.port", "9300-9400"));
         this.bindHost = componentSettings.get("bind_host");
         this.connectionsPerNode = componentSettings.getAsInt("connections_per_node", 5);
         this.publishHost = componentSettings.get("publish_host");
         this.connectTimeout = componentSettings.getAsTime("connect_timeout", timeValueSeconds(1));
-        this.tcpNoDelay = componentSettings.getAsBoolean("tcp_no_delay", true);
-        this.tcpKeepAlive = componentSettings.getAsBoolean("tcp_keep_alive", null);
-        this.reuseAddress = componentSettings.getAsBoolean("reuse_address", NetworkUtils.defaultReuseAddress());
-        this.tcpSendBufferSize = componentSettings.getAsSize("tcp_send_buffer_size", null);
-        this.tcpReceiveBufferSize = componentSettings.getAsSize("tcp_receive_buffer_size", null);
+        this.tcpNoDelay = componentSettings.getAsBoolean("tcp_no_delay", settings.getAsBoolean(TCP_NO_DELAY, true));
+        this.tcpKeepAlive = componentSettings.getAsBoolean("tcp_keep_alive", settings.getAsBoolean(TCP_KEEP_ALIVE, null));
+        this.reuseAddress = componentSettings.getAsBoolean("reuse_address", settings.getAsBoolean(TCP_REUSE_ADDRESS, NetworkUtils.defaultReuseAddress()));
+        this.tcpSendBufferSize = componentSettings.getAsSize("tcp_send_buffer_size", settings.getAsSize(TCP_SEND_BUFFER_SIZE, null));
+        this.tcpReceiveBufferSize = componentSettings.getAsSize("tcp_receive_buffer_size", settings.getAsSize(TCP_RECEIVE_BUFFER_SIZE, null));
     }
 
     public Settings settings() {

modules/elasticsearch/src/main/java/org/elasticsearch/util/network/NetworkService.java

@@ -42,6 +42,14 @@ public class NetworkService extends AbstractComponent {
     private static final String GLOBAL_NETWORK_BINDHOST_SETTING = "network.bind_host";
     private static final String GLOBAL_NETWORK_PUBLISHHOST_SETTING = "network.publish_host";
 
+    public static final class TcpSettings {
+        public static final String TCP_NO_DELAY = "network.tcp.no_delay";
+        public static final String TCP_KEEP_ALIVE = "network.tcp.keep_alive";
+        public static final String TCP_REUSE_ADDRESS = "network.tcp.reuse_address";
+        public static final String TCP_SEND_BUFFER_SIZE = "network.tcp.send_buffer_size";
+        public static final String TCP_RECEIVE_BUFFER_SIZE = "network.tcp.receive_buffer_size";
+    }
+
     public static interface CustomNameResolver {
         InetAddress resolve();
     }

plugins/transport/memcached/src/main/java/org/elasticsearch/memcached/netty/NettyMemcachedServerTransport.java

@@ -47,6 +47,7 @@
 import java.util.concurrent.atomic.AtomicReference;
 
 import static org.elasticsearch.util.concurrent.DynamicExecutors.*;
+import static org.elasticsearch.util.network.NetworkService.TcpSettings.*;
 
 /**
  * @author kimchy (shay.banon)
@@ -89,14 +90,14 @@ public class NettyMemcachedServerTransport extends AbstractLifecycleComponent<Me
         this.networkService = networkService;
 
         this.workerCount = componentSettings.getAsInt("worker_count", Runtime.getRuntime().availableProcessors());
-        this.port = componentSettings.get("port", "11211-11311");
+        this.port = componentSettings.get("port", settings.get("memcached.port", "11211-11311"));
         this.bindHost = componentSettings.get("bind_host");
         this.publishHost = componentSettings.get("publish_host");
-        this.tcpNoDelay = componentSettings.getAsBoolean("tcp_no_delay", true);
-        this.tcpKeepAlive = componentSettings.getAsBoolean("tcp_keep_alive", null);
-        this.reuseAddress = componentSettings.getAsBoolean("reuse_address", NetworkUtils.defaultReuseAddress());
-        this.tcpSendBufferSize = componentSettings.getAsSize("tcp_send_buffer_size", null);
-        this.tcpReceiveBufferSize = componentSettings.getAsSize("tcp_receive_buffer_size", null);
+        this.tcpNoDelay = componentSettings.getAsBoolean("tcp_no_delay", settings.getAsBoolean(TCP_NO_DELAY, true));
+        this.tcpKeepAlive = componentSettings.getAsBoolean("tcp_keep_alive", settings.getAsBoolean(TCP_KEEP_ALIVE, null));
+        this.reuseAddress = componentSettings.getAsBoolean("reuse_address", settings.getAsBoolean(TCP_REUSE_ADDRESS, NetworkUtils.defaultReuseAddress()));
+        this.tcpSendBufferSize = componentSettings.getAsSize("tcp_send_buffer_size", settings.getAsSize(TCP_SEND_BUFFER_SIZE, null));
+        this.tcpReceiveBufferSize = componentSettings.getAsSize("tcp_receive_buffer_size", settings.getAsSize(TCP_RECEIVE_BUFFER_SIZE, null));
     }
 
     @Override public BoundTransportAddress boundAddress() {