Return-Path: X-Original-To: apmail-hadoop-mapreduce-commits-archive@minotaur.apache.org Delivered-To: apmail-hadoop-mapreduce-commits-archive@minotaur.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 556A6C5EF for ; Tue, 4 Jun 2013 04:42:24 +0000 (UTC) Received: (qmail 75810 invoked by uid 500); 4 Jun 2013 04:42:22 -0000 Delivered-To: apmail-hadoop-mapreduce-commits-archive@hadoop.apache.org Received: (qmail 75733 invoked by uid 500); 4 Jun 2013 04:42:20 -0000 Mailing-List: contact mapreduce-commits-help@hadoop.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: mapreduce-dev@hadoop.apache.org Delivered-To: mailing list mapreduce-commits@hadoop.apache.org Received: (qmail 75719 invoked by uid 99); 4 Jun 2013 04:42:17 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 04 Jun 2013 04:42:17 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 04 Jun 2013 04:42:15 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id 756992388980; Tue, 4 Jun 2013 04:41:56 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1489287 - /hadoop/common/trunk/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-hs/src/test/java/org/apache/hadoop/mapreduce/v2/hs/MockHistoryContext.java Date: Tue, 04 Jun 2013 04:41:56 -0000 To: mapreduce-commits@hadoop.apache.org From: vinodkv@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20130604044156.756992388980@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: vinodkv Date: Tue Jun 4 04:41:55 2013 New Revision: 1489287 URL: http://svn.apache.org/r1489287 Log: YARN-635 and MAPREDUCE-5301. Bug fix as the committed patch ended up being stale. Modified: hadoop/common/trunk/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-hs/src/test/java/org/apache/hadoop/mapreduce/v2/hs/MockHistoryContext.java Modified: hadoop/common/trunk/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-hs/src/test/java/org/apache/hadoop/mapreduce/v2/hs/MockHistoryContext.java URL: http://svn.apache.org/viewvc/hadoop/common/trunk/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-hs/src/test/java/org/apache/hadoop/mapreduce/v2/hs/MockHistoryContext.java?rev=1489287&r1=1489286&r2=1489287&view=diff ============================================================================== --- hadoop/common/trunk/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-hs/src/test/java/org/apache/hadoop/mapreduce/v2/hs/MockHistoryContext.java (original) +++ hadoop/common/trunk/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-hs/src/test/java/org/apache/hadoop/mapreduce/v2/hs/MockHistoryContext.java Tue Jun 4 04:41:55 2013 @@ -28,7 +28,7 @@ import org.apache.hadoop.mapreduce.v2.ap import org.apache.hadoop.mapreduce.v2.app.job.Job; import org.apache.hadoop.mapreduce.v2.hs.MockHistoryJobs.JobsPair; import org.apache.hadoop.mapreduce.v2.hs.webapp.dao.JobsInfo; -import org.apache.hadoop.yarn.YarnException; +import org.apache.hadoop.yarn.YarnRuntimeException; import org.apache.hadoop.yarn.api.records.ApplicationId; public class MockHistoryContext extends MockAppContext implements HistoryContext { @@ -42,7 +42,7 @@ public class MockHistoryContext extends try { jobs = MockHistoryJobs.newHistoryJobs(numJobs, numTasks, numAttempts); } catch (IOException e) { - throw new YarnException(e); + throw new YarnRuntimeException(e); } partialJobs = jobs.partial; fullJobs = jobs.full; @@ -56,7 +56,7 @@ public class MockHistoryContext extends jobs = MockHistoryJobs.newHistoryJobs(getApplicationID(), numJobs, numTasks, numAttempts); } catch (IOException e) { - throw new YarnException(e); + throw new YarnRuntimeException(e); } partialJobs = jobs.partial; fullJobs = jobs.full; @@ -76,7 +76,7 @@ public class MockHistoryContext extends jobs = MockHistoryJobs.newHistoryJobs(getApplicationID(), numJobs, numTasks, numAttempts, hasFailedTasks); } catch (IOException e) { - throw new YarnException(e); + throw new YarnRuntimeException(e); } partialJobs = jobs.partial; fullJobs = jobs.full;