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
7f3da2c9
Commit
7f3da2c9
authored
6 years ago
by
Madhan Neethiraj
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
ATLAS-2786: updated HBase client to use all zookeeper entries
(cherry picked from commit 2f39428313136b765dbab42a1ee2e6521695d690)
parent
8cc12be1
master
No related merge requests found
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
19 additions
and
6 deletions
+19
-6
ApplicationProperties.java
...src/main/java/org/apache/atlas/ApplicationProperties.java
+9
-0
HBaseBasedAuditRepository.java
...che/atlas/repository/audit/HBaseBasedAuditRepository.java
+10
-6
No files found.
intg/src/main/java/org/apache/atlas/ApplicationProperties.java
View file @
7f3da2c9
...
@@ -19,6 +19,7 @@ package org.apache.atlas;
...
@@ -19,6 +19,7 @@ package org.apache.atlas;
import
org.apache.atlas.security.InMemoryJAASConfiguration
;
import
org.apache.atlas.security.InMemoryJAASConfiguration
;
import
org.apache.commons.configuration.Configuration
;
import
org.apache.commons.configuration.Configuration
;
import
org.apache.commons.configuration.ConfigurationConverter
;
import
org.apache.commons.configuration.ConfigurationException
;
import
org.apache.commons.configuration.ConfigurationException
;
import
org.apache.commons.configuration.PropertiesConfiguration
;
import
org.apache.commons.configuration.PropertiesConfiguration
;
import
org.apache.commons.lang.StringUtils
;
import
org.apache.commons.lang.StringUtils
;
...
@@ -32,6 +33,7 @@ import java.io.InputStream;
...
@@ -32,6 +33,7 @@ import java.io.InputStream;
import
java.net.URL
;
import
java.net.URL
;
import
java.util.AbstractMap.SimpleEntry
;
import
java.util.AbstractMap.SimpleEntry
;
import
java.util.Iterator
;
import
java.util.Iterator
;
import
java.util.Properties
;
/**
/**
* Application properties used by Atlas.
* Application properties used by Atlas.
...
@@ -135,6 +137,13 @@ public final class ApplicationProperties extends PropertiesConfiguration {
...
@@ -135,6 +137,13 @@ public final class ApplicationProperties extends PropertiesConfiguration {
return
inConf
.
subset
(
prefix
);
return
inConf
.
subset
(
prefix
);
}
}
public
static
Properties
getSubsetAsProperties
(
Configuration
inConf
,
String
prefix
)
{
Configuration
subset
=
inConf
.
subset
(
prefix
);
Properties
ret
=
ConfigurationConverter
.
getProperties
(
subset
);
return
ret
;
}
public
static
Class
getClass
(
Configuration
configuration
,
String
propertyName
,
String
defaultValue
,
public
static
Class
getClass
(
Configuration
configuration
,
String
propertyName
,
String
defaultValue
,
Class
assignableClass
)
throws
AtlasException
{
Class
assignableClass
)
throws
AtlasException
{
try
{
try
{
...
...
This diff is collapsed.
Click to expand it.
repository/src/main/java/org/apache/atlas/repository/audit/HBaseBasedAuditRepository.java
View file @
7f3da2c9
...
@@ -66,6 +66,7 @@ import java.io.IOException;
...
@@ -66,6 +66,7 @@ import java.io.IOException;
import
java.util.ArrayList
;
import
java.util.ArrayList
;
import
java.util.Iterator
;
import
java.util.Iterator
;
import
java.util.List
;
import
java.util.List
;
import
java.util.Properties
;
import
static
org
.
apache
.
atlas
.
EntityAuditEvent
.
EntityAuditAction
.
TAG_ADD
;
import
static
org
.
apache
.
atlas
.
EntityAuditEvent
.
EntityAuditAction
.
TAG_ADD
;
import
static
org
.
apache
.
atlas
.
EntityAuditEvent
.
EntityAuditAction
.
TAG_DELETE
;
import
static
org
.
apache
.
atlas
.
EntityAuditEvent
.
EntityAuditAction
.
TAG_DELETE
;
...
@@ -505,14 +506,17 @@ public class HBaseBasedAuditRepository extends AbstractStorageBasedAuditReposito
...
@@ -505,14 +506,17 @@ public class HBaseBasedAuditRepository extends AbstractStorageBasedAuditReposito
* @param atlasConf
* @param atlasConf
*/
*/
public
static
org
.
apache
.
hadoop
.
conf
.
Configuration
getHBaseConfiguration
(
Configuration
atlasConf
)
throws
AtlasException
{
public
static
org
.
apache
.
hadoop
.
conf
.
Configuration
getHBaseConfiguration
(
Configuration
atlasConf
)
throws
AtlasException
{
Configuration
subsetAtlasConf
=
Properties
properties
=
ApplicationProperties
.
getSubsetAsProperties
(
atlasConf
,
CONFIG_PREFIX
);
ApplicationProperties
.
getSubsetConfiguration
(
atlasConf
,
CONFIG_PREFIX
);
org
.
apache
.
hadoop
.
conf
.
Configuration
hbaseConf
=
HBaseConfiguration
.
create
();
org
.
apache
.
hadoop
.
conf
.
Configuration
hbaseConf
=
HBaseConfiguration
.
create
();
Iterator
<
String
>
keys
=
subsetAtlasConf
.
getKeys
();
while
(
keys
.
hasNext
())
{
for
(
String
key
:
properties
.
stringPropertyNames
())
{
String
key
=
keys
.
next
();
String
value
=
properties
.
getProperty
(
key
);
hbaseConf
.
set
(
key
,
subsetAtlasConf
.
getString
(
key
));
LOG
.
info
(
"adding HBase configuration: {}={}"
,
key
,
value
);
hbaseConf
.
set
(
key
,
value
);
}
}
return
hbaseConf
;
return
hbaseConf
;
}
}
...
...
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