Repository: ranger Updated Branches: refs/heads/master 12d9e21ac -> 252af4910
RANGER-1932: Create default YARN policy with correct policy-resource value Project: http://git-wip-us.apache.org/repos/asf/ranger/repo Commit: http://git-wip-us.apache.org/repos/asf/ranger/commit/252af491 Tree: http://git-wip-us.apache.org/repos/asf/ranger/tree/252af491 Diff: http://git-wip-us.apache.org/repos/asf/ranger/diff/252af491 Branch: refs/heads/master Commit: 252af49103e8a93517b402be31d7c2822204ff73 Parents: 12d9e21 Author: Abhay Kulkarni <[email protected]> Authored: Wed Jan 3 13:31:25 2018 -0800 Committer: Abhay Kulkarni <[email protected]> Committed: Wed Jan 3 13:31:25 2018 -0800 ---------------------------------------------------------------------- .../org/apache/ranger/services/yarn/RangerServiceYarn.java | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ranger/blob/252af491/plugin-yarn/src/main/java/org/apache/ranger/services/yarn/RangerServiceYarn.java ---------------------------------------------------------------------- diff --git a/plugin-yarn/src/main/java/org/apache/ranger/services/yarn/RangerServiceYarn.java b/plugin-yarn/src/main/java/org/apache/ranger/services/yarn/RangerServiceYarn.java index a10c1ca..9e62152 100644 --- a/plugin-yarn/src/main/java/org/apache/ranger/services/yarn/RangerServiceYarn.java +++ b/plugin-yarn/src/main/java/org/apache/ranger/services/yarn/RangerServiceYarn.java @@ -22,13 +22,11 @@ import java.util.HashMap; import java.util.List; import java.util.Map; -import org.apache.commons.lang.StringUtils; import org.apache.ranger.authorization.yarn.authorizer.RangerYarnAuthorizer; import org.apache.ranger.plugin.model.RangerPolicy; import org.apache.ranger.plugin.model.RangerService; import org.apache.ranger.plugin.model.RangerServiceDef; import org.apache.ranger.plugin.resourcematcher.RangerAbstractResourceMatcher; -import org.apache.ranger.plugin.resourcematcher.RangerPathResourceMatcher; import org.apache.ranger.plugin.service.RangerBaseService; import org.apache.ranger.plugin.service.ResourceLookupContext; import org.apache.ranger.services.yarn.client.YarnResourceMgr; @@ -113,12 +111,7 @@ public class RangerServiceYarn extends RangerBaseService { } } if (queueResourceDef != null) { - String pathSeparator = queueResourceDef.getMatcherOptions().get(RangerPathResourceMatcher.OPTION_PATH_SEPARATOR); - if (StringUtils.isBlank(pathSeparator)) { - pathSeparator = "."; - } - String value = RangerAbstractResourceMatcher.WILDCARD_ASTERISK + pathSeparator + RangerAbstractResourceMatcher.WILDCARD_ASTERISK; - queuePolicyResource.setValue(value); + queuePolicyResource.setValue(RangerAbstractResourceMatcher.WILDCARD_ASTERISK); } else { LOG.warn("No resourceDef found in YARN service-definition for '" + queueResourceName + "'"); }
