You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@atlas.apache.org by ap...@apache.org on 2018/07/14 01:13:06 UTC
atlas git commit: ATLAS-2786: Honor ZK server ensemble provided in
configuration
Repository: atlas
Updated Branches:
refs/heads/master 12ca5c97a -> 89fc83576
ATLAS-2786: Honor ZK server ensemble provided in configuration
Change-Id: I3153f258276b534e864fb53b8bcc1cd6af936b5b
Project: http://git-wip-us.apache.org/repos/asf/atlas/repo
Commit: http://git-wip-us.apache.org/repos/asf/atlas/commit/89fc8357
Tree: http://git-wip-us.apache.org/repos/asf/atlas/tree/89fc8357
Diff: http://git-wip-us.apache.org/repos/asf/atlas/diff/89fc8357
Branch: refs/heads/master
Commit: 89fc835764c28e2f1e6e60ec9337e175bc0c0707
Parents: 12ca5c9
Author: apoorvnaik <ap...@apache.org>
Authored: Fri Jul 13 18:12:54 2018 -0700
Committer: apoorvnaik <ap...@apache.org>
Committed: Fri Jul 13 18:12:54 2018 -0700
----------------------------------------------------------------------
.../java/org/apache/atlas/ha/HAConfiguration.java | 14 ++++++++++----
1 file changed, 10 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/atlas/blob/89fc8357/common/src/main/java/org/apache/atlas/ha/HAConfiguration.java
----------------------------------------------------------------------
diff --git a/common/src/main/java/org/apache/atlas/ha/HAConfiguration.java b/common/src/main/java/org/apache/atlas/ha/HAConfiguration.java
index 7cfd553..91fd4e1 100644
--- a/common/src/main/java/org/apache/atlas/ha/HAConfiguration.java
+++ b/common/src/main/java/org/apache/atlas/ha/HAConfiguration.java
@@ -20,6 +20,7 @@ package org.apache.atlas.ha;
import org.apache.atlas.security.SecurityProperties;
import org.apache.commons.configuration.Configuration;
+import org.apache.commons.lang.StringUtils;
import java.util.ArrayList;
import java.util.List;
@@ -179,9 +180,11 @@ public final class HAConfiguration {
}
public static ZookeeperProperties getZookeeperProperties(Configuration configuration) {
- String zookeeperConnectString = configuration.getString("atlas.kafka." + ZOOKEEPER_PREFIX + "connect");
+ String[] zkServers;
if (configuration.containsKey(HA_ZOOKEEPER_CONNECT)) {
- zookeeperConnectString = configuration.getString(HA_ZOOKEEPER_CONNECT);
+ zkServers = configuration.getStringArray(HA_ZOOKEEPER_CONNECT);
+ } else {
+ zkServers = configuration.getStringArray("atlas.kafka." + ZOOKEEPER_PREFIX + "connect");
}
String zkRoot = configuration.getString(ATLAS_SERVER_HA_ZK_ROOT_KEY, ATLAS_SERVER_ZK_ROOT_DEFAULT);
@@ -195,7 +198,10 @@ public final class HAConfiguration {
String acl = configuration.getString(HA_ZOOKEEPER_ACL);
String auth = configuration.getString(HA_ZOOKEEPER_AUTH);
- return new ZookeeperProperties(zookeeperConnectString, zkRoot, retriesSleepTimeMillis, numRetries,
- sessionTimeout, acl, auth);
+
+ return new ZookeeperProperties(StringUtils.join(zkServers, ','),
+ zkRoot,
+ retriesSleepTimeMillis, numRetries,
+ sessionTimeout, acl, auth);
}
}