You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@helix.apache.org by hu...@apache.org on 2022/03/08 21:42:49 UTC
[helix] branch master updated: Upgrading Zookeeper version to 3.6.13 to enable zk client SSL/TLS
This is an automated email from the ASF dual-hosted git repository.
hulee pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/helix.git
The following commit(s) were added to refs/heads/master by this push:
new 04d8df7 Upgrading Zookeeper version to 3.6.13 to enable zk client SSL/TLS
04d8df7 is described below
commit 04d8df733973e1884fd47d0c5cdd251379df4024
Author: rahulrane50 <ra...@gmail.com>
AuthorDate: Tue Mar 8 13:42:44 2022 -0800
Upgrading Zookeeper version to 3.6.13 to enable zk client SSL/TLS
Upgrading Zookeeper version to 3.6.13 to enable zk client SSL/TLS support
---
helix-admin-webapp/pom.xml | 2 +-
.../java/org/apache/helix/tools/commandtools/ZKLogFormatter.java | 8 ++++----
helix-rest/pom.xml | 2 +-
zookeeper-api/pom.xml | 4 ++--
4 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/helix-admin-webapp/pom.xml b/helix-admin-webapp/pom.xml
index 0a0b433..2c518f5 100644
--- a/helix-admin-webapp/pom.xml
+++ b/helix-admin-webapp/pom.xml
@@ -40,7 +40,7 @@
org.slf4j*;version="[1.7,2)",
org.apache.logging.log4j*;version="[2.17,3)",
org.apache.logging.slf4j*;version="[2.17,3)",
- org.apache.zookeeper*;version="[3.4,4)",
+ org.apache.zookeeper*;version="[3.6,3)",
*
</osgi.import>
<osgi.export>org.apache.helix.webapp*;version="${project.version};-noimport:=true</osgi.export>
diff --git a/helix-core/src/main/java/org/apache/helix/tools/commandtools/ZKLogFormatter.java b/helix-core/src/main/java/org/apache/helix/tools/commandtools/ZKLogFormatter.java
index 3e06271..c4618c1 100644
--- a/helix-core/src/main/java/org/apache/helix/tools/commandtools/ZKLogFormatter.java
+++ b/helix-core/src/main/java/org/apache/helix/tools/commandtools/ZKLogFormatter.java
@@ -49,6 +49,7 @@ import org.apache.zookeeper.server.persistence.FileSnap;
import org.apache.zookeeper.server.persistence.FileTxnLog;
import org.apache.zookeeper.server.util.SerializeUtils;
import org.apache.zookeeper.txn.TxnHeader;
+import org.apache.zookeeper.server.TxnLogEntry;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -248,13 +249,12 @@ public class ZKLogFormatter {
if (crcValue != crc.getValue()) {
throw new IOException("CRC doesn't match " + crcValue + " vs " + crc.getValue());
}
- TxnHeader hdr = new TxnHeader();
- Record txn = SerializeUtils.deserializeTxn(bytes, hdr);
+ TxnLogEntry txnLogEntry = SerializeUtils.deserializeTxn(bytes);
if (bw != null) {
- bw.write(formatTransaction(hdr, txn));
+ bw.write(formatTransaction(txnLogEntry.getHeader(), txnLogEntry.getTxn()));
bw.newLine();
} else {
- System.out.println(formatTransaction(hdr, txn));
+ System.out.println(formatTransaction(txnLogEntry.getHeader(), txnLogEntry.getTxn()));
}
if (logStream.readByte("EOR") != 'B') {
diff --git a/helix-rest/pom.xml b/helix-rest/pom.xml
index 0738707..1c4c6ab 100644
--- a/helix-rest/pom.xml
+++ b/helix-rest/pom.xml
@@ -37,7 +37,7 @@
org.slf4j*;version="[1.7,2)",
org.apache.logging.log4j*;version="[2.17,3)",
org.apache.logging.slf4j*;version="[2.17,3)",
- org.apache.zookeeper*;version="[3.4,13)",
+ org.apache.zookeeper*;version="[3.6,3)",
org.apache.commons.io*;version="[1.4,2)",
*
</osgi.import>
diff --git a/zookeeper-api/pom.xml b/zookeeper-api/pom.xml
index 61520bb..d8d1930 100644
--- a/zookeeper-api/pom.xml
+++ b/zookeeper-api/pom.xml
@@ -37,7 +37,7 @@
org.apache.zookeeper.server.persistence*;resolution:=optional,
org.apache.zookeeper.server.util*;resolution:=optional,
org.apache.zookeeper.txn*;resolution:=optional,
- org.apache.zookeeper*;version="[3.4,13)",
+ org.apache.zookeeper*;version="[3.6,3)",
*
</osgi.import>
<osgi.export>org.apache.helix.zookeeper*;version="${project.version};-noimport:=true</osgi.export>
@@ -56,7 +56,7 @@
<dependency>
<groupId>org.apache.zookeeper</groupId>
<artifactId>zookeeper</artifactId>
- <version>3.4.13</version>
+ <version>3.6.3</version>
<exclusions>
<exclusion>
<groupId>junit</groupId>