Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
A
atlas
Project
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
dataplatform
atlas
Commits
6f747203
Commit
6f747203
authored
6 years ago
by
Ashutosh Mestry
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
ATLAS-2888: Change marker fix for server name
parent
67871413
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
6 additions
and
12 deletions
+6
-12
AtlasServerService.java
...rg/apache/atlas/repository/impexp/AtlasServerService.java
+2
-2
AuditsWriter.java
...java/org/apache/atlas/repository/impexp/AuditsWriter.java
+4
-10
No files found.
repository/src/main/java/org/apache/atlas/repository/impexp/AtlasServerService.java
View file @
6f747203
...
@@ -70,8 +70,8 @@ public class AtlasServerService {
...
@@ -70,8 +70,8 @@ public class AtlasServerService {
}
}
}
}
public
AtlasServer
getCreateAtlasServer
(
String
name
,
String
f
ullName
)
throws
AtlasBaseException
{
public
AtlasServer
getCreateAtlasServer
(
String
clusterName
,
String
serverF
ullName
)
throws
AtlasBaseException
{
AtlasServer
defaultServer
=
new
AtlasServer
(
name
,
f
ullName
);
AtlasServer
defaultServer
=
new
AtlasServer
(
clusterName
,
serverF
ullName
);
AtlasServer
server
=
getAtlasServer
(
defaultServer
);
AtlasServer
server
=
getAtlasServer
(
defaultServer
);
if
(
server
==
null
)
{
if
(
server
==
null
)
{
return
save
(
defaultServer
);
return
save
(
defaultServer
);
...
...
This diff is collapsed.
Click to expand it.
repository/src/main/java/org/apache/atlas/repository/impexp/AuditsWriter.java
View file @
6f747203
...
@@ -93,18 +93,12 @@ public class AuditsWriter {
...
@@ -93,18 +93,12 @@ public class AuditsWriter {
:
StringUtils
.
EMPTY
;
:
StringUtils
.
EMPTY
;
}
}
private
AtlasServer
saveServer
(
String
name
,
String
serverFullName
)
{
private
AtlasServer
saveServer
(
String
clusterName
,
String
serverFullName
,
AtlasServer
cluster
=
new
AtlasServer
(
name
,
serverFullName
);
return
atlasServerService
.
save
(
cluster
);
}
private
AtlasServer
saveServer
(
String
name
,
String
serverFullName
,
String
entityGuid
,
String
entityGuid
,
long
lastModifiedTimestamp
)
{
long
lastModifiedTimestamp
)
throws
AtlasBaseException
{
AtlasServer
server
=
new
AtlasServer
(
n
ame
,
serverFullName
);
AtlasServer
server
=
atlasServerService
.
getCreateAtlasServer
(
clusterN
ame
,
serverFullName
);
server
.
setAdditionalInfoRepl
(
entityGuid
,
lastModifiedTimestamp
);
server
.
setAdditionalInfoRepl
(
entityGuid
,
lastModifiedTimestamp
);
if
(
LOG
.
isDebugEnabled
())
{
if
(
LOG
.
isDebugEnabled
())
{
LOG
.
debug
(
"saveServer: {}"
,
server
);
LOG
.
debug
(
"saveServer: {}"
,
server
);
}
}
...
@@ -138,7 +132,7 @@ public class AuditsWriter {
...
@@ -138,7 +132,7 @@ public class AuditsWriter {
}
}
private
void
saveCurrentServer
()
throws
AtlasBaseException
{
private
void
saveCurrentServer
()
throws
AtlasBaseException
{
save
Server
(
getCurrentClusterName
(),
getCurrentClusterName
());
atlasServerService
.
getCreateAtlas
Server
(
getCurrentClusterName
(),
getCurrentClusterName
());
}
}
private
class
ExportAudits
{
private
class
ExportAudits
{
...
...
This diff is collapsed.
Click to expand it.
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment