Explorar o código

YARN-7310. TestAMRMProxy#testAMRMProxyE2E fails with FairScheduler. (Robert Kanter via Haibo Chen)

(cherry picked from commit 3fb47188867124bf18fb798b460928b3557ab9a1)
Haibo Chen %!s(int64=7) %!d(string=hai) anos
pai
achega
1134060678

+ 4 - 0
hadoop-yarn-project/hadoop-yarn/hadoop-yarn-client/src/test/java/org/apache/hadoop/yarn/client/api/impl/TestAMRMProxy.java

@@ -44,6 +44,7 @@ import org.apache.hadoop.yarn.conf.YarnConfiguration;
 import org.apache.hadoop.yarn.server.MiniYARNCluster;
 import org.apache.hadoop.yarn.server.resourcemanager.rmapp.RMApp;
 import org.apache.hadoop.yarn.server.resourcemanager.rmapp.RMAppState;
+import org.apache.hadoop.yarn.server.resourcemanager.scheduler.fair.FairSchedulerConfiguration;
 import org.junit.Assert;
 import org.junit.Test;
 
@@ -67,6 +68,9 @@ public class TestAMRMProxy extends BaseAMRMProxyE2ETest {
             YarnClient rmClient = YarnClient.createYarnClient()) {
       Configuration conf = new YarnConfiguration();
       conf.setBoolean(YarnConfiguration.AMRM_PROXY_ENABLED, true);
+      // Make sure if using FairScheduler that we can assign multiple containers
+      // in a single heartbeat later
+      conf.setBoolean(FairSchedulerConfiguration.ASSIGN_MULTIPLE, true);
       cluster.init(conf);
       cluster.start();
       final Configuration yarnConf = cluster.getConfig();