Skip to content

Commit e54af8d

Browse files
Softrockkezhuw
authored andcommitted
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 3d6c0d1) Signed-off-by: Kezhu Wang <[email protected]>
1 parent b9b1616 commit e54af8d

File tree

2 files changed

+3
-3
lines changed

2 files changed

+3
-3
lines changed

zookeeper-server/src/main/java/org/apache/zookeeper/server/quorum/FastLeaderElection.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -425,7 +425,7 @@ public void run() {
425425
self.getPeerState(),
426426
response.sid,
427427
v.getPeerEpoch(),
428-
qv.toString().getBytes());
428+
qv.toString().getBytes(UTF_8));
429429
sendqueue.offer(notmsg);
430430
}
431431
} else {
@@ -461,7 +461,7 @@ public void run() {
461461
self.getPeerState(),
462462
response.sid,
463463
current.getPeerEpoch(),
464-
qv.toString().getBytes());
464+
qv.toString().getBytes(UTF_8));
465465
sendqueue.offer(notmsg);
466466
}
467467
}

zookeeper-server/src/main/java/org/apache/zookeeper/server/quorum/QuorumCnxManager.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -490,7 +490,7 @@ private boolean startConnection(Socket sock, Long sid) throws IOException {
490490

491491
String addr = addressesToSend.stream()
492492
.map(NetUtils::formatInetAddr).collect(Collectors.joining("|"));
493-
byte[] addr_bytes = addr.getBytes();
493+
byte[] addr_bytes = addr.getBytes(UTF_8);
494494
dout.writeInt(addr_bytes.length);
495495
dout.write(addr_bytes);
496496
dout.flush();

0 commit comments

Comments
 (0)