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

Remove unregistered `transport.netty.*` settings (#25476) 

These settings have not be working for a full major version since they
are not registered. Given that they are simply duplicates we can just remove
them.
This commit is contained in:
Simon Willnauer 2017-06-29 20:56:18 +02:00 committed by GitHub
parent 6c58f0c4e6
commit 6f131a63d3
1 changed files with 5 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -219,23 +219,21 @@ public class Netty4Transport extends TcpTransport<Channel> {
fallbackSettingsBuilder.putArray("publish_host", fallbackPublishHost); fallbackSettingsBuilder.putArray("publish_host", fallbackPublishHost);
} }
boolean fallbackTcpNoDelay = settings.getAsBoolean("transport.netty.tcp_no_delay", TcpSettings.TCP_NO_DELAY.get(settings)); boolean fallbackTcpNoDelay = TcpSettings.TCP_NO_DELAY.get(settings);
fallbackSettingsBuilder.put("tcp_no_delay", fallbackTcpNoDelay); fallbackSettingsBuilder.put("tcp_no_delay", fallbackTcpNoDelay);
boolean fallbackTcpKeepAlive = settings.getAsBoolean("transport.netty.tcp_keep_alive", TcpSettings.TCP_KEEP_ALIVE.get(settings)); boolean fallbackTcpKeepAlive = TcpSettings.TCP_KEEP_ALIVE.get(settings);
fallbackSettingsBuilder.put("tcp_keep_alive", fallbackTcpKeepAlive); fallbackSettingsBuilder.put("tcp_keep_alive", fallbackTcpKeepAlive);
boolean fallbackReuseAddress = settings.getAsBoolean("transport.netty.reuse_address", TcpSettings.TCP_REUSE_ADDRESS.get(settings)); boolean fallbackReuseAddress = TcpSettings.TCP_REUSE_ADDRESS.get(settings);
fallbackSettingsBuilder.put("reuse_address", fallbackReuseAddress); fallbackSettingsBuilder.put("reuse_address", fallbackReuseAddress);
ByteSizeValue fallbackTcpSendBufferSize = settings.getAsBytesSize("transport.netty.tcp_send_buffer_size", ByteSizeValue fallbackTcpSendBufferSize = TCP_SEND_BUFFER_SIZE.get(settings);
TCP_SEND_BUFFER_SIZE.get(settings));
if (fallbackTcpSendBufferSize.getBytes() >= 0) { if (fallbackTcpSendBufferSize.getBytes() >= 0) {
fallbackSettingsBuilder.put("tcp_send_buffer_size", fallbackTcpSendBufferSize); fallbackSettingsBuilder.put("tcp_send_buffer_size", fallbackTcpSendBufferSize);
} }
ByteSizeValue fallbackTcpBufferSize = settings.getAsBytesSize("transport.netty.tcp_receive_buffer_size", ByteSizeValue fallbackTcpBufferSize = TCP_RECEIVE_BUFFER_SIZE.get(settings);
TCP_RECEIVE_BUFFER_SIZE.get(settings));
if (fallbackTcpBufferSize.getBytes() >= 0) { if (fallbackTcpBufferSize.getBytes() >= 0) {
fallbackSettingsBuilder.put("tcp_receive_buffer_size", fallbackTcpBufferSize); fallbackSettingsBuilder.put("tcp_receive_buffer_size", fallbackTcpBufferSize);
} }
@ -285,7 +283,6 @@ public class Netty4Transport extends TcpTransport<Channel> {
final boolean reuseAddress = TCP_REUSE_ADDRESS.get(settings); final boolean reuseAddress = TCP_REUSE_ADDRESS.get(settings);
serverBootstrap.option(ChannelOption.SO_REUSEADDR, reuseAddress); serverBootstrap.option(ChannelOption.SO_REUSEADDR, reuseAddress);
serverBootstrap.childOption(ChannelOption.SO_REUSEADDR, reuseAddress); serverBootstrap.childOption(ChannelOption.SO_REUSEADDR, reuseAddress);
serverBootstrap.validate(); serverBootstrap.validate();
serverBootstraps.put(name, serverBootstrap); serverBootstraps.put(name, serverBootstrap);