From e55d0ef515e75226cd774affab1b6b83a745457d Mon Sep 17 00:00:00 2001 From: Vinod Kumar Vavilapalli Date: Fri, 26 Jul 2013 19:15:36 +0000 Subject: [PATCH] MAPREDUCE-5421. Fixed TestNonExistentJob failure after YARN-873. Contributed by Junping Du. git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1507401 13f79535-47bb-0310-9956-ffa450edef68 --- hadoop-mapreduce-project/CHANGES.txt | 47 ++++++++++--------- .../mapreduce/v2/TestNonExistentJob.java | 18 ++++--- 2 files changed, 33 insertions(+), 32 deletions(-) diff --git a/hadoop-mapreduce-project/CHANGES.txt b/hadoop-mapreduce-project/CHANGES.txt index 345a8a0a7d7..dc4004cd577 100644 --- a/hadoop-mapreduce-project/CHANGES.txt +++ b/hadoop-mapreduce-project/CHANGES.txt @@ -596,9 +596,34 @@ Release 2.1.0-beta - 2013-07-02 MAPREDUCE-5325. MR changes related to YARN-727. ClientRMProtocol.getAllApplications should accept ApplicationType as a parameter. (Xuan Gong via hitesh) + MAPREDUCE-5291. Change MR App to use updated property names in + container-log4j.properties. (Zhijie Shen via sseth) + + MAPREDUCE-5303. Changed MR app after moving ProtoBase to package impl.pb via + YARN-724. (Jian He via vinodkv) + + MAPREDUCE-5312. TestRMNMInfo is failing. (sandyr via tucu) + + MAPREDUCE-5304. mapreduce.Job killTask/failTask/getTaskCompletionEvents + methods have incompatible signature changes. (kkambatl via tucu) + + MAPREDUCE-5298. Moved MapReduce services to YARN-530 stricter lifecycle. + (Steve Loughran via vinodkv) + + MAPREDUCE-5319. Set user.name in job.xml. (Xuan Gong via acmurthy) + + MAPREDUCE-5310. MRAM should not normalize allocation request capabilities. + (tucu) + + MAPREDUCE-5213. Re-assess TokenCache methods marked @Private. + (kkambatl via tucu) + MAPREDUCE-5412. Update MR app to use multiple containers API of ContainerManager after YARN-926. (Jian He via vinodkv) + MAPREDUCE-5421. Fixed TestNonExistentJob failure after YARN-873. (Junping Du + via vinodkv) + BREAKDOWN OF HADOOP-8562 SUBTASKS MAPREDUCE-4739. Some MapReduce tests fail to find winutils. @@ -644,28 +669,6 @@ Release 2.1.0-beta - 2013-07-02 MAPREDUCE-4374. Fix child task environment variable config and add support for Windows. (Chuan Liu via cnauroth) - MAPREDUCE-5291. Change MR App to use updated property names in - container-log4j.properties. (Zhijie Shen via sseth) - - MAPREDUCE-5303. Changed MR app after moving ProtoBase to package impl.pb via - YARN-724. (Jian He via vinodkv) - - MAPREDUCE-5312. TestRMNMInfo is failing. (sandyr via tucu) - - MAPREDUCE-5304. mapreduce.Job killTask/failTask/getTaskCompletionEvents - methods have incompatible signature changes. (kkambatl via tucu) - - MAPREDUCE-5298. Moved MapReduce services to YARN-530 stricter lifecycle. - (Steve Loughran via vinodkv) - - MAPREDUCE-5319. Set user.name in job.xml. (Xuan Gong via acmurthy) - - MAPREDUCE-5310. MRAM should not normalize allocation request capabilities. - (tucu) - - MAPREDUCE-5213. Re-assess TokenCache methods marked @Private. - (kkambatl via tucu) - Release 2.0.5-alpha - 06/06/2013 INCOMPATIBLE CHANGES diff --git a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapreduce/v2/TestNonExistentJob.java b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapreduce/v2/TestNonExistentJob.java index bf3c4f3a0fb..cdd1b550818 100644 --- a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapreduce/v2/TestNonExistentJob.java +++ b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-jobclient/src/test/java/org/apache/hadoop/mapreduce/v2/TestNonExistentJob.java @@ -22,22 +22,15 @@ import org.apache.hadoop.fs.Path; import org.apache.hadoop.fs.permission.FsPermission; import org.apache.hadoop.hdfs.MiniDFSCluster; -import org.apache.hadoop.ipc.RemoteException; import org.apache.hadoop.mapred.JobClient; import org.apache.hadoop.mapred.JobConf; import org.apache.hadoop.mapred.JobID; import org.apache.hadoop.mapred.MiniMRCluster; import org.apache.hadoop.mapred.RunningJob; -import org.apache.hadoop.security.UserGroupInformation; import org.apache.hadoop.security.authorize.ProxyUsers; +import java.io.IOException; import java.net.InetAddress; -import java.io.File; -import java.io.FileOutputStream; -import java.io.OutputStream; -import java.io.OutputStreamWriter; -import java.io.Writer; -import java.security.PrivilegedExceptionAction; public class TestNonExistentJob extends TestCase { @@ -96,8 +89,13 @@ protected void tearDown() throws Exception { } public void testGetInvalidJob() throws Exception { - RunningJob runJob = new JobClient(getJobConf()).getJob(JobID.forName("job_0_0")); - assertNull(runJob); + try { + RunningJob runJob = new JobClient(getJobConf()).getJob(JobID.forName("job_0_0")); + fail("Exception is expected to thrown ahead!"); + } catch (Exception e) { + assertTrue(e instanceof IOException); + assertTrue(e.getMessage().contains("ApplicationNotFoundException")); + } } }