ATLAS-2888: Change marker fix for server name

repository/src/main/java/org/apache/atlas/repository/impexp/AtlasServerService.java

@@ -70,8 +70,8 @@ public class AtlasServerService {
         }
     }
 
-    public AtlasServer getCreateAtlasServer(String name, String fullName) throws AtlasBaseException {
-        AtlasServer defaultServer = new AtlasServer(name, fullName);
+    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);

repository/src/main/java/org/apache/atlas/repository/impexp/AuditsWriter.java

@@ -93,18 +93,12 @@ public class AuditsWriter {
                 : StringUtils.EMPTY;
     }
 
-    private AtlasServer saveServer(String name, String serverFullName) {
-        AtlasServer cluster = new AtlasServer(name, serverFullName);
-        return atlasServerService.save(cluster);
-    }
-
-    private AtlasServer saveServer(String name, String serverFullName,
+    private AtlasServer saveServer(String clusterName, String serverFullName,
                                    String entityGuid,
-                                   long lastModifiedTimestamp) {
+                                   long lastModifiedTimestamp) throws AtlasBaseException {
 
-        AtlasServer server = new AtlasServer(name, 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 {