You are viewing a plain text version of this content. The canonical link for it is here.
Posted to mapreduce-commits@hadoop.apache.org by sa...@apache.org on 2014/01/21 02:23:45 UTC
svn commit: r1559882 - in /hadoop/common/trunk/hadoop-mapreduce-project:
CHANGES.txt
hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapred/TestNetworkedJob.java
Author: sandy
Date: Tue Jan 21 01:23:44 2014
New Revision: 1559882
URL: http://svn.apache.org/r1559882
Log:
MAPREDUCE-5725. Make explicit that TestNetworkedJob relies on the Capacity Scheduler (Sandy Ryza)
Modified:
hadoop/common/trunk/hadoop-mapreduce-project/CHANGES.txt
hadoop/common/trunk/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapred/TestNetworkedJob.java
Modified: hadoop/common/trunk/hadoop-mapreduce-project/CHANGES.txt
URL: http://svn.apache.org/viewvc/hadoop/common/trunk/hadoop-mapreduce-project/CHANGES.txt?rev=1559882&r1=1559881&r2=1559882&view=diff
==============================================================================
--- hadoop/common/trunk/hadoop-mapreduce-project/CHANGES.txt (original)
+++ hadoop/common/trunk/hadoop-mapreduce-project/CHANGES.txt Tue Jan 21 01:23:44 2014
@@ -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)
Modified: hadoop/common/trunk/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapred/TestNetworkedJob.java
URL: http://svn.apache.org/viewvc/hadoop/common/trunk/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapred/TestNetworkedJob.java?rev=1559882&r1=1559881&r2=1559882&view=diff
==============================================================================
--- hadoop/common/trunk/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapred/TestNetworkedJob.java (original)
+++ hadoop/common/trunk/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapred/TestNetworkedJob.java Tue Jan 21 01:23:44 2014
@@ -45,7 +45,9 @@ import org.apache.hadoop.mapred.lib.Iden
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);
+ }
}