Repository: hadoop Updated Branches: refs/heads/branch-3.1 35e09fe59 -> 70efe253f
YARN-8944. TestContainerAllocation.testUserLimitAllocationMultipleContainers failure after YARN-8896. Contributed by Wilfred Spiegelenburg. (cherry picked from commit 1d90a0dd23c5d1bd52d04c303506806d0dc61cd2) Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/70efe253 Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/70efe253 Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/70efe253 Branch: refs/heads/branch-3.1 Commit: 70efe253f369f579f05d833d45e6a1bae3e41dfe Parents: 35e09fe Author: Weiwei Yang <[email protected]> Authored: Mon Oct 29 11:53:10 2018 +0800 Committer: Weiwei Yang <[email protected]> Committed: Mon Oct 29 11:56:31 2018 +0800 ---------------------------------------------------------------------- .../scheduler/capacity/TestContainerAllocation.java | 4 ++++ 1 file changed, 4 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hadoop/blob/70efe253/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/capacity/TestContainerAllocation.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/scheduler/capacity/TestContainerAllocation.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/capacity/TestContainerAllocation.java index d5f6ab1..93c35e4 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/capacity/TestContainerAllocation.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-resourcemanager/src/test/java/org/apache/hadoop/yarn/server/resourcemanager/scheduler/capacity/TestContainerAllocation.java @@ -70,6 +70,7 @@ import org.junit.Before; import org.junit.Test; import static org.apache.hadoop.yarn.server.resourcemanager.scheduler.capacity.CapacitySchedulerConfiguration.MAXIMUM_ALLOCATION_MB; +import static org.apache.hadoop.yarn.server.resourcemanager.scheduler.capacity.CapacitySchedulerConfiguration.MAX_ASSIGN_PER_HEARTBEAT; public class TestContainerAllocation { @@ -906,6 +907,9 @@ public class TestContainerAllocation { CapacitySchedulerConfiguration newConf = (CapacitySchedulerConfiguration) TestUtils .getConfigurationWithMultipleQueues(conf); + // make sure an unlimited number of containers can be assigned, + // overriding the default of 100 after YARN-8896 + newConf.set(MAX_ASSIGN_PER_HEARTBEAT, "-1"); newConf.setUserLimit("root.c", 50); MockRM rm1 = new MockRM(newConf); --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
