Commit 7f3da2c9 by Madhan Neethiraj

ATLAS-2786: updated HBase client to use all zookeeper entries

(cherry picked from commit 2f39428313136b765dbab42a1ee2e6521695d690)
parent 8cc12be1
...@@ -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 {
......
...@@ -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;
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment