Repository: atlas Updated Branches: refs/heads/branch-1.0 84c66058e -> 28e5d5d9c
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/28e5d5d9 Tree: http://git-wip-us.apache.org/repos/asf/atlas/tree/28e5d5d9 Diff: http://git-wip-us.apache.org/repos/asf/atlas/diff/28e5d5d9 Branch: refs/heads/branch-1.0 Commit: 28e5d5d9cd6ed94e121d02d49cad01b14b02dc1c Parents: 84c6605 Author: apoorvnaik <[email protected]> Authored: Tue Jul 10 15:17:22 2018 -0700 Committer: apoorvnaik <[email protected]> Committed: Fri Jul 13 18:13:20 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/28e5d5d9/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); } }
