Repository: hadoop Updated Branches: refs/heads/branch-3.0 dbf6c48af -> b7cef4e93
YARN-7309. TestClientRMService#testUpdateApplicationPriorityRequest and TestClientRMService#testUpdatePriorityAndKillAppWithZeroClusterResource test functionality not supported by FairScheduler (rkanter) (cherry picked from commit ec8bf9e48ac4dc675516a57c06a29890b5138548) Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/b7cef4e9 Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/b7cef4e9 Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/b7cef4e9 Branch: refs/heads/branch-3.0 Commit: b7cef4e93456f8c9ddb5a0a88436f433f85db34a Parents: dbf6c48 Author: Robert Kanter <rkan...@apache.org> Authored: Tue Oct 10 10:14:42 2017 -0700 Committer: Robert Kanter <rkan...@apache.org> Committed: Fri Oct 13 13:57:40 2017 -0700 ---------------------------------------------------------------------- .../yarn/server/resourcemanager/TestClientRMService.java | 8 ++++++++ 1 file changed, 8 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hadoop/blob/b7cef4e9/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/TestClientRMService.java ---------------------------------------------------------------------- diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/TestClientRMService.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/TestClientRMService.java index 1e4bfbd..48251c2 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/TestClientRMService.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/TestClientRMService.java @@ -145,6 +145,7 @@ import org.apache.hadoop.yarn.server.resourcemanager.scheduler.SchedulerAppRepor import org.apache.hadoop.yarn.server.resourcemanager.scheduler.YarnScheduler; import org.apache.hadoop.yarn.server.resourcemanager.scheduler.capacity.CapacityScheduler; import org.apache.hadoop.yarn.server.resourcemanager.scheduler.capacity.CapacitySchedulerConfiguration; +import org.apache.hadoop.yarn.server.resourcemanager.scheduler.fair.FairScheduler; import org.apache.hadoop.yarn.server.resourcemanager.security.QueueACLsManager; import org.apache.hadoop.yarn.server.resourcemanager.timelineservice.RMTimelineCollectorManager; @@ -156,6 +157,7 @@ import org.apache.hadoop.yarn.util.UTCClock; import org.apache.hadoop.yarn.util.resource.ResourceCalculator; import org.apache.hadoop.yarn.util.resource.Resources; import org.junit.Assert; +import org.junit.Assume; import org.junit.Test; import com.google.common.collect.ImmutableSet; @@ -1942,6 +1944,9 @@ public class TestClientRMService { int maxPriority = 10; int appPriority = 5; YarnConfiguration conf = new YarnConfiguration(); + Assume.assumeFalse("FairScheduler does not support Application Priorities", + conf.get(YarnConfiguration.RM_SCHEDULER) + .equals(FairScheduler.class.getName())); conf.setInt(YarnConfiguration.MAX_CLUSTER_LEVEL_APPLICATION_PRIORITY, maxPriority); MockRM rm = new MockRM(conf); @@ -1960,6 +1965,9 @@ public class TestClientRMService { int maxPriority = 10; int appPriority = 5; YarnConfiguration conf = new YarnConfiguration(); + Assume.assumeFalse("FairScheduler does not support Application Priorities", + conf.get(YarnConfiguration.RM_SCHEDULER) + .equals(FairScheduler.class.getName())); conf.setInt(YarnConfiguration.MAX_CLUSTER_LEVEL_APPLICATION_PRIORITY, maxPriority); MockRM rm = new MockRM(conf); --------------------------------------------------------------------- To unsubscribe, e-mail: common-commits-unsubscr...@hadoop.apache.org For additional commands, e-mail: common-commits-h...@hadoop.apache.org
