Upgrade to Netty 4.1.43 (elastic#48484)

With this update we can remove the mitigation in our custom allocator which forces heap buffer allocations.
Tim-Brooks · Oct 26, 2019 · 1615cb5 · 1615cb5
1 parent 87b245b
commit 1615cb5
Show file tree

Hide file tree

Showing 30 changed files with 18 additions and 31 deletions.
diff --git a/buildSrc/version.properties b/buildSrc/version.properties
@@ -21,7 +21,7 @@ slf4j             = 1.6.2
 # when updating the JNA version, also update the version in buildSrc/build.gradle
 jna               = 4.5.1
 
-netty             = 4.1.42.Final
+netty             = 4.1.43.Final
 joda              = 2.10.3
 
 # when updating this version, you need to ensure compatibility with:

diff --git a/modules/transport-netty4/licenses/netty-buffer-4.1.42.Final.jar.sha1 b/modules/transport-netty4/licenses/netty-buffer-4.1.42.Final.jar.sha1
diff --git a/modules/transport-netty4/licenses/netty-buffer-4.1.43.Final.jar.sha1 b/modules/transport-netty4/licenses/netty-buffer-4.1.43.Final.jar.sha1
@@ -0,0 +1 @@
+c0d142260a32709523e3bcf0d015b193f2ff2df4
diff --git a/modules/transport-netty4/licenses/netty-codec-4.1.42.Final.jar.sha1 b/modules/transport-netty4/licenses/netty-codec-4.1.42.Final.jar.sha1
diff --git a/modules/transport-netty4/licenses/netty-codec-4.1.43.Final.jar.sha1 b/modules/transport-netty4/licenses/netty-codec-4.1.43.Final.jar.sha1
@@ -0,0 +1 @@
+44731a5739c40a8434c43e1303e9196f23da67fa
diff --git a/modules/transport-netty4/licenses/netty-codec-http-4.1.42.Final.jar.sha1 b/modules/transport-netty4/licenses/netty-codec-http-4.1.42.Final.jar.sha1
diff --git a/modules/transport-netty4/licenses/netty-codec-http-4.1.43.Final.jar.sha1 b/modules/transport-netty4/licenses/netty-codec-http-4.1.43.Final.jar.sha1
@@ -0,0 +1 @@
+07320f9db621dc51b79807a4e5094665f260432c
diff --git a/modules/transport-netty4/licenses/netty-common-4.1.42.Final.jar.sha1 b/modules/transport-netty4/licenses/netty-common-4.1.42.Final.jar.sha1
diff --git a/modules/transport-netty4/licenses/netty-common-4.1.43.Final.jar.sha1 b/modules/transport-netty4/licenses/netty-common-4.1.43.Final.jar.sha1
@@ -0,0 +1 @@
+ccb6f627ded1bb2671a66a84506174d240c7bec8
diff --git a/modules/transport-netty4/licenses/netty-handler-4.1.42.Final.jar.sha1 b/modules/transport-netty4/licenses/netty-handler-4.1.42.Final.jar.sha1
diff --git a/modules/transport-netty4/licenses/netty-handler-4.1.43.Final.jar.sha1 b/modules/transport-netty4/licenses/netty-handler-4.1.43.Final.jar.sha1
@@ -0,0 +1 @@
+f83ac0492d44057d07ec6d40cf79e8e2de949836
diff --git a/modules/transport-netty4/licenses/netty-resolver-4.1.42.Final.jar.sha1 b/modules/transport-netty4/licenses/netty-resolver-4.1.42.Final.jar.sha1
diff --git a/modules/transport-netty4/licenses/netty-resolver-4.1.43.Final.jar.sha1 b/modules/transport-netty4/licenses/netty-resolver-4.1.43.Final.jar.sha1
@@ -0,0 +1 @@
+94ae5a7e595fdc29dac254014e3159d3572d7e44
diff --git a/modules/transport-netty4/licenses/netty-transport-4.1.42.Final.jar.sha1 b/modules/transport-netty4/licenses/netty-transport-4.1.42.Final.jar.sha1
diff --git a/modules/transport-netty4/licenses/netty-transport-4.1.43.Final.jar.sha1 b/modules/transport-netty4/licenses/netty-transport-4.1.43.Final.jar.sha1
@@ -0,0 +1 @@
+781cd7cfc1118bdfe1538f39cc1f4d07d6254094
diff --git a/modules/transport-netty4/src/main/java/org/elasticsearch/transport/NettyAllocator.java b/modules/transport-netty4/src/main/java/org/elasticsearch/transport/NettyAllocator.java
@@ -60,10 +60,6 @@ public class NettyAllocator {
         }
     }
 
-    public static boolean useCopySocket() {
-        return ALLOCATOR instanceof NoDirectBuffers;
-    }
-
     public static ByteBufAllocator getAllocator() {
         return ALLOCATOR;
     }
@@ -148,26 +144,17 @@ public ByteBuf heapBuffer(int initialCapacity, int maxCapacity) {
 
         @Override
         public ByteBuf directBuffer() {
-            // TODO: Currently the Netty SslHandler requests direct ByteBufs even when interacting with the
-            //  JDK SSLEngine. This will be fixed in a future version of Netty. For now, return a heap
-            //  ByteBuf. After a Netty upgrade, return to throwing UnsupportedOperationException
-            return heapBuffer();
+            throw new UnsupportedOperationException("Direct buffers not supported");
         }
 
         @Override
         public ByteBuf directBuffer(int initialCapacity) {
-            // TODO: Currently the Netty SslHandler requests direct ByteBufs even when interacting with the
-            //  JDK SSLEngine. This will be fixed in a future version of Netty. For now, return a heap
-            //  ByteBuf. After a Netty upgrade, return to throwing UnsupportedOperationException
-            return heapBuffer(initialCapacity);
+            throw new UnsupportedOperationException("Direct buffers not supported");
         }
 
         @Override
         public ByteBuf directBuffer(int initialCapacity, int maxCapacity) {
-            // TODO: Currently the Netty SslHandler requests direct ByteBufs even when interacting with the
-            //  JDK SSLEngine. This will be fixed in a future version of Netty. For now, return a heap
-            //  ByteBuf. After a Netty upgrade, return to throwing UnsupportedOperationException
-            return heapBuffer(initialCapacity, maxCapacity);
+            throw new UnsupportedOperationException("Direct buffers not supported");
         }
 
         @Override

diff --git a/plugins/transport-nio/licenses/netty-buffer-4.1.42.Final.jar.sha1 b/plugins/transport-nio/licenses/netty-buffer-4.1.42.Final.jar.sha1
diff --git a/plugins/transport-nio/licenses/netty-buffer-4.1.43.Final.jar.sha1 b/plugins/transport-nio/licenses/netty-buffer-4.1.43.Final.jar.sha1
@@ -0,0 +1 @@
+c0d142260a32709523e3bcf0d015b193f2ff2df4
diff --git a/plugins/transport-nio/licenses/netty-codec-4.1.42.Final.jar.sha1 b/plugins/transport-nio/licenses/netty-codec-4.1.42.Final.jar.sha1
diff --git a/plugins/transport-nio/licenses/netty-codec-4.1.43.Final.jar.sha1 b/plugins/transport-nio/licenses/netty-codec-4.1.43.Final.jar.sha1
@@ -0,0 +1 @@
+44731a5739c40a8434c43e1303e9196f23da67fa
diff --git a/plugins/transport-nio/licenses/netty-codec-http-4.1.42.Final.jar.sha1 b/plugins/transport-nio/licenses/netty-codec-http-4.1.42.Final.jar.sha1
diff --git a/plugins/transport-nio/licenses/netty-codec-http-4.1.43.Final.jar.sha1 b/plugins/transport-nio/licenses/netty-codec-http-4.1.43.Final.jar.sha1
@@ -0,0 +1 @@
+07320f9db621dc51b79807a4e5094665f260432c
diff --git a/plugins/transport-nio/licenses/netty-common-4.1.42.Final.jar.sha1 b/plugins/transport-nio/licenses/netty-common-4.1.42.Final.jar.sha1
diff --git a/plugins/transport-nio/licenses/netty-common-4.1.43.Final.jar.sha1 b/plugins/transport-nio/licenses/netty-common-4.1.43.Final.jar.sha1
@@ -0,0 +1 @@
+ccb6f627ded1bb2671a66a84506174d240c7bec8
diff --git a/plugins/transport-nio/licenses/netty-handler-4.1.42.Final.jar.sha1 b/plugins/transport-nio/licenses/netty-handler-4.1.42.Final.jar.sha1
diff --git a/plugins/transport-nio/licenses/netty-handler-4.1.43.Final.jar.sha1 b/plugins/transport-nio/licenses/netty-handler-4.1.43.Final.jar.sha1
@@ -0,0 +1 @@
+f83ac0492d44057d07ec6d40cf79e8e2de949836
diff --git a/plugins/transport-nio/licenses/netty-resolver-4.1.42.Final.jar.sha1 b/plugins/transport-nio/licenses/netty-resolver-4.1.42.Final.jar.sha1
diff --git a/plugins/transport-nio/licenses/netty-resolver-4.1.43.Final.jar.sha1 b/plugins/transport-nio/licenses/netty-resolver-4.1.43.Final.jar.sha1
@@ -0,0 +1 @@
+94ae5a7e595fdc29dac254014e3159d3572d7e44
diff --git a/plugins/transport-nio/licenses/netty-transport-4.1.42.Final.jar.sha1 b/plugins/transport-nio/licenses/netty-transport-4.1.42.Final.jar.sha1
diff --git a/plugins/transport-nio/licenses/netty-transport-4.1.43.Final.jar.sha1 b/plugins/transport-nio/licenses/netty-transport-4.1.43.Final.jar.sha1
@@ -0,0 +1 @@
+781cd7cfc1118bdfe1538f39cc1f4d07d6254094