Repository: incubator-atlas Updated Branches: refs/heads/master d06b8229a -> a07f3cc04
ATLAS-1108 In Atlas HA mode , import-hive.sh in Passive instance fails. (ayubkhan via sumasai) Project: http://git-wip-us.apache.org/repos/asf/incubator-atlas/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-atlas/commit/a07f3cc0 Tree: http://git-wip-us.apache.org/repos/asf/incubator-atlas/tree/a07f3cc0 Diff: http://git-wip-us.apache.org/repos/asf/incubator-atlas/diff/a07f3cc0 Branch: refs/heads/master Commit: a07f3cc041813e5431bfc5e1b43f0d466756ca70 Parents: d06b822 Author: Suma Shivaprasad <[email protected]> Authored: Wed Aug 10 15:02:59 2016 -0700 Committer: Suma Shivaprasad <[email protected]> Committed: Wed Aug 10 15:02:59 2016 -0700 ---------------------------------------------------------------------- .../org/apache/atlas/hive/bridge/HiveMetaStoreBridge.java | 7 +++++-- .../src/main/java/org/apache/atlas/AtlasServerEnsemble.java | 2 +- release-log.txt | 1 + 3 files changed, 7 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-atlas/blob/a07f3cc0/addons/hive-bridge/src/main/java/org/apache/atlas/hive/bridge/HiveMetaStoreBridge.java ---------------------------------------------------------------------- diff --git a/addons/hive-bridge/src/main/java/org/apache/atlas/hive/bridge/HiveMetaStoreBridge.java b/addons/hive-bridge/src/main/java/org/apache/atlas/hive/bridge/HiveMetaStoreBridge.java index eb08c37..ae969e1 100755 --- a/addons/hive-bridge/src/main/java/org/apache/atlas/hive/bridge/HiveMetaStoreBridge.java +++ b/addons/hive-bridge/src/main/java/org/apache/atlas/hive/bridge/HiveMetaStoreBridge.java @@ -634,12 +634,15 @@ public class HiveMetaStoreBridge { public static void main(String[] args) throws Exception { Configuration atlasConf = ApplicationProperties.get(); - String atlasEndpoint = atlasConf.getString(ATLAS_ENDPOINT, DEFAULT_DGI_URL); + String[] atlasEndpoint = atlasConf.getStringArray(ATLAS_ENDPOINT); + if (atlasEndpoint == null){ + atlasEndpoint = new String[]{DEFAULT_DGI_URL}; + } AtlasClient atlasClient; if (!AuthenticationUtil.isKerberosAuthenticationEnabled()) { String[] basicAuthUsernamePassword = AuthenticationUtil.getBasicAuthenticationInput(); - atlasClient = new AtlasClient(new String[]{atlasEndpoint}, basicAuthUsernamePassword); + atlasClient = new AtlasClient(atlasEndpoint, basicAuthUsernamePassword); } else { UserGroupInformation ugi = UserGroupInformation.getCurrentUser(); atlasClient = new AtlasClient(ugi, ugi.getShortUserName(), atlasEndpoint); http://git-wip-us.apache.org/repos/asf/incubator-atlas/blob/a07f3cc0/client/src/main/java/org/apache/atlas/AtlasServerEnsemble.java ---------------------------------------------------------------------- diff --git a/client/src/main/java/org/apache/atlas/AtlasServerEnsemble.java b/client/src/main/java/org/apache/atlas/AtlasServerEnsemble.java index 96df6a3..01e4e32 100644 --- a/client/src/main/java/org/apache/atlas/AtlasServerEnsemble.java +++ b/client/src/main/java/org/apache/atlas/AtlasServerEnsemble.java @@ -20,7 +20,7 @@ package org.apache.atlas; import com.google.common.base.Preconditions; import org.apache.commons.lang.StringUtils; -import scala.actors.threadpool.Arrays; +import java.util.Arrays; import java.util.List; http://git-wip-us.apache.org/repos/asf/incubator-atlas/blob/a07f3cc0/release-log.txt ---------------------------------------------------------------------- diff --git a/release-log.txt b/release-log.txt index e458343..2211a7c 100644 --- a/release-log.txt +++ b/release-log.txt @@ -6,6 +6,7 @@ INCOMPATIBLE CHANGES: ATLAS-1060 Add composite indexes for exact match performance improvements for all attributes (sumasai via shwethags) ALL CHANGES: +ATLAS-1108 In Atlas HA mode , import-hive.sh in Passive instance fails. (ayubkhan via sumasai) ATLAS-991 Lower bound checking not always disabled for entities being deleted (dkantor) ATLAS-1104 Get outgoing edges by label doesn't work in some cases (shwethags) ATLAS-1106 Fix Build failure due to wrong version in graphdb/common pom (sumasai)
