Apache
/
hadoop
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

MAPREDUCE-5828. Fixed a test issue with TestMapReduceJobControl that was causing it to fail on Windows. Contributed by Vinod Kumar Vavilapalli. 

git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1587089 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Vinod Kumar Vavilapalli 2014-04-13 19:55:32 +00:00
parent 193f11a7ab
commit 6351ee2a78
2 changed files with 21 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
hadoop-mapreduce-project/CHANGES.txt
View File

@ -196,6 +196,9 @@ Release 2.4.1 - UNRELEASED
on Windows for temporary files and thus also fix the test-issue with on Windows for temporary files and thus also fix the test-issue with
TestHistoryServerFileSystemStateStoreService. (Varun Vasudev via vinodkv) TestHistoryServerFileSystemStateStoreService. (Varun Vasudev via vinodkv)
MAPREDUCE-5828. Fixed a test issue with TestMapReduceJobControl that was
causing it to fail on Windows. (vinodkv)
Release 2.4.0 - 2014-04-07 Release 2.4.0 - 2014-04-07
INCOMPATIBLE CHANGES INCOMPATIBLE CHANGES

19
hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapreduce/lib/jobcontrol/TestMapReduceJobControl.java
View File

@ -24,6 +24,8 @@ import java.util.List;
import junit.framework.Assert; import junit.framework.Assert;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.conf.Configuration;
import org.apache.hadoop.fs.FileSystem; import org.apache.hadoop.fs.FileSystem;
import org.apache.hadoop.fs.Path; import org.apache.hadoop.fs.Path;
@ -38,6 +40,9 @@ import org.junit.Test;
*/ */
public class TestMapReduceJobControl extends HadoopTestCase { public class TestMapReduceJobControl extends HadoopTestCase {
public static final Log LOG =
LogFactory.getLog(TestMapReduceJobControl.class.getName());
static Path rootDataDir = new Path( static Path rootDataDir = new Path(
System.getProperty("test.build.data", "."), "TestData"); System.getProperty("test.build.data", "."), "TestData");
static Path indir = new Path(rootDataDir, "indir"); static Path indir = new Path(rootDataDir, "indir");
@ -117,6 +122,7 @@ public class TestMapReduceJobControl extends HadoopTestCase {
} }
public void testJobControlWithFailJob() throws Exception { public void testJobControlWithFailJob() throws Exception {
LOG.info("Starting testJobControlWithFailJob");
Configuration conf = createJobConf(); Configuration conf = createJobConf();
cleanupData(conf); cleanupData(conf);
@ -139,6 +145,8 @@ public class TestMapReduceJobControl extends HadoopTestCase {
} }
public void testJobControlWithKillJob() throws Exception { public void testJobControlWithKillJob() throws Exception {
LOG.info("Starting testJobControlWithKillJob");
Configuration conf = createJobConf(); Configuration conf = createJobConf();
cleanupData(conf); cleanupData(conf);
Job job1 = MapReduceTestUtil.createKillJob(conf, outdir_1, indir); Job job1 = MapReduceTestUtil.createKillJob(conf, outdir_1, indir);
@ -175,6 +183,8 @@ public class TestMapReduceJobControl extends HadoopTestCase {
} }
public void testJobControl() throws Exception { public void testJobControl() throws Exception {
LOG.info("Starting testJobControl");
Configuration conf = createJobConf(); Configuration conf = createJobConf();
cleanupData(conf); cleanupData(conf);
@ -193,10 +203,12 @@ public class TestMapReduceJobControl extends HadoopTestCase {
@Test(timeout = 30000) @Test(timeout = 30000)
public void testControlledJob() throws Exception { public void testControlledJob() throws Exception {
LOG.info("Starting testControlledJob");
Configuration conf = createJobConf(); Configuration conf = createJobConf();
cleanupData(conf); cleanupData(conf);
Job job1 = MapReduceTestUtil.createCopyJob(conf, outdir_1, indir); Job job1 = MapReduceTestUtil.createCopyJob(conf, outdir_1, indir);
createDependencies(conf, job1); JobControl theControl = createDependencies(conf, job1);
while (cjob1.getJobState() != ControlledJob.State.RUNNING) { while (cjob1.getJobState() != ControlledJob.State.RUNNING) {
try { try {
Thread.sleep(100); Thread.sleep(100);
@ -205,5 +217,10 @@ public class TestMapReduceJobControl extends HadoopTestCase {
} }
} }
Assert.assertNotNull(cjob1.getMapredJobId()); Assert.assertNotNull(cjob1.getMapredJobId());
// wait till all the jobs complete
waitTillAllFinished(theControl);
assertEquals("Some jobs failed", 0, theControl.getFailedJobList().size());
theControl.stop();
} }
} }