From c96b7d5038e7857ee01f25d365e1eb2f47db0f91 Mon Sep 17 00:00:00 2001 From: Eric Anderson Date: Fri, 21 Jul 2023 16:15:34 -0700 Subject: [PATCH] Downgrade Netty to 4.1.93-Final Our benchmarks saw a serious performance decrease with the upgrade from Netty 4.1.88 to 4.1.94. The problem was tracked down to a single PR in 4.1.94, so we avoid 4.1.94 for now. Fixes #10401 --- SECURITY.md | 2 +- gradle/libs.versions.toml | 2 +- repositories.bzl | 24 ++++++++++++------------ 3 files changed, 14 insertions(+), 14 deletions(-) diff --git a/SECURITY.md b/SECURITY.md index 5c418133a63..4fd052837fc 100644 --- a/SECURITY.md +++ b/SECURITY.md @@ -396,7 +396,7 @@ grpc-netty version | netty-handler version | netty-tcnative-boringssl-static ver 1.50.x-1.53.x | 4.1.79.Final | 2.0.54.Final 1.54.x-1.55.x | 4.1.87.Final | 2.0.56.Final 1.56.x | 4.1.87.Final | 2.0.61.Final -1.57.x- | 4.1.94.Final | 2.0.61.Final +1.57.x- | 4.1.93.Final | 2.0.61.Final _(grpc-netty-shaded avoids issues with keeping these versions in sync.)_ diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index b7dcd998558..c8e624b37d3 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -3,7 +3,7 @@ # https://github.com/grpc/grpc-java/pull/9118 googleauth = "1.4.0" guava = "32.0.1-android" -netty = '4.1.94.Final' +netty = '4.1.93.Final' # Keep the following references of tcnative version in sync whenever it's updated: # SECURITY.md nettytcnative = '2.0.61.Final' diff --git a/repositories.bzl b/repositories.bzl index 79d2f7c510e..2cdfbd178c3 100644 --- a/repositories.bzl +++ b/repositories.bzl @@ -25,20 +25,20 @@ IO_GRPC_GRPC_JAVA_ARTIFACTS = [ "com.google.truth:truth:1.0.1", "com.squareup.okhttp:okhttp:2.7.5", "com.squareup.okio:okio:1.17.5", - "io.netty:netty-buffer:4.1.94.Final", - "io.netty:netty-codec-http2:4.1.94.Final", - "io.netty:netty-codec-http:4.1.94.Final", - "io.netty:netty-codec-socks:4.1.94.Final", - "io.netty:netty-codec:4.1.94.Final", - "io.netty:netty-common:4.1.94.Final", - "io.netty:netty-handler-proxy:4.1.94.Final", - "io.netty:netty-handler:4.1.94.Final", - "io.netty:netty-resolver:4.1.94.Final", + "io.netty:netty-buffer:4.1.93.Final", + "io.netty:netty-codec-http2:4.1.93.Final", + "io.netty:netty-codec-http:4.1.93.Final", + "io.netty:netty-codec-socks:4.1.93.Final", + "io.netty:netty-codec:4.1.93.Final", + "io.netty:netty-common:4.1.93.Final", + "io.netty:netty-handler-proxy:4.1.93.Final", + "io.netty:netty-handler:4.1.93.Final", + "io.netty:netty-resolver:4.1.93.Final", "io.netty:netty-tcnative-boringssl-static:2.0.61.Final", "io.netty:netty-tcnative-classes:2.0.61.Final", - "io.netty:netty-transport-native-epoll:jar:linux-x86_64:4.1.94.Final", - "io.netty:netty-transport-native-unix-common:4.1.94.Final", - "io.netty:netty-transport:4.1.94.Final", + "io.netty:netty-transport-native-epoll:jar:linux-x86_64:4.1.93.Final", + "io.netty:netty-transport-native-unix-common:4.1.93.Final", + "io.netty:netty-transport:4.1.93.Final", "io.opencensus:opencensus-api:0.31.0", "io.opencensus:opencensus-contrib-grpc-metrics:0.31.0", "io.perfmark:perfmark-api:0.26.0",