(zookeeper) branch branch-3.9 updated: ZOOKEEPER-4787: Fix quorum join failure due to inconsistent wire message charset during leader election

[kezhuw]

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

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


The following commit(s) were added to refs/heads/branch-3.9 by this push:
     new 33c1f0dee ZOOKEEPER-4787: Fix quorum join failure due to inconsistent 
wire message charset during leader election
33c1f0dee is described below

commit 33c1f0deed72e594cb11255b5f8fb5f58e1793f6
Author: Softrock <41425369+softr...@users.noreply.github.com>
AuthorDate: Fri Jul 25 01:58:50 2025 +0800

    ZOOKEEPER-4787: Fix quorum join failure due to inconsistent wire message 
charset during leader election
    
    Reviewers: kezhuw
    Author: Softrock
    Closes #2143 from Softrock/ZOOKEEPER-4787-master
    
    (cherry picked from commit 3d6c0d1164dc9ec96a02de383e410b1b0ef64565)
    Signed-off-by: Kezhu Wang <kez...@apache.org>
---
 .../java/org/apache/zookeeper/server/quorum/FastLeaderElection.java   | 4 ++--
 .../java/org/apache/zookeeper/server/quorum/QuorumCnxManager.java     | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git 
a/zookeeper-server/src/main/java/org/apache/zookeeper/server/quorum/FastLeaderElection.java
 
b/zookeeper-server/src/main/java/org/apache/zookeeper/server/quorum/FastLeaderElection.java
index 5a6b18fd1..cee02972e 100644
--- 
a/zookeeper-server/src/main/java/org/apache/zookeeper/server/quorum/FastLeaderElection.java
+++ 
b/zookeeper-server/src/main/java/org/apache/zookeeper/server/quorum/FastLeaderElection.java
@@ -425,7 +425,7 @@ public void run() {
                                         self.getPeerState(),
                                         response.sid,
                                         v.getPeerEpoch(),
-                                        qv.toString().getBytes());
+                                        qv.toString().getBytes(UTF_8));
                                     sendqueue.offer(notmsg);
                                 }
                             } else {
@@ -461,7 +461,7 @@ public void run() {
                                         self.getPeerState(),
                                         response.sid,
                                         current.getPeerEpoch(),
-                                        qv.toString().getBytes());
+                                        qv.toString().getBytes(UTF_8));
                                     sendqueue.offer(notmsg);
                                 }
                             }
diff --git 
a/zookeeper-server/src/main/java/org/apache/zookeeper/server/quorum/QuorumCnxManager.java
 
b/zookeeper-server/src/main/java/org/apache/zookeeper/server/quorum/QuorumCnxManager.java
index a4faeb133..db7f0090d 100644
--- 
a/zookeeper-server/src/main/java/org/apache/zookeeper/server/quorum/QuorumCnxManager.java
+++ 
b/zookeeper-server/src/main/java/org/apache/zookeeper/server/quorum/QuorumCnxManager.java
@@ -490,7 +490,7 @@ private boolean startConnection(Socket sock, Long sid) 
throws IOException {
 
             String addr = addressesToSend.stream()
                     
.map(NetUtils::formatInetAddr).collect(Collectors.joining("|"));
-            byte[] addr_bytes = addr.getBytes();
+            byte[] addr_bytes = addr.getBytes(UTF_8);
             dout.writeInt(addr_bytes.length);
             dout.write(addr_bytes);
             dout.flush();