From 22538e93005c4b4d960e2f7a68c8b62fff826ffc Mon Sep 17 00:00:00 2001 From: Lari Hotari Date: Fri, 25 Nov 2022 20:10:08 +0200 Subject: [PATCH 1/3] [improve][misc] Upgrade Netty to 4.1.86.Final and Netty Tcnative to 2.0.54.Final --- buildtools/pom.xml | 2 +- .../server/src/assemble/LICENSE.bin.txt | 56 +++++++++---------- pom.xml | 2 +- pulsar-sql/presto-distribution/LICENSE | 54 +++++++++--------- ...owasp-dependency-check-false-positives.xml | 2 +- 5 files changed, 58 insertions(+), 58 deletions(-) diff --git a/buildtools/pom.xml b/buildtools/pom.xml index 07f70b4078fd1..20765ae6618d8 100644 --- a/buildtools/pom.xml +++ b/buildtools/pom.xml @@ -47,7 +47,7 @@ 3.4.0 8.37 3.1.2 - 4.1.77.Final + 4.1.86.Final 4.2.3 31.0.1-jre 1.10.12 diff --git a/distribution/server/src/assemble/LICENSE.bin.txt b/distribution/server/src/assemble/LICENSE.bin.txt index ea78694f8b89d..405fa1ecfe8e9 100644 --- a/distribution/server/src/assemble/LICENSE.bin.txt +++ b/distribution/server/src/assemble/LICENSE.bin.txt @@ -286,34 +286,34 @@ The Apache Software License, Version 2.0 - org.apache.commons-commons-lang3-3.11.jar - org.apache.commons-commons-text-1.10.0.jar * Netty - - io.netty-netty-buffer-4.1.77.Final.jar - - io.netty-netty-codec-4.1.77.Final.jar - - io.netty-netty-codec-dns-4.1.77.Final.jar - - io.netty-netty-codec-http-4.1.77.Final.jar - - io.netty-netty-codec-http2-4.1.77.Final.jar - - io.netty-netty-codec-socks-4.1.77.Final.jar - - io.netty-netty-codec-haproxy-4.1.77.Final.jar - - io.netty-netty-common-4.1.77.Final.jar - - io.netty-netty-handler-4.1.77.Final.jar - - io.netty-netty-handler-proxy-4.1.77.Final.jar - - io.netty-netty-resolver-4.1.77.Final.jar - - io.netty-netty-resolver-dns-4.1.77.Final.jar - - io.netty-netty-resolver-dns-classes-macos-4.1.77.Final.jar - - io.netty-netty-resolver-dns-native-macos-4.1.77.Final-osx-aarch_64.jar - - io.netty-netty-resolver-dns-native-macos-4.1.77.Final-osx-x86_64.jar - - io.netty-netty-transport-4.1.77.Final.jar - - io.netty-netty-transport-classes-epoll-4.1.77.Final.jar - - io.netty-netty-transport-native-epoll-4.1.77.Final-linux-x86_64.jar - - io.netty-netty-transport-native-epoll-4.1.77.Final.jar - - io.netty-netty-transport-native-unix-common-4.1.77.Final.jar - - io.netty-netty-transport-native-unix-common-4.1.77.Final-linux-x86_64.jar - - io.netty-netty-tcnative-boringssl-static-2.0.52.Final.jar - - io.netty-netty-tcnative-boringssl-static-2.0.52.Final-linux-aarch_64.jar - - io.netty-netty-tcnative-boringssl-static-2.0.52.Final-linux-x86_64.jar - - io.netty-netty-tcnative-boringssl-static-2.0.52.Final-osx-aarch_64.jar - - io.netty-netty-tcnative-boringssl-static-2.0.52.Final-osx-x86_64.jar - - io.netty-netty-tcnative-boringssl-static-2.0.52.Final-windows-x86_64.jar - - io.netty-netty-tcnative-classes-2.0.52.Final.jar + - io.netty-netty-buffer-4.1.86.Final.jar + - io.netty-netty-codec-4.1.86.Final.jar + - io.netty-netty-codec-dns-4.1.86.Final.jar + - io.netty-netty-codec-http-4.1.86.Final.jar + - io.netty-netty-codec-http2-4.1.86.Final.jar + - io.netty-netty-codec-socks-4.1.86.Final.jar + - io.netty-netty-codec-haproxy-4.1.86.Final.jar + - io.netty-netty-common-4.1.86.Final.jar + - io.netty-netty-handler-4.1.86.Final.jar + - io.netty-netty-handler-proxy-4.1.86.Final.jar + - io.netty-netty-resolver-4.1.86.Final.jar + - io.netty-netty-resolver-dns-4.1.86.Final.jar + - io.netty-netty-resolver-dns-classes-macos-4.1.86.Final.jar + - io.netty-netty-resolver-dns-native-macos-4.1.86.Final-osx-aarch_64.jar + - io.netty-netty-resolver-dns-native-macos-4.1.86.Final-osx-x86_64.jar + - io.netty-netty-transport-4.1.86.Final.jar + - io.netty-netty-transport-classes-epoll-4.1.86.Final.jar + - io.netty-netty-transport-native-epoll-4.1.86.Final-linux-x86_64.jar + - io.netty-netty-transport-native-epoll-4.1.86.Final.jar + - io.netty-netty-transport-native-unix-common-4.1.86.Final.jar + - io.netty-netty-transport-native-unix-common-4.1.86.Final-linux-x86_64.jar + - io.netty-netty-tcnative-boringssl-static-2.0.54.Final.jar + - io.netty-netty-tcnative-boringssl-static-2.0.54.Final-linux-aarch_64.jar + - io.netty-netty-tcnative-boringssl-static-2.0.54.Final-linux-x86_64.jar + - io.netty-netty-tcnative-boringssl-static-2.0.54.Final-osx-aarch_64.jar + - io.netty-netty-tcnative-boringssl-static-2.0.54.Final-osx-x86_64.jar + - io.netty-netty-tcnative-boringssl-static-2.0.54.Final-windows-x86_64.jar + - io.netty-netty-tcnative-classes-2.0.54.Final.jar - io.netty.incubator-netty-incubator-transport-classes-io_uring-0.0.15.Final.jar - io.netty.incubator-netty-incubator-transport-native-io_uring-0.0.15.Final-linux-x86_64.jar - io.netty.incubator-netty-incubator-transport-native-io_uring-0.0.15.Final-linux-aarch_64.jar diff --git a/pom.xml b/pom.xml index 7b1da248bf848..44b6da046bcf6 100644 --- a/pom.xml +++ b/pom.xml @@ -126,7 +126,7 @@ flexible messaging model and an intuitive client API. 1.1.8.4 4.1.12.1 5.1.0 - 4.1.77.Final + 4.1.86.Final 0.0.15.Final 9.4.48.v20220622 2.5.2 diff --git a/pulsar-sql/presto-distribution/LICENSE b/pulsar-sql/presto-distribution/LICENSE index 27b127e8f3ab3..ce7b70b1ae95b 100644 --- a/pulsar-sql/presto-distribution/LICENSE +++ b/pulsar-sql/presto-distribution/LICENSE @@ -231,34 +231,34 @@ The Apache Software License, Version 2.0 - commons-compress-1.21.jar - commons-lang3-3.11.jar * Netty - - netty-buffer-4.1.77.Final.jar - - netty-codec-4.1.77.Final.jar - - netty-codec-dns-4.1.77.Final.jar - - netty-codec-http-4.1.77.Final.jar - - netty-codec-haproxy-4.1.77.Final.jar - - netty-codec-socks-4.1.77.Final.jar - - netty-handler-proxy-4.1.77.Final.jar - - netty-common-4.1.77.Final.jar - - netty-handler-4.1.77.Final.jar + - netty-buffer-4.1.86.Final.jar + - netty-codec-4.1.86.Final.jar + - netty-codec-dns-4.1.86.Final.jar + - netty-codec-http-4.1.86.Final.jar + - netty-codec-haproxy-4.1.86.Final.jar + - netty-codec-socks-4.1.86.Final.jar + - netty-handler-proxy-4.1.86.Final.jar + - netty-common-4.1.86.Final.jar + - netty-handler-4.1.86.Final.jar - netty-reactive-streams-2.0.6.jar - - netty-resolver-4.1.77.Final.jar - - netty-resolver-dns-4.1.77.Final.jar - - netty-resolver-dns-classes-macos-4.1.77.Final.jar - - netty-resolver-dns-native-macos-4.1.77.Final-osx-aarch_64.jar - - netty-resolver-dns-native-macos-4.1.77.Final-osx-x86_64.jar - - netty-tcnative-boringssl-static-2.0.52.Final.jar - - netty-tcnative-boringssl-static-2.0.52.Final-linux-aarch_64.jar - - netty-tcnative-boringssl-static-2.0.52.Final-linux-x86_64.jar - - netty-tcnative-boringssl-static-2.0.52.Final-osx-aarch_64.jar - - netty-tcnative-boringssl-static-2.0.52.Final-osx-x86_64.jar - - netty-tcnative-boringssl-static-2.0.52.Final-windows-x86_64.jar - - netty-tcnative-classes-2.0.52.Final.jar - - netty-transport-4.1.77.Final.jar - - netty-transport-classes-epoll-4.1.77.Final.jar - - netty-transport-native-epoll-4.1.77.Final-linux-x86_64.jar - - netty-transport-native-unix-common-4.1.77.Final.jar - - netty-transport-native-unix-common-4.1.77.Final-linux-x86_64.jar - - netty-codec-http2-4.1.77.Final.jar + - netty-resolver-4.1.86.Final.jar + - netty-resolver-dns-4.1.86.Final.jar + - netty-resolver-dns-classes-macos-4.1.86.Final.jar + - netty-resolver-dns-native-macos-4.1.86.Final-osx-aarch_64.jar + - netty-resolver-dns-native-macos-4.1.86.Final-osx-x86_64.jar + - netty-tcnative-boringssl-static-2.0.54.Final.jar + - netty-tcnative-boringssl-static-2.0.54.Final-linux-aarch_64.jar + - netty-tcnative-boringssl-static-2.0.54.Final-linux-x86_64.jar + - netty-tcnative-boringssl-static-2.0.54.Final-osx-aarch_64.jar + - netty-tcnative-boringssl-static-2.0.54.Final-osx-x86_64.jar + - netty-tcnative-boringssl-static-2.0.54.Final-windows-x86_64.jar + - netty-tcnative-classes-2.0.54.Final.jar + - netty-transport-4.1.86.Final.jar + - netty-transport-classes-epoll-4.1.86.Final.jar + - netty-transport-native-epoll-4.1.86.Final-linux-x86_64.jar + - netty-transport-native-unix-common-4.1.86.Final.jar + - netty-transport-native-unix-common-4.1.86.Final-linux-x86_64.jar + - netty-codec-http2-4.1.86.Final.jar - netty-incubator-transport-classes-io_uring-0.0.15.Final.jar - netty-incubator-transport-native-io_uring-0.0.15.Final-linux-x86_64.jar - netty-incubator-transport-native-io_uring-0.0.15.Final-linux-aarch_64.jar diff --git a/src/owasp-dependency-check-false-positives.xml b/src/owasp-dependency-check-false-positives.xml index e69afb31a6864..0a6e49de6675a 100644 --- a/src/owasp-dependency-check-false-positives.xml +++ b/src/owasp-dependency-check-false-positives.xml @@ -56,7 +56,7 @@ ^pkg:maven/io\.netty/netty\-tcnative\-boringssl\-static@.*$ cpe:/a:chromium_project:chromium From 7ec37f5562e12493f452955b071d6eba70bf0cb9 Mon Sep 17 00:00:00 2001 From: Lari Hotari Date: Thu, 24 Nov 2022 12:16:24 +0200 Subject: [PATCH 2/3] Upgrade netty-iouring version to one that is compatible --- distribution/server/src/assemble/LICENSE.bin.txt | 6 +++--- pom.xml | 2 +- pulsar-sql/presto-distribution/LICENSE | 6 +++--- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/distribution/server/src/assemble/LICENSE.bin.txt b/distribution/server/src/assemble/LICENSE.bin.txt index 405fa1ecfe8e9..9781fdf76da2e 100644 --- a/distribution/server/src/assemble/LICENSE.bin.txt +++ b/distribution/server/src/assemble/LICENSE.bin.txt @@ -314,9 +314,9 @@ The Apache Software License, Version 2.0 - io.netty-netty-tcnative-boringssl-static-2.0.54.Final-osx-x86_64.jar - io.netty-netty-tcnative-boringssl-static-2.0.54.Final-windows-x86_64.jar - io.netty-netty-tcnative-classes-2.0.54.Final.jar - - io.netty.incubator-netty-incubator-transport-classes-io_uring-0.0.15.Final.jar - - io.netty.incubator-netty-incubator-transport-native-io_uring-0.0.15.Final-linux-x86_64.jar - - io.netty.incubator-netty-incubator-transport-native-io_uring-0.0.15.Final-linux-aarch_64.jar + - io.netty.incubator-netty-incubator-transport-classes-io_uring-0.0.16.Final.jar + - io.netty.incubator-netty-incubator-transport-native-io_uring-0.0.16.Final-linux-x86_64.jar + - io.netty.incubator-netty-incubator-transport-native-io_uring-0.0.16.Final-linux-aarch_64.jar * Prometheus client - io.prometheus.jmx-collector-0.16.1.jar - io.prometheus-simpleclient-0.16.0.jar diff --git a/pom.xml b/pom.xml index 44b6da046bcf6..02a421225d141 100644 --- a/pom.xml +++ b/pom.xml @@ -127,7 +127,7 @@ flexible messaging model and an intuitive client API. 4.1.12.1 5.1.0 4.1.86.Final - 0.0.15.Final + 0.0.16.Final 9.4.48.v20220622 2.5.2 2.34 diff --git a/pulsar-sql/presto-distribution/LICENSE b/pulsar-sql/presto-distribution/LICENSE index ce7b70b1ae95b..1ef8f0ba131ca 100644 --- a/pulsar-sql/presto-distribution/LICENSE +++ b/pulsar-sql/presto-distribution/LICENSE @@ -259,9 +259,9 @@ The Apache Software License, Version 2.0 - netty-transport-native-unix-common-4.1.86.Final.jar - netty-transport-native-unix-common-4.1.86.Final-linux-x86_64.jar - netty-codec-http2-4.1.86.Final.jar - - netty-incubator-transport-classes-io_uring-0.0.15.Final.jar - - netty-incubator-transport-native-io_uring-0.0.15.Final-linux-x86_64.jar - - netty-incubator-transport-native-io_uring-0.0.15.Final-linux-aarch_64.jar + - netty-incubator-transport-classes-io_uring-0.0.16.Final.jar + - netty-incubator-transport-native-io_uring-0.0.16.Final-linux-x86_64.jar + - netty-incubator-transport-native-io_uring-0.0.16.Final-linux-aarch_64.jar * GRPC - grpc-api-1.45.1.jar - grpc-context-1.45.1.jar From 2223362b898ad03687cd40fd79eaad6eaa4e7cb9 Mon Sep 17 00:00:00 2001 From: Lari Hotari Date: Thu, 24 Nov 2022 23:15:00 +0200 Subject: [PATCH 3/3] Remove extra read - enabling auto read will trigger a read --- .../main/java/org/apache/pulsar/broker/service/ServerCnx.java | 2 -- 1 file changed, 2 deletions(-) diff --git a/pulsar-broker/src/main/java/org/apache/pulsar/broker/service/ServerCnx.java b/pulsar-broker/src/main/java/org/apache/pulsar/broker/service/ServerCnx.java index 15842f4598549..9e4304ff6e868 100644 --- a/pulsar-broker/src/main/java/org/apache/pulsar/broker/service/ServerCnx.java +++ b/pulsar-broker/src/main/java/org/apache/pulsar/broker/service/ServerCnx.java @@ -2867,8 +2867,6 @@ public void enableCnxAutoRead() { && !autoReadDisabledRateLimiting && !autoReadDisabledPublishBufferLimiting) { // Resume reading from socket if pending-request is not reached to threshold ctx.channel().config().setAutoRead(true); - // triggers channel read - ctx.read(); throttledConnections.dec(); } }