MAPREDUCE-5725. Make explicit that TestNetworkedJob relies on the Capacity Scheduler (Sandy Ryza)
git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1559882 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
parent
c5a241f1dd
commit
362e4fc891
|
@ -203,6 +203,9 @@ Release 2.4.0 - UNRELEASED
|
|||
MAPREDUCE-5672. Provide optional RollingFileAppender for container log4j
|
||||
(syslog) (Gera Shegalov via jlowe)
|
||||
|
||||
MAPREDUCE-5725. Make explicit that TestNetworkedJob relies on the Capacity
|
||||
Scheduler (Sandy Ryza)
|
||||
|
||||
OPTIMIZATIONS
|
||||
|
||||
MAPREDUCE-5484. YarnChild unnecessarily loads job conf twice (Sandy Ryza)
|
||||
|
|
|
@ -45,7 +45,9 @@ import org.apache.hadoop.mapred.lib.IdentityMapper;
|
|||
import org.apache.hadoop.mapred.lib.IdentityReducer;
|
||||
import org.apache.hadoop.mapreduce.Cluster.JobTrackerStatus;
|
||||
import org.apache.hadoop.mapreduce.Job;
|
||||
import org.apache.hadoop.yarn.conf.YarnConfiguration;
|
||||
import org.apache.hadoop.yarn.exceptions.YarnRuntimeException;
|
||||
import org.apache.hadoop.yarn.server.resourcemanager.scheduler.capacity.CapacityScheduler;
|
||||
import org.junit.Test;
|
||||
import org.apache.hadoop.security.UserGroupInformation;
|
||||
import org.apache.hadoop.security.token.Token;
|
||||
|
@ -76,8 +78,7 @@ public class TestNetworkedJob {
|
|||
FileSystem fileSys = null;
|
||||
|
||||
try {
|
||||
mr = MiniMRClientClusterFactory.create(this.getClass(), 2,
|
||||
new Configuration());
|
||||
mr = createMiniClusterWithCapacityScheduler();
|
||||
|
||||
JobConf job = new JobConf(mr.getConfig());
|
||||
|
||||
|
@ -129,8 +130,7 @@ public class TestNetworkedJob {
|
|||
FileSystem fileSys = null;
|
||||
|
||||
try {
|
||||
Configuration conf = new Configuration();
|
||||
mr = MiniMRClientClusterFactory.create(this.getClass(), 2, conf);
|
||||
mr = createMiniClusterWithCapacityScheduler();
|
||||
|
||||
JobConf job = new JobConf(mr.getConfig());
|
||||
|
||||
|
@ -315,8 +315,7 @@ public class TestNetworkedJob {
|
|||
FileSystem fileSys = null;
|
||||
PrintStream oldOut = System.out;
|
||||
try {
|
||||
Configuration conf = new Configuration();
|
||||
mr = MiniMRClientClusterFactory.create(this.getClass(), 2, conf);
|
||||
mr = createMiniClusterWithCapacityScheduler();
|
||||
|
||||
JobConf job = new JobConf(mr.getConfig());
|
||||
|
||||
|
@ -392,4 +391,13 @@ public class TestNetworkedJob {
|
|||
}
|
||||
}
|
||||
}
|
||||
|
||||
private MiniMRClientCluster createMiniClusterWithCapacityScheduler()
|
||||
throws IOException {
|
||||
Configuration conf = new Configuration();
|
||||
// Expected queue names depending on Capacity Scheduler queue naming
|
||||
conf.setClass(YarnConfiguration.RM_SCHEDULER, CapacityScheduler.class,
|
||||
CapacityScheduler.class);
|
||||
return MiniMRClientClusterFactory.create(this.getClass(), 2, conf);
|
||||
}
|
||||
}
|
||||
|
|
Loading…
Reference in New Issue