Author: vinodkv
Date: Thu Sep 26 03:00:28 2013
New Revision: 1526362
URL: http://svn.apache.org/r1526362
Log:
MAPREDUCE-5503. Fixed a test issue in TestMRJobClient. Contributed by Jian He.
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/TestJobClient.java
hadoop/common/trunk/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapreduce/TestMRJobClient.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=1526362&r1=1526361&r2=1526362&view=diff
==============================================================================
--- hadoop/common/trunk/hadoop-mapreduce-project/CHANGES.txt (original)
+++ hadoop/common/trunk/hadoop-mapreduce-project/CHANGES.txt Thu Sep 26
03:00:28 2013
@@ -219,6 +219,8 @@ Release 2.1.2 - UNRELEASED
MAPREDUCE-5505. Clients should be notified job finished only after job
successfully unregistered (Zhijie Shen via bikas)
+ MAPREDUCE-5503. Fixed a test issue in TestMRJobClient. (Jian He via
vinodkv)
+
Release 2.1.1-beta - 2013-09-23
INCOMPATIBLE CHANGES
Modified:
hadoop/common/trunk/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapred/TestJobClient.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/TestJobClient.java?rev=1526362&r1=1526361&r2=1526362&view=diff
==============================================================================
---
hadoop/common/trunk/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapred/TestJobClient.java
(original)
+++
hadoop/common/trunk/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapred/TestJobClient.java
Thu Sep 26 03:00:28 2013
@@ -79,7 +79,7 @@ public class TestJobClient extends TestM
Configuration conf = createJobConf();
String jobId = runJob();
testGetCounter(jobId, conf);
- testJobList(jobId, conf);
+ testAllJobList(jobId, conf);
testChangingJobPriority(jobId, conf);
}
Modified:
hadoop/common/trunk/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapreduce/TestMRJobClient.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/mapreduce/TestMRJobClient.java?rev=1526362&r1=1526361&r2=1526362&view=diff
==============================================================================
---
hadoop/common/trunk/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapreduce/TestMRJobClient.java
(original)
+++
hadoop/common/trunk/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapreduce/TestMRJobClient.java
Thu Sep 26 03:00:28 2013
@@ -29,6 +29,8 @@ import java.io.PipedInputStream;
import java.io.PipedOutputStream;
import java.io.PrintStream;
+import junit.framework.Assert;
+
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.apache.hadoop.conf.Configuration;
@@ -60,6 +62,22 @@ public class TestMRJobClient extends Clu
return job;
}
+ private Job runJobInBackGround(Configuration conf) throws Exception {
+ String input = "hello1\nhello2\nhello3\n";
+
+ Job job = MapReduceTestUtil.createJob(conf, getInputDir(), getOutputDir(),
+ 1, 1, input);
+ job.setJobName("mr");
+ job.setPriority(JobPriority.NORMAL);
+ job.submit();
+ int i = 0;
+ while (i++ < 200 && job.getJobID() == null) {
+ LOG.info("waiting for jobId...");
+ Thread.sleep(100);
+ }
+ return job;
+ }
+
public static int runTool(Configuration conf, Tool tool, String[] args,
OutputStream out) throws Exception {
PrintStream oldOut = System.out;
@@ -108,8 +126,10 @@ public class TestMRJobClient extends Clu
Job job = runJob(conf);
String jobId = job.getJobID().toString();
- // test jobs list
- testJobList(jobId, conf);
+ // test all jobs list
+ testAllJobList(jobId, conf);
+ // test only submitted jobs list
+ testSubmittedJobList(conf);
// test job counter
testGetCounter(jobId, conf);
// status
@@ -131,38 +151,37 @@ public class TestMRJobClient extends Clu
// submit job from file
testSubmit(conf);
// kill a task
- testKillTask(job, conf);
+ testKillTask(conf);
// fail a task
- testfailTask(job, conf);
+ testfailTask(conf);
// kill job
- testKillJob(jobId, conf);
-
+ testKillJob(conf);
}
/**
* test fail task
*/
- private void testfailTask(Job job, Configuration conf) throws Exception {
+ private void testfailTask(Configuration conf) throws Exception {
+ Job job = runJobInBackGround(conf);
CLI jc = createJobClient();
TaskID tid = new TaskID(job.getJobID(), TaskType.MAP, 0);
TaskAttemptID taid = new TaskAttemptID(tid, 1);
ByteArrayOutputStream out = new ByteArrayOutputStream();
- // TaskAttemptId is not set
+ // TaskAttemptId is not set
int exitCode = runTool(conf, jc, new String[] { "-fail-task" }, out);
assertEquals("Exit code", -1, exitCode);
- try {
- runTool(conf, jc, new String[] { "-fail-task", taid.toString() }, out);
- fail(" this task should field");
- } catch (IOException e) {
- // task completed !
- assertTrue(e.getMessage().contains("_0001_m_000000_1"));
- }
+ runTool(conf, jc, new String[] { "-fail-task", taid.toString() }, out);
+ String answer = new String(out.toByteArray(), "UTF-8");
+ Assert
+ .assertTrue(answer.contains("Killed task " + taid + " by failing it"));
}
+
/**
* test a kill task
*/
- private void testKillTask(Job job, Configuration conf) throws Exception {
+ private void testKillTask(Configuration conf) throws Exception {
+ Job job = runJobInBackGround(conf);
CLI jc = createJobClient();
TaskID tid = new TaskID(job.getJobID(), TaskType.MAP, 0);
TaskAttemptID taid = new TaskAttemptID(tid, 1);
@@ -171,20 +190,17 @@ public class TestMRJobClient extends Clu
int exitCode = runTool(conf, jc, new String[] { "-kill-task" }, out);
assertEquals("Exit code", -1, exitCode);
- try {
- runTool(conf, jc, new String[] { "-kill-task", taid.toString() }, out);
- fail(" this task should be killed");
- } catch (IOException e) {
- System.out.println(e);
- // task completed
- assertTrue(e.getMessage().contains("_0001_m_000000_1"));
- }
+ runTool(conf, jc, new String[] { "-kill-task", taid.toString() }, out);
+ String answer = new String(out.toByteArray(), "UTF-8");
+ Assert.assertTrue(answer.contains("Killed task " + taid));
}
/**
* test a kill job
*/
- private void testKillJob(String jobId, Configuration conf) throws Exception {
+ private void testKillJob(Configuration conf) throws Exception {
+ Job job = runJobInBackGround(conf);
+ String jobId = job.getJobID().toString();
CLI jc = createJobClient();
ByteArrayOutputStream out = new ByteArrayOutputStream();
@@ -435,7 +451,8 @@ public class TestMRJobClient extends Clu
/**
* print a job list
*/
- protected void testJobList(String jobId, Configuration conf) throws
Exception {
+ protected void testAllJobList(String jobId, Configuration conf)
+ throws Exception {
ByteArrayOutputStream out = new ByteArrayOutputStream();
// bad options
@@ -458,23 +475,31 @@ public class TestMRJobClient extends Clu
}
assertEquals(1, counter);
out.reset();
- // only submitted
- exitCode = runTool(conf, createJobClient(), new String[] { "-list" }, out);
- assertEquals("Exit code", 0, exitCode);
- br = new BufferedReader(new InputStreamReader(new ByteArrayInputStream(
- out.toByteArray())));
+ }
+
+ protected void testSubmittedJobList(Configuration conf) throws Exception {
+ Job job = runJobInBackGround(conf);
+ ByteArrayOutputStream out = new ByteArrayOutputStream();
+ String line;
+ int counter = 0;
+ // only submitted
+ int exitCode =
+ runTool(conf, createJobClient(), new String[] { "-list" }, out);
+ assertEquals("Exit code", 0, exitCode);
+ BufferedReader br =
+ new BufferedReader(new InputStreamReader(new ByteArrayInputStream(
+ out.toByteArray())));
counter = 0;
while ((line = br.readLine()) != null) {
LOG.info("line = " + line);
- if (line.contains(jobId)) {
+ if (line.contains(job.getJobID().toString())) {
counter++;
}
}
// all jobs submitted! no current
assertEquals(1, counter);
-
}
-
+
protected void verifyJobPriority(String jobId, String priority,
Configuration conf, CLI jc) throws Exception {
PipedInputStream pis = new PipedInputStream();
