You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ranger.apache.org by zh...@apache.org on 2017/08/26 08:25:11 UTC
ranger git commit: revert RANGER-1725
Repository: ranger
Updated Branches:
refs/heads/master 18a47ed4b -> a43dd80f0
revert RANGER-1725
Project: http://git-wip-us.apache.org/repos/asf/ranger/repo
Commit: http://git-wip-us.apache.org/repos/asf/ranger/commit/a43dd80f
Tree: http://git-wip-us.apache.org/repos/asf/ranger/tree/a43dd80f
Diff: http://git-wip-us.apache.org/repos/asf/ranger/diff/a43dd80f
Branch: refs/heads/master
Commit: a43dd80f08857b99464934de9f5262851ab6749f
Parents: 18a47ed
Author: zhangqiang2 <zh...@zte.com.cn>
Authored: Sat Aug 26 04:23:29 2017 -0400
Committer: zhangqiang2 <zh...@zte.com.cn>
Committed: Sat Aug 26 04:23:29 2017 -0400
----------------------------------------------------------------------
.../plugin/store/EmbeddedServiceDefsUtil.java | 31 +++++++++++---------
1 file changed, 17 insertions(+), 14 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ranger/blob/a43dd80f/agents-common/src/main/java/org/apache/ranger/plugin/store/EmbeddedServiceDefsUtil.java
----------------------------------------------------------------------
diff --git a/agents-common/src/main/java/org/apache/ranger/plugin/store/EmbeddedServiceDefsUtil.java b/agents-common/src/main/java/org/apache/ranger/plugin/store/EmbeddedServiceDefsUtil.java
index a09daae..0bc09f6 100755
--- a/agents-common/src/main/java/org/apache/ranger/plugin/store/EmbeddedServiceDefsUtil.java
+++ b/agents-common/src/main/java/org/apache/ranger/plugin/store/EmbeddedServiceDefsUtil.java
@@ -49,6 +49,7 @@ public class EmbeddedServiceDefsUtil {
// following servicedef list should be reviewed/updated whenever a new embedded service-def is added
private static final String DEFAULT_BOOTSTRAP_SERVICEDEF_LIST = "tag,hdfs,hbase,hive,kms,knox,storm,yarn,kafka,solr,atlas,nifi";
private static final String PROPERTY_SUPPORTED_SERVICE_DEFS = "ranger.supportedcomponents";
+ private Set<String> supportedServiceDefs;
public static final String EMBEDDED_SERVICEDEF_TAG_NAME = "tag";
public static final String EMBEDDED_SERVICEDEF_HDFS_NAME = "hdfs";
public static final String EMBEDDED_SERVICEDEF_HBASE_NAME = "hbase";
@@ -80,7 +81,6 @@ public class EmbeddedServiceDefsUtil {
private static EmbeddedServiceDefsUtil instance = new EmbeddedServiceDefsUtil();
private boolean createEmbeddedServiceDefs = true;
- private Set<String> supportedServiceDefs;
private RangerServiceDef hdfsServiceDef;
private RangerServiceDef hBaseServiceDef;
private RangerServiceDef hiveServiceDef;
@@ -209,7 +209,7 @@ public class EmbeddedServiceDefsUtil {
}
RangerServiceDef ret = null;
- boolean createServiceDef = (!CollectionUtils.isEmpty(supportedServiceDefs) && supportedServiceDefs.contains(serviceDefName));
+ boolean createServiceDef = (CollectionUtils.isEmpty(supportedServiceDefs) || supportedServiceDefs.contains(serviceDefName));
try {
ret = store.getServiceDefByName(serviceDefName);
if(ret == null && createEmbeddedServiceDefs && createServiceDef) {
@@ -261,20 +261,23 @@ public class EmbeddedServiceDefsUtil {
return ret;
}
- private Set<String> getSupportedServiceDef() {
- Set<String> supportedServiceDef = new HashSet<>();
- String ranger_supportedcomponents = RangerConfiguration.getInstance().get(PROPERTY_SUPPORTED_SERVICE_DEFS, DEFAULT_BOOTSTRAP_SERVICEDEF_LIST);
- if (StringUtils.isBlank(ranger_supportedcomponents) || "all".equalsIgnoreCase(ranger_supportedcomponents)) {
- ranger_supportedcomponents = DEFAULT_BOOTSTRAP_SERVICEDEF_LIST;
- }
- String[] supportedComponents = ranger_supportedcomponents.split(",");
- if (supportedComponents != null && supportedComponents.length > 0) {
- for (String element : supportedComponents) {
- if (!StringUtils.isBlank(element)) {
- element = element.toLowerCase();
- supportedServiceDef.add(element);
+ private Set<String> getSupportedServiceDef(){
+ Set<String> supportedServiceDef =new HashSet<>();
+ try{
+ String ranger_supportedcomponents=RangerConfiguration.getInstance().get(PROPERTY_SUPPORTED_SERVICE_DEFS, DEFAULT_BOOTSTRAP_SERVICEDEF_LIST);
+ if(StringUtils.isBlank(ranger_supportedcomponents) || "all".equalsIgnoreCase(ranger_supportedcomponents)){
+ ranger_supportedcomponents=DEFAULT_BOOTSTRAP_SERVICEDEF_LIST;
+ }
+ String[] supportedComponents=ranger_supportedcomponents.split(",");
+ if(supportedComponents!=null && supportedComponents.length>0){
+ for(String element:supportedComponents){
+ if(!StringUtils.isBlank(element)){
+ element=element.toLowerCase();
+ supportedServiceDef.add(element);
+ }
}
}
+ }catch(Exception ex){
}
return supportedServiceDef;
}