MAPREDUCE-2012. Some contrib tests fail in branch 0.21 and trunk. Contributed by Amareshwari Sriramadasu.
git-svn-id: https://svn.apache.org/repos/asf/hadoop/mapreduce/trunk@985616 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/CHANGES.txt b/CHANGES.txt
index 1f52d4a..d00f929 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1748,3 +1748,5 @@
MAPREDUCE-1926. MapReduce distribution is missing build-utils.xml.
(tomwhite)
+ MAPREDUCE-2012. Some contrib tests fail in branch 0.21 and trunk.
+ (Amareshwari Sriramadasu via tomwhite)
diff --git a/src/contrib/capacity-scheduler/src/test/org/apache/hadoop/mapred/TestCapacitySchedulerWithJobTracker.java b/src/contrib/capacity-scheduler/src/test/org/apache/hadoop/mapred/TestCapacitySchedulerWithJobTracker.java
index 1d1928e..546c01d 100644
--- a/src/contrib/capacity-scheduler/src/test/org/apache/hadoop/mapred/TestCapacitySchedulerWithJobTracker.java
+++ b/src/contrib/capacity-scheduler/src/test/org/apache/hadoop/mapred/TestCapacitySchedulerWithJobTracker.java
@@ -43,6 +43,7 @@
clusterProps.put(TTConfig.TT_MAP_SLOTS, String.valueOf(1));
clusterProps.put(TTConfig.TT_REDUCE_SLOTS, String.valueOf(1));
clusterProps.put(JTConfig.JT_TASKS_PER_JOB, String.valueOf(1));
+ clusterProps.put(JTConfig.JT_PERSIST_JOBSTATUS, "false");
// cluster capacity 1 maps, 1 reduces
startCluster(1, clusterProps, schedulerProps);
CapacityTaskScheduler scheduler = (CapacityTaskScheduler) getJobTracker()
@@ -87,6 +88,7 @@
clusterProps.put(TTConfig.TT_MAP_SLOTS, String.valueOf(2));
clusterProps.put(TTConfig.TT_REDUCE_SLOTS, String.valueOf(2));
clusterProps.put("mapred.queue.names", queues[0] + "," + queues[1]);
+ clusterProps.put(JTConfig.JT_PERSIST_JOBSTATUS, "false");
startCluster(2, clusterProps, schedulerProps);
CapacityTaskScheduler scheduler = (CapacityTaskScheduler) getJobTracker()
.getTaskScheduler();
diff --git a/src/contrib/mumak/src/test/org/apache/hadoop/mapred/TestSimulatorDeterministicReplay.java b/src/contrib/mumak/src/test/org/apache/hadoop/mapred/TestSimulatorDeterministicReplay.java
index 06f65ee..191638d 100644
--- a/src/contrib/mumak/src/test/org/apache/hadoop/mapred/TestSimulatorDeterministicReplay.java
+++ b/src/contrib/mumak/src/test/org/apache/hadoop/mapred/TestSimulatorDeterministicReplay.java
@@ -24,6 +24,7 @@
import org.apache.hadoop.conf.Configuration;
import org.apache.hadoop.fs.FileSystem;
import org.apache.hadoop.fs.Path;
+import org.apache.hadoop.mapreduce.server.jobtracker.JTConfig;
import org.apache.hadoop.util.ToolRunner;
import org.apache.hadoop.util.Shell.ShellCommandExecutor;
@@ -102,6 +103,7 @@
conf.set("hadoop.log.dir", hadoopLogDir.toString());
conf.set("mapred.job.tracker.http.address",
"0.0.0.0:" + jobTrackerHttpPort);
+ conf.setBoolean(JTConfig.JT_PERSIST_JOBSTATUS, false);
String[] args = { traceFile.toString(), topologyFile.toString() };
int res = ToolRunner.run(conf, new SimulatorEngine(), args);
Assert.assertEquals(0, res);
diff --git a/src/contrib/mumak/src/test/org/apache/hadoop/mapred/TestSimulatorEndToEnd.java b/src/contrib/mumak/src/test/org/apache/hadoop/mapred/TestSimulatorEndToEnd.java
index 88b377a..4698280 100644
--- a/src/contrib/mumak/src/test/org/apache/hadoop/mapred/TestSimulatorEndToEnd.java
+++ b/src/contrib/mumak/src/test/org/apache/hadoop/mapred/TestSimulatorEndToEnd.java
@@ -27,6 +27,7 @@
import org.apache.hadoop.fs.FileSystem;
import org.apache.hadoop.fs.Path;
import org.apache.hadoop.mapred.MockSimulatorEngine;
+import org.apache.hadoop.mapreduce.server.jobtracker.JTConfig;
import org.apache.hadoop.tools.rumen.ZombieCluster;
import org.apache.hadoop.tools.rumen.ZombieJobProducer;
import org.apache.hadoop.util.ToolRunner;
@@ -58,6 +59,7 @@
Configuration mumakConf = new Configuration();
mumakConf.set("mapred.jobtracker.taskScheduler", JobQueueTaskScheduler.class.getName());
+ mumakConf.setBoolean(JTConfig.JT_PERSIST_JOBSTATUS, false);
String[] args = { traceFile.toString(), topologyFile.toString() };
int res = ToolRunner.run(mumakConf, mockMumak, args);
Assert.assertEquals(res, 0);
diff --git a/src/contrib/mumak/src/test/org/apache/hadoop/mapred/TestSimulatorJobTracker.java b/src/contrib/mumak/src/test/org/apache/hadoop/mapred/TestSimulatorJobTracker.java
index 2f48607..0374db1 100644
--- a/src/contrib/mumak/src/test/org/apache/hadoop/mapred/TestSimulatorJobTracker.java
+++ b/src/contrib/mumak/src/test/org/apache/hadoop/mapred/TestSimulatorJobTracker.java
@@ -32,6 +32,7 @@
import org.apache.hadoop.mapred.TaskStatus.Phase;
import org.apache.hadoop.mapred.TaskStatus.State;
import org.apache.hadoop.mapreduce.protocol.ClientProtocol;
+import org.apache.hadoop.mapreduce.server.jobtracker.JTConfig;
import org.apache.hadoop.conf.Configuration;
import org.apache.hadoop.mapred.FakeJobs;
@@ -58,6 +59,7 @@
+ jtConf.getUser())
+ "/mapred/system");
jtConf.set("mapred.queue.names",JobConf.DEFAULT_QUEUE_NAME);
+ jtConf.setBoolean(JTConfig.JT_PERSIST_JOBSTATUS, false);
System.out.println("Created JobConf");
return jtConf;
}
diff --git a/src/contrib/streaming/src/test/org/apache/hadoop/streaming/TestStreamingBadRecords.java b/src/contrib/streaming/src/test/org/apache/hadoop/streaming/TestStreamingBadRecords.java
index e345852..6b8ba04 100644
--- a/src/contrib/streaming/src/test/org/apache/hadoop/streaming/TestStreamingBadRecords.java
+++ b/src/contrib/streaming/src/test/org/apache/hadoop/streaming/TestStreamingBadRecords.java
@@ -71,6 +71,7 @@
protected void setUp() throws Exception {
Properties props = new Properties();
props.setProperty(JTConfig.JT_RETIREJOBS, "false");
+ props.setProperty(JTConfig.JT_PERSIST_JOBSTATUS, "false");
startCluster(true, props);
}
diff --git a/src/contrib/streaming/src/test/org/apache/hadoop/streaming/TestStreamingStatus.java b/src/contrib/streaming/src/test/org/apache/hadoop/streaming/TestStreamingStatus.java
index 0b353b5..dbffb97 100644
--- a/src/contrib/streaming/src/test/org/apache/hadoop/streaming/TestStreamingStatus.java
+++ b/src/contrib/streaming/src/test/org/apache/hadoop/streaming/TestStreamingStatus.java
@@ -103,6 +103,7 @@
public void setUp() throws IOException {
conf = new JobConf();
conf.setBoolean(JTConfig.JT_RETIREJOBS, false);
+ conf.setBoolean(JTConfig.JT_PERSIST_JOBSTATUS, false);
mr = new MiniMRCluster(1, "file:///", 3, null , null, conf);
diff --git a/src/contrib/streaming/src/test/org/apache/hadoop/streaming/TestStreamingTaskLog.java b/src/contrib/streaming/src/test/org/apache/hadoop/streaming/TestStreamingTaskLog.java
index c8c92e6..6a871da 100644
--- a/src/contrib/streaming/src/test/org/apache/hadoop/streaming/TestStreamingTaskLog.java
+++ b/src/contrib/streaming/src/test/org/apache/hadoop/streaming/TestStreamingTaskLog.java
@@ -26,6 +26,7 @@
import org.apache.hadoop.mapred.JobConf;
import org.apache.hadoop.mapred.MiniMRCluster;
import org.apache.hadoop.mapreduce.MapReduceTestUtil;
+import org.apache.hadoop.mapreduce.server.jobtracker.JTConfig;
import org.apache.hadoop.util.Shell;
import org.junit.Test;
@@ -71,7 +72,7 @@
public void testStreamingTaskLogWithHadoopCmd() {
try {
final int numSlaves = 1;
- Configuration conf = new Configuration();
+ JobConf conf = new JobConf();
fs = FileSystem.getLocal(conf);
Path testDir = new Path(System.getProperty("test.build.data","/tmp"));
@@ -81,8 +82,9 @@
fs.mkdirs(testDir);
File scriptFile = createScript(
testDir.toString() + "/testTaskLog.sh");
- mr = new MiniMRCluster(numSlaves, fs.getUri().toString(), 1);
-
+ conf.setBoolean(JTConfig.JT_PERSIST_JOBSTATUS, false);
+ mr = new MiniMRCluster(numSlaves, fs.getUri().toString(), 1, null, null, conf);
+
writeInputFile(fs, inputPath);
map = scriptFile.getAbsolutePath();
diff --git a/src/test/mapred/org/apache/hadoop/mapred/ClusterWithLinuxTaskController.java b/src/test/mapred/org/apache/hadoop/mapred/ClusterWithLinuxTaskController.java
index 5d54866..2a474a0 100644
--- a/src/test/mapred/org/apache/hadoop/mapred/ClusterWithLinuxTaskController.java
+++ b/src/test/mapred/org/apache/hadoop/mapred/ClusterWithLinuxTaskController.java
@@ -175,6 +175,7 @@
dfsCluster = new MiniDFSCluster(conf, NUMBER_OF_NODES, true, null);
conf.set(TTConfig.TT_TASK_CONTROLLER,
MyLinuxTaskController.class.getName());
+ conf.setBoolean(JTConfig.JT_PERSIST_JOBSTATUS, false);
mrCluster =
new MiniMRCluster(NUMBER_OF_NODES, dfsCluster.getFileSystem().getUri()
.toString(), 4, null, null, conf);
