Repository: atlas Updated Branches: refs/heads/branch-0.8 a4c9496c2 -> d000c3dbb
ATLAS-2888: Change marker fix for server name Project: http://git-wip-us.apache.org/repos/asf/atlas/repo Commit: http://git-wip-us.apache.org/repos/asf/atlas/commit/d000c3db Tree: http://git-wip-us.apache.org/repos/asf/atlas/tree/d000c3db Diff: http://git-wip-us.apache.org/repos/asf/atlas/diff/d000c3db Branch: refs/heads/branch-0.8 Commit: d000c3dbbf7d023f857551b25cb4e92047cba340 Parents: a4c9496 Author: Ashutosh Mestry <[email protected]> Authored: Mon Oct 1 16:07:06 2018 -0700 Committer: Ashutosh Mestry <[email protected]> Committed: Mon Oct 1 20:52:13 2018 -0700 ---------------------------------------------------------------------- .../repository/impexp/AtlasServerService.java | 18 ++++++++++++++++++ .../atlas/repository/impexp/AuditsWriter.java | 10 ++-------- 2 files changed, 20 insertions(+), 8 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/atlas/blob/d000c3db/repository/src/main/java/org/apache/atlas/repository/impexp/AtlasServerService.java ---------------------------------------------------------------------- diff --git a/repository/src/main/java/org/apache/atlas/repository/impexp/AtlasServerService.java b/repository/src/main/java/org/apache/atlas/repository/impexp/AtlasServerService.java index 1be7817..b5e416e 100644 --- a/repository/src/main/java/org/apache/atlas/repository/impexp/AtlasServerService.java +++ b/repository/src/main/java/org/apache/atlas/repository/impexp/AtlasServerService.java @@ -70,6 +70,24 @@ public class AtlasServerService { } } + public AtlasServer getCreateAtlasServer(String clusterName, String serverFullName) throws AtlasBaseException { + AtlasServer defaultServer = new AtlasServer(clusterName, serverFullName); + AtlasServer server = getAtlasServer(defaultServer); + if (server == null) { + return save(defaultServer); + } + + return server; + } + + private AtlasServer getAtlasServer(AtlasServer server) { + try { + return get(server); + } catch (AtlasBaseException ex) { + return null; + } + } + @GraphTransaction public AtlasServer save(AtlasServer server) throws AtlasBaseException { return dataAccess.save(server); http://git-wip-us.apache.org/repos/asf/atlas/blob/d000c3db/repository/src/main/java/org/apache/atlas/repository/impexp/AuditsWriter.java ---------------------------------------------------------------------- diff --git a/repository/src/main/java/org/apache/atlas/repository/impexp/AuditsWriter.java b/repository/src/main/java/org/apache/atlas/repository/impexp/AuditsWriter.java index 20f94dd..3612c45 100644 --- a/repository/src/main/java/org/apache/atlas/repository/impexp/AuditsWriter.java +++ b/repository/src/main/java/org/apache/atlas/repository/impexp/AuditsWriter.java @@ -93,18 +93,12 @@ public class AuditsWriter { : StringUtils.EMPTY; } - private AtlasServer saveServer(String clusterName, String serverFullName) throws AtlasBaseException { - AtlasServer cluster = new AtlasServer(clusterName, serverFullName); - return atlasServerService.save(cluster); - } - private AtlasServer saveServer(String clusterName, String serverFullName, String entityGuid, long lastModifiedTimestamp) throws AtlasBaseException { - AtlasServer server = new AtlasServer(clusterName, serverFullName); + AtlasServer server = atlasServerService.getCreateAtlasServer(clusterName, serverFullName); server.setAdditionalInfoRepl(entityGuid, lastModifiedTimestamp); - if (LOG.isDebugEnabled()) { LOG.debug("saveServer: {}", server); } @@ -138,7 +132,7 @@ public class AuditsWriter { } private void saveCurrentServer() throws AtlasBaseException { - saveServer(getCurrentClusterName(), getCurrentClusterName()); + atlasServerService.getCreateAtlasServer(getCurrentClusterName(), getCurrentClusterName()); } private class ExportAudits {
