(zookeeper) branch branch-3.8 updated: ZOOKEEPER-4293: Lock Contention in ClientCnxnSocketNetty (possible deadlock) (branch-3.8 backport)

[andor]

This is an automated email from the ASF dual-hosted git repository.

andor pushed a commit to branch branch-3.8
in repository https://gitbox.apache.org/repos/asf/zookeeper.git


The following commit(s) were added to refs/heads/branch-3.8 by this push:
     new 32db31888 ZOOKEEPER-4293: Lock Contention in ClientCnxnSocketNetty 
(possible deadlock) (branch-3.8 backport)
32db31888 is described below

commit 32db318886d355b5cc4b2a824b7093f52638e3a5
Author: Andor Molnár <an...@apache.org>
AuthorDate: Wed Jul 30 13:43:10 2025 -0500

    ZOOKEEPER-4293: Lock Contention in ClientCnxnSocketNetty (possible 
deadlock) (branch-3.8 backport)
    
    ZOOKEEPER-4293: Bump netty to 4.1.113.Final, remove syncUninterruptibly 
(#1917)
    Reviewers: anmolnar, kezhuw
    Author: MikeEdgar
    Closes #1917 from MikeEdgar/ZOOKEEPER-4293
    Reviewers: kezhuw
    Author: anmolnar
    Closes #2284 from anmolnar/ZOOKEEPER-4293_38
---
 pom.xml                                                                 | 2 +-
 .../src/main/java/org/apache/zookeeper/ClientCnxnSocketNetty.java       | 2 +-
 .../java/org/apache/zookeeper/server/quorum/UnifiedServerSocket.java    | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/pom.xml b/pom.xml
index 6fdf4c445..e3612ca74 100644
--- a/pom.xml
+++ b/pom.xml
@@ -467,7 +467,7 @@
     <mockito.version>4.9.0</mockito.version>
     <hamcrest.version>2.2</hamcrest.version>
     <commons-cli.version>1.5.0</commons-cli.version>
-    <netty.version>4.1.105.Final</netty.version>
+    <netty.version>4.1.113.Final</netty.version>
     <jetty.version>9.4.56.v20240826</jetty.version>
     <jackson.version>2.15.2</jackson.version>
     <jline.version>2.14.6</jline.version>
diff --git 
a/zookeeper-server/src/main/java/org/apache/zookeeper/ClientCnxnSocketNetty.java
 
b/zookeeper-server/src/main/java/org/apache/zookeeper/ClientCnxnSocketNetty.java
index 059627ea7..a01cba965 100755
--- 
a/zookeeper-server/src/main/java/org/apache/zookeeper/ClientCnxnSocketNetty.java
+++ 
b/zookeeper-server/src/main/java/org/apache/zookeeper/ClientCnxnSocketNetty.java
@@ -206,7 +206,7 @@ void cleanup() {
                 connectFuture = null;
             }
             if (channel != null) {
-                channel.close().syncUninterruptibly();
+                channel.close();
                 channel = null;
             }
         } finally {
diff --git 
a/zookeeper-server/src/main/java/org/apache/zookeeper/server/quorum/UnifiedServerSocket.java
 
b/zookeeper-server/src/main/java/org/apache/zookeeper/server/quorum/UnifiedServerSocket.java
index 387a6c7d7..c101e9e2d 100644
--- 
a/zookeeper-server/src/main/java/org/apache/zookeeper/server/quorum/UnifiedServerSocket.java
+++ 
b/zookeeper-server/src/main/java/org/apache/zookeeper/server/quorum/UnifiedServerSocket.java
@@ -255,7 +255,7 @@ private void detectMode() throws IOException {
                 bytesRead = 0;
             }
 
-            if (bytesRead == litmus.length && 
SslHandler.isEncrypted(Unpooled.wrappedBuffer(litmus))) {
+            if (bytesRead == litmus.length && 
SslHandler.isEncrypted(Unpooled.wrappedBuffer(litmus), false)) {
                 try {
                     sslSocket = x509Util.createSSLSocket(prependableSocket, 
litmus);
                 } catch (X509Exception e) {