Skip to content

Commit 6f131a6

Browse files
authored
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.
1 parent 6c58f0c commit 6f131a6

File tree

1 file changed

+5
-8
lines changed

1 file changed

+5
-8
lines changed

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

Lines changed: 5 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -219,23 +219,21 @@ private Settings createFallbackSettings() {
219219
fallbackSettingsBuilder.putArray("publish_host", fallbackPublishHost);
220220
}
221221

222-
boolean fallbackTcpNoDelay = settings.getAsBoolean("transport.netty.tcp_no_delay", TcpSettings.TCP_NO_DELAY.get(settings));
222+
boolean fallbackTcpNoDelay = TcpSettings.TCP_NO_DELAY.get(settings);
223223
fallbackSettingsBuilder.put("tcp_no_delay", fallbackTcpNoDelay);
224224

225-
boolean fallbackTcpKeepAlive = settings.getAsBoolean("transport.netty.tcp_keep_alive", TcpSettings.TCP_KEEP_ALIVE.get(settings));
225+
boolean fallbackTcpKeepAlive = TcpSettings.TCP_KEEP_ALIVE.get(settings);
226226
fallbackSettingsBuilder.put("tcp_keep_alive", fallbackTcpKeepAlive);
227227

228-
boolean fallbackReuseAddress = settings.getAsBoolean("transport.netty.reuse_address", TcpSettings.TCP_REUSE_ADDRESS.get(settings));
228+
boolean fallbackReuseAddress = TcpSettings.TCP_REUSE_ADDRESS.get(settings);
229229
fallbackSettingsBuilder.put("reuse_address", fallbackReuseAddress);
230230

231-
ByteSizeValue fallbackTcpSendBufferSize = settings.getAsBytesSize("transport.netty.tcp_send_buffer_size",
232-
TCP_SEND_BUFFER_SIZE.get(settings));
231+
ByteSizeValue fallbackTcpSendBufferSize = TCP_SEND_BUFFER_SIZE.get(settings);
233232
if (fallbackTcpSendBufferSize.getBytes() >= 0) {
234233
fallbackSettingsBuilder.put("tcp_send_buffer_size", fallbackTcpSendBufferSize);
235234
}
236235

237-
ByteSizeValue fallbackTcpBufferSize = settings.getAsBytesSize("transport.netty.tcp_receive_buffer_size",
238-
TCP_RECEIVE_BUFFER_SIZE.get(settings));
236+
ByteSizeValue fallbackTcpBufferSize = TCP_RECEIVE_BUFFER_SIZE.get(settings);
239237
if (fallbackTcpBufferSize.getBytes() >= 0) {
240238
fallbackSettingsBuilder.put("tcp_receive_buffer_size", fallbackTcpBufferSize);
241239
}
@@ -285,7 +283,6 @@ private void createServerBootstrap(String name, Settings settings) {
285283
final boolean reuseAddress = TCP_REUSE_ADDRESS.get(settings);
286284
serverBootstrap.option(ChannelOption.SO_REUSEADDR, reuseAddress);
287285
serverBootstrap.childOption(ChannelOption.SO_REUSEADDR, reuseAddress);
288-
289286
serverBootstrap.validate();
290287

291288
serverBootstraps.put(name, serverBootstrap);

0 commit comments

Comments
 (0)