You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@helix.apache.org by jx...@apache.org on 2018/01/25 22:07:45 UTC
helix git commit: Bump up ZOOKEEPER version to 3.4.11.
Repository: helix
Updated Branches:
refs/heads/master f3b348d71 -> 22cc4a4d4
Bump up ZOOKEEPER version to 3.4.11.
There is a zk connection related bug (ZOOKEEPER-2775) fixed in 3.4.11. Bump up version to get the fix.
Project: http://git-wip-us.apache.org/repos/asf/helix/repo
Commit: http://git-wip-us.apache.org/repos/asf/helix/commit/22cc4a4d
Tree: http://git-wip-us.apache.org/repos/asf/helix/tree/22cc4a4d
Diff: http://git-wip-us.apache.org/repos/asf/helix/diff/22cc4a4d
Branch: refs/heads/master
Commit: 22cc4a4d4819b211b30094de7b3b0944cb5c033b
Parents: f3b348d
Author: jiajunwang <er...@gmail.com>
Authored: Thu Jan 25 14:04:13 2018 -0800
Committer: jiajunwang <er...@gmail.com>
Committed: Thu Jan 25 14:04:13 2018 -0800
----------------------------------------------------------------------
helix-core/helix-core-0.6.10-SNAPSHOT.ivy | 2 +-
helix-core/pom.xml | 2 +-
.../apache/helix/integration/common/ZkIntegrationTestBase.java | 3 +++
3 files changed, 5 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/helix/blob/22cc4a4d/helix-core/helix-core-0.6.10-SNAPSHOT.ivy
----------------------------------------------------------------------
diff --git a/helix-core/helix-core-0.6.10-SNAPSHOT.ivy b/helix-core/helix-core-0.6.10-SNAPSHOT.ivy
index e86bc7e..0eca741 100644
--- a/helix-core/helix-core-0.6.10-SNAPSHOT.ivy
+++ b/helix-core/helix-core-0.6.10-SNAPSHOT.ivy
@@ -52,7 +52,7 @@ under the License.
<dependency org="org.slf4j" name="slf4j-log4j12" rev="1.7.14" force="true" conf="compile->compile(*),master(*);runtime->runtime(*)">
<artifact name="slf4j-log4j12" ext="jar"/>
</dependency>
- <dependency org="org.apache.zookeeper" name="zookeeper" rev="3.4.9" conf="compile->compile(default);runtime->runtime(default);default->default"/>
+ <dependency org="org.apache.zookeeper" name="zookeeper" rev="3.4.11" conf="compile->compile(default);runtime->runtime(default);default->default"/>
<dependency org="org.codehaus.jackson" name="jackson-core-asl" rev="1.8.5" conf="compile->compile(default);runtime->runtime(default);default->default"/>
<dependency org="org.codehaus.jackson" name="jackson-mapper-asl" rev="1.8.5" conf="compile->compile(default);runtime->runtime(default);default->default"/>
<dependency org="commons-io" name="commons-io" rev="1.4" conf="compile->compile(default);runtime->runtime(default);default->default"/>
http://git-wip-us.apache.org/repos/asf/helix/blob/22cc4a4d/helix-core/pom.xml
----------------------------------------------------------------------
diff --git a/helix-core/pom.xml b/helix-core/pom.xml
index 4855d7c..af3355a 100644
--- a/helix-core/pom.xml
+++ b/helix-core/pom.xml
@@ -85,7 +85,7 @@ under the License.
<dependency>
<groupId>org.apache.zookeeper</groupId>
<artifactId>zookeeper</artifactId>
- <version>3.4.9</version>
+ <version>3.4.11</version>
<exclusions>
<exclusion>
<groupId>junit</groupId>
http://git-wip-us.apache.org/repos/asf/helix/blob/22cc4a4d/helix-core/src/test/java/org/apache/helix/integration/common/ZkIntegrationTestBase.java
----------------------------------------------------------------------
diff --git a/helix-core/src/test/java/org/apache/helix/integration/common/ZkIntegrationTestBase.java b/helix-core/src/test/java/org/apache/helix/integration/common/ZkIntegrationTestBase.java
index cee331e..f1c59e1 100644
--- a/helix-core/src/test/java/org/apache/helix/integration/common/ZkIntegrationTestBase.java
+++ b/helix-core/src/test/java/org/apache/helix/integration/common/ZkIntegrationTestBase.java
@@ -85,6 +85,9 @@ public class ZkIntegrationTestBase {
java.util.logging.Logger topJavaLogger = java.util.logging.Logger.getLogger("");
topJavaLogger.setLevel(Level.WARNING);
+ // Due to ZOOKEEPER-2693 fix, we need to specify whitelist for execute zk commends
+ System.setProperty("zookeeper.4lw.commands.whitelist", "*");
+
_zkServer = TestHelper.startZkServer(ZK_ADDR);
AssertJUnit.assertTrue(_zkServer != null);
ZKClientPool.reset();