Repository: ranger Updated Branches: refs/heads/master ad2731811 -> 906613684
RANGER-1887:serviceDef.getResources().get(0).getName();case java.lang.IndexOutOfBoundsException in RangerServiceTag.class,log error for RangerServiceStorm.class Signed-off-by: peng.jianhua <peng.jian...@zte.com.cn> Project: http://git-wip-us.apache.org/repos/asf/ranger/repo Commit: http://git-wip-us.apache.org/repos/asf/ranger/commit/90661368 Tree: http://git-wip-us.apache.org/repos/asf/ranger/tree/90661368 Diff: http://git-wip-us.apache.org/repos/asf/ranger/diff/90661368 Branch: refs/heads/master Commit: 906613684d0662b22448435fe794b08b217d7021 Parents: ad27318 Author: zhangqiang2 <zhangqia...@zte.com.cn> Authored: Fri Nov 17 12:03:26 2017 +0800 Committer: peng.jianhua <peng.jian...@zte.com.cn> Committed: Thu Nov 23 09:49:49 2017 +0800 ---------------------------------------------------------------------- .../ranger/services/tag/RangerServiceTag.java | 48 ++++++++++---------- .../services/storm/RangerServiceStorm.java | 10 ++-- 2 files changed, 30 insertions(+), 28 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ranger/blob/90661368/agents-common/src/main/java/org/apache/ranger/services/tag/RangerServiceTag.java ---------------------------------------------------------------------- diff --git a/agents-common/src/main/java/org/apache/ranger/services/tag/RangerServiceTag.java b/agents-common/src/main/java/org/apache/ranger/services/tag/RangerServiceTag.java index ce6002b..678e72f 100644 --- a/agents-common/src/main/java/org/apache/ranger/services/tag/RangerServiceTag.java +++ b/agents-common/src/main/java/org/apache/ranger/services/tag/RangerServiceTag.java @@ -148,41 +148,43 @@ public class RangerServiceTag extends RangerBaseService { if (isConditionDefFound) { ret = super.getDefaultRangerPolicies(); + String tagResourceName = null; + if (!serviceDef.getResources().isEmpty()) { + tagResourceName = serviceDef.getResources().get(0).getName(); - String tagResourceName = serviceDef.getResources().get(0).getName(); + for (RangerPolicy defaultPolicy : ret) { - for (RangerPolicy defaultPolicy : ret) { + RangerPolicy.RangerPolicyResource tagPolicyResource = defaultPolicy.getResources().get(tagResourceName); - RangerPolicy.RangerPolicyResource tagPolicyResource = defaultPolicy.getResources().get(tagResourceName); + if (tagPolicyResource != null) { - if (tagPolicyResource != null) { + String value = RANGER_TAG_NAME_EXPIRES_ON; - String value = RANGER_TAG_NAME_EXPIRES_ON; + tagPolicyResource.setValue(value); + defaultPolicy.setName(value); + defaultPolicy.setDescription("Policy for data with " + value + " tag"); - tagPolicyResource.setValue(value); - defaultPolicy.setName(value); - defaultPolicy.setDescription("Policy for data with " + value + " tag"); + List<RangerPolicy.RangerPolicyItem> defaultPolicyItems = defaultPolicy.getPolicyItems(); - List<RangerPolicy.RangerPolicyItem> defaultPolicyItems = defaultPolicy.getPolicyItems(); + for (RangerPolicy.RangerPolicyItem defaultPolicyItem : defaultPolicyItems) { - for (RangerPolicy.RangerPolicyItem defaultPolicyItem : defaultPolicyItems) { + List<String> groups = new ArrayList<String>(); + groups.add(GROUP_PUBLIC); + defaultPolicyItem.setGroups(groups); - List<String> groups = new ArrayList<String>(); - groups.add(GROUP_PUBLIC); - defaultPolicyItem.setGroups(groups); + List<RangerPolicy.RangerPolicyItemCondition> policyItemConditions = new ArrayList<RangerPolicy.RangerPolicyItemCondition>(); + List<String> values = new ArrayList<String>(); + values.add("yes"); + RangerPolicy.RangerPolicyItemCondition policyItemCondition = new RangerPolicy.RangerPolicyItemCondition(RANGER_TAG_EXPIRY_CONDITION_NAME, values); + policyItemConditions.add(policyItemCondition); - List<RangerPolicy.RangerPolicyItemCondition> policyItemConditions = new ArrayList<RangerPolicy.RangerPolicyItemCondition>(); - List<String> values = new ArrayList<String>(); - values.add("yes"); - RangerPolicy.RangerPolicyItemCondition policyItemCondition = new RangerPolicy.RangerPolicyItemCondition(RANGER_TAG_EXPIRY_CONDITION_NAME, values); - policyItemConditions.add(policyItemCondition); + defaultPolicyItem.setConditions(policyItemConditions); + defaultPolicyItem.setDelegateAdmin(Boolean.FALSE); + } - defaultPolicyItem.setConditions(policyItemConditions); - defaultPolicyItem.setDelegateAdmin(Boolean.FALSE); + defaultPolicy.setDenyPolicyItems(defaultPolicyItems); + defaultPolicy.setPolicyItems(null); } - - defaultPolicy.setDenyPolicyItems(defaultPolicyItems); - defaultPolicy.setPolicyItems(null); } } } else { http://git-wip-us.apache.org/repos/asf/ranger/blob/90661368/storm-agent/src/main/java/org/apache/ranger/services/storm/RangerServiceStorm.java ---------------------------------------------------------------------- diff --git a/storm-agent/src/main/java/org/apache/ranger/services/storm/RangerServiceStorm.java b/storm-agent/src/main/java/org/apache/ranger/services/storm/RangerServiceStorm.java index d4dbd7b..1b71cd7 100644 --- a/storm-agent/src/main/java/org/apache/ranger/services/storm/RangerServiceStorm.java +++ b/storm-agent/src/main/java/org/apache/ranger/services/storm/RangerServiceStorm.java @@ -55,12 +55,12 @@ public class RangerServiceStorm extends RangerBaseService { try { ret = StormResourceMgr.validateConfig(serviceName, configs); } catch (Exception e) { - LOG.error("<== RangerServiceKnox.validateConfig Error:" + e); + LOG.error("<== RangerServiceStorm.validateConfig Error:" + e); throw e; } } if(LOG.isDebugEnabled()) { - LOG.debug("<== RangerServiceKnox.validateConfig Response : (" + ret + " )"); + LOG.debug("<== RangerServiceStorm.validateConfig Response : (" + ret + " )"); } return ret; } @@ -72,19 +72,19 @@ public class RangerServiceStorm extends RangerBaseService { String serviceName = getServiceName(); Map<String,String> configs = getConfigs(); if(LOG.isDebugEnabled()) { - LOG.debug("==> RangerServiceKnox.lookupResource Context: (" + context + ")"); + LOG.debug("==> RangerServiceStorm.lookupResource Context: (" + context + ")"); } if (context != null) { try { ret = StormResourceMgr.getStormResources(serviceName,configs,context); } catch (Exception e) { - LOG.error( "<==RangerServiceKnox.lookupResource Error : " + e); + LOG.error( "<==RangerServiceStorm.lookupResource Error : " + e); throw e; } } if(LOG.isDebugEnabled()) { - LOG.debug("<== RangerServiceKnox.lookupResource Response: (" + ret + ")"); + LOG.debug("<== RangerServiceStorm.lookupResource Response: (" + ret + ")"); } return ret; }
