You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@pulsar.apache.org by lh...@apache.org on 2022/12/13 03:45:36 UTC
[pulsar] branch master updated: [improve][misc] Upgrade Netty to 4.1.86.Final and Netty Tcnative to 2.0.54.Final (#18599)
This is an automated email from the ASF dual-hosted git repository.
lhotari pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/pulsar.git
The following commit(s) were added to refs/heads/master by this push:
new 1cd20c51c2d [improve][misc] Upgrade Netty to 4.1.86.Final and Netty Tcnative to 2.0.54.Final (#18599)
1cd20c51c2d is described below
commit 1cd20c51c2d69c46e9de9a2870d7dc075fff9cc4
Author: Lari Hotari <lh...@users.noreply.github.com>
AuthorDate: Tue Dec 13 05:45:29 2022 +0200
[improve][misc] Upgrade Netty to 4.1.86.Final and Netty Tcnative to 2.0.54.Final (#18599)
---
buildtools/pom.xml | 2 +-
distribution/server/src/assemble/LICENSE.bin.txt | 62 +++++++++++-----------
pom.xml | 4 +-
.../apache/pulsar/broker/service/ServerCnx.java | 2 -
pulsar-sql/presto-distribution/LICENSE | 60 ++++++++++-----------
src/owasp-dependency-check-false-positives.xml | 2 +-
6 files changed, 65 insertions(+), 67 deletions(-)
diff --git a/buildtools/pom.xml b/buildtools/pom.xml
index 07f70b4078f..20765ae6618 100644
--- a/buildtools/pom.xml
+++ b/buildtools/pom.xml
@@ -47,7 +47,7 @@
<maven-shade-plugin.version>3.4.0</maven-shade-plugin.version>
<puppycrawl.checkstyle.version>8.37</puppycrawl.checkstyle.version>
<maven-checkstyle-plugin.version>3.1.2</maven-checkstyle-plugin.version>
- <netty.version>4.1.77.Final</netty.version>
+ <netty.version>4.1.86.Final</netty.version>
<guice.version>4.2.3</guice.version>
<guava.version>31.0.1-jre</guava.version>
<ant.version>1.10.12</ant.version>
diff --git a/distribution/server/src/assemble/LICENSE.bin.txt b/distribution/server/src/assemble/LICENSE.bin.txt
index ea78694f8b8..9781fdf76da 100644
--- a/distribution/server/src/assemble/LICENSE.bin.txt
+++ b/distribution/server/src/assemble/LICENSE.bin.txt
@@ -286,37 +286,37 @@ 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.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-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.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 7b1da248bf8..02a421225d1 100644
--- a/pom.xml
+++ b/pom.xml
@@ -126,8 +126,8 @@ flexible messaging model and an intuitive client API.</description>
<snappy.version>1.1.8.4</snappy.version> <!-- ZooKeeper server -->
<dropwizardmetrics.version>4.1.12.1</dropwizardmetrics.version> <!-- ZooKeeper server -->
<curator.version>5.1.0</curator.version>
- <netty.version>4.1.77.Final</netty.version>
- <netty-iouring.version>0.0.15.Final</netty-iouring.version>
+ <netty.version>4.1.86.Final</netty.version>
+ <netty-iouring.version>0.0.16.Final</netty-iouring.version>
<jetty.version>9.4.48.v20220622</jetty.version>
<conscrypt.version>2.5.2</conscrypt.version>
<jersey.version>2.34</jersey.version>
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 15842f45985..9e4304ff6e8 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 class ServerCnx extends PulsarHandler implements TransportCnx {
&& !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();
}
}
diff --git a/pulsar-sql/presto-distribution/LICENSE b/pulsar-sql/presto-distribution/LICENSE
index 27b127e8f3a..1ef8f0ba131 100644
--- a/pulsar-sql/presto-distribution/LICENSE
+++ b/pulsar-sql/presto-distribution/LICENSE
@@ -231,37 +231,37 @@ 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-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-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.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
diff --git a/src/owasp-dependency-check-false-positives.xml b/src/owasp-dependency-check-false-positives.xml
index e69afb31a68..0a6e49de667 100644
--- a/src/owasp-dependency-check-false-positives.xml
+++ b/src/owasp-dependency-check-false-positives.xml
@@ -56,7 +56,7 @@
</suppress>
<suppress>
<notes><![CDATA[
- file name: netty-tcnative-boringssl-static-2.0.52.Final-osx-aarch_64.jar
+ file name: netty-tcnative-boringssl-static-2.0.54.Final-osx-aarch_64.jar
]]></notes>
<packageUrl regex="true">^pkg:maven/io\.netty/netty\-tcnative\-boringssl\-static@.*$</packageUrl>
<cpe>cpe:/a:chromium_project:chromium</cpe>