|
18 | 18 |
|
19 | 19 | package org.apache.hadoop.yarn.server.resourcemanager.placement.csmappingrule; |
20 | 20 |
|
| 21 | +import org.apache.commons.logging.Log; |
| 22 | +import org.apache.commons.logging.LogFactory; |
| 23 | +import org.apache.commons.logging.impl.Log4JLogger; |
21 | 24 | import org.apache.hadoop.conf.Configuration; |
22 | 25 | import org.apache.hadoop.security.GroupMappingServiceProvider; |
23 | 26 | import org.apache.hadoop.thirdparty.com.google.common.collect.ImmutableMap; |
|
33 | 36 | import org.apache.hadoop.yarn.server.resourcemanager.scheduler.capacity.CapacitySchedulerConfiguration; |
34 | 37 | import org.apache.hadoop.yarn.server.resourcemanager.scheduler.capacity.CapacitySchedulerQueueManager; |
35 | 38 | import org.apache.hadoop.yarn.util.Records; |
| 39 | +import org.apache.log4j.Level; |
36 | 40 | import org.junit.Rule; |
37 | 41 | import org.junit.Test; |
38 | 42 | import org.junit.rules.TemporaryFolder; |
@@ -857,6 +861,59 @@ public List<MappingRule> getMappingRules() { |
857 | 861 | assertPlace(engine, app, user, "root.man.testGroup0"); |
858 | 862 | } |
859 | 863 |
|
| 864 | + @Test |
| 865 | + public void testUserNameSetDefaultAndPlaceWith2Rules() throws IOException { |
| 866 | + Log log = LogFactory.getLog("org.apache.hadoop.yarn.server.resourcemanager.placement"); |
| 867 | + if (log instanceof Log4JLogger) { |
| 868 | + org.apache.log4j.Logger logger = ((Log4JLogger) log).getLogger(); |
| 869 | + logger.setLevel(Level.DEBUG); |
| 870 | + } |
| 871 | + |
| 872 | + List<MappingRule> rules = new ArrayList<>(); |
| 873 | + rules.add( |
| 874 | + new MappingRule( |
| 875 | + MappingRuleMatchers.createUserMatcher("test.user"), |
| 876 | + (MappingRuleActions.createUpdateDefaultAction("root.user")) |
| 877 | + .setFallbackSkip())); |
| 878 | + rules.add(new MappingRule( |
| 879 | + MappingRuleMatchers.createUserMatcher("test.user"), |
| 880 | + (MappingRuleActions.createPlaceToDefaultAction()) |
| 881 | + .setFallbackReject())); |
| 882 | + |
| 883 | + CSMappingPlacementRule engine = setupEngine(true, rules); |
| 884 | + ApplicationSubmissionContext app = createApp("app"); |
| 885 | + assertPlace( |
| 886 | + "test.user should be placed to root.user", |
| 887 | + engine, app, "test.user", "root.user"); |
| 888 | + } |
| 889 | + |
| 890 | + @Test |
| 891 | + public void testUserNameSetDefaultAndPlaceWith2RulesUsernameReplacedWithDot() throws IOException { |
| 892 | + Log log = LogFactory.getLog("org.apache.hadoop.yarn.server.resourcemanager.placement"); |
| 893 | + if (log instanceof Log4JLogger) { |
| 894 | + org.apache.log4j.Logger logger = ((Log4JLogger) log).getLogger(); |
| 895 | + logger.setLevel(Level.DEBUG); |
| 896 | + } |
| 897 | + |
| 898 | + |
| 899 | + ArrayList<MappingRule> rules = new ArrayList<>(); |
| 900 | + rules.add( |
| 901 | + new MappingRule( |
| 902 | + MappingRuleMatchers.createUserMatcher("test_dot_user"), |
| 903 | + (MappingRuleActions.createUpdateDefaultAction("root.user.bob")) |
| 904 | + .setFallbackSkip())); |
| 905 | + rules.add(new MappingRule( |
| 906 | + MappingRuleMatchers.createUserMatcher("test_dot_user"), |
| 907 | + (MappingRuleActions.createPlaceToDefaultAction()) |
| 908 | + .setFallbackReject())); |
| 909 | + |
| 910 | + CSMappingPlacementRule engine = setupEngine(true, rules); |
| 911 | + ApplicationSubmissionContext app = createApp("app"); |
| 912 | + assertPlace( |
| 913 | + "test.user should be placed to root.user.bob", |
| 914 | + engine, app, "test.user", "root.user.bob"); |
| 915 | + } |
| 916 | + |
860 | 917 | private CSMappingPlacementRule initPlacementEngine(CapacityScheduler cs) throws IOException { |
861 | 918 | CSMappingPlacementRule engine = new CSMappingPlacementRule(); |
862 | 919 | engine.setFailOnConfigError(true); |
|
0 commit comments