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 DA648914F for ; Mon, 2 Apr 2012 19:51:31 +0000 (UTC) Received: (qmail 44159 invoked by uid 500); 2 Apr 2012 19:51:31 -0000 Delivered-To: apmail-hadoop-mapreduce-commits-archive@hadoop.apache.org Received: (qmail 44051 invoked by uid 500); 2 Apr 2012 19:51:31 -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 44042 invoked by uid 99); 2 Apr 2012 19:51:31 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 02 Apr 2012 19:51:31 +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; Mon, 02 Apr 2012 19:51:28 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id 2AE652388865; Mon, 2 Apr 2012 19:51:07 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1308507 - in /hadoop/common/trunk/hadoop-mapreduce-project: ./ hadoop-mapreduce-client/hadoop-mapreduce-client-app/src/main/java/org/apache/hadoop/mapreduce/v2/app/job/impl/ hadoop-mapreduce-client/hadoop-mapreduce-client-app/src/test/java... Date: Mon, 02 Apr 2012 19:51:06 -0000 To: mapreduce-commits@hadoop.apache.org From: bobby@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20120402195107.2AE652388865@eris.apache.org> Author: bobby Date: Mon Apr 2 19:51:06 2012 New Revision: 1308507 URL: http://svn.apache.org/viewvc?rev=1308507&view=rev Log: MAPREDUCE-4092. commitJob Exception does not fail job (Jon Eagles via bobby) Modified: hadoop/common/trunk/hadoop-mapreduce-project/CHANGES.txt hadoop/common/trunk/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/src/main/java/org/apache/hadoop/mapreduce/v2/app/job/impl/JobImpl.java hadoop/common/trunk/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/src/test/java/org/apache/hadoop/mapreduce/v2/app/job/impl/TestJobImpl.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=1308507&r1=1308506&r2=1308507&view=diff ============================================================================== --- hadoop/common/trunk/hadoop-mapreduce-project/CHANGES.txt (original) +++ hadoop/common/trunk/hadoop-mapreduce-project/CHANGES.txt Mon Apr 2 19:51:06 2012 @@ -207,6 +207,9 @@ Release 0.23.3 - UNRELEASED BUG FIXES + MAPREDUCE-4092. commitJob Exception does not fail job (Jon Eagles via + bobby) + Release 0.23.2 - UNRELEASED INCOMPATIBLE CHANGES Modified: hadoop/common/trunk/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/src/main/java/org/apache/hadoop/mapreduce/v2/app/job/impl/JobImpl.java URL: http://svn.apache.org/viewvc/hadoop/common/trunk/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/src/main/java/org/apache/hadoop/mapreduce/v2/app/job/impl/JobImpl.java?rev=1308507&r1=1308506&r2=1308507&view=diff ============================================================================== --- hadoop/common/trunk/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/src/main/java/org/apache/hadoop/mapreduce/v2/app/job/impl/JobImpl.java (original) +++ hadoop/common/trunk/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/src/main/java/org/apache/hadoop/mapreduce/v2/app/job/impl/JobImpl.java Mon Apr 2 19:51:06 2012 @@ -727,7 +727,9 @@ public class JobImpl implements org.apac // Commit job & do cleanup job.getCommitter().commitJob(job.getJobContext()); } catch (IOException e) { - LOG.warn("Could not do commit for Job", e); + LOG.error("Could not do commit for Job", e); + job.logJobHistoryFinishedEvent(); + return job.finished(JobState.FAILED); } job.logJobHistoryFinishedEvent(); return job.finished(JobState.SUCCEEDED); Modified: hadoop/common/trunk/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/src/test/java/org/apache/hadoop/mapreduce/v2/app/job/impl/TestJobImpl.java URL: http://svn.apache.org/viewvc/hadoop/common/trunk/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/src/test/java/org/apache/hadoop/mapreduce/v2/app/job/impl/TestJobImpl.java?rev=1308507&r1=1308506&r2=1308507&view=diff ============================================================================== --- hadoop/common/trunk/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/src/test/java/org/apache/hadoop/mapreduce/v2/app/job/impl/TestJobImpl.java (original) +++ hadoop/common/trunk/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/src/test/java/org/apache/hadoop/mapreduce/v2/app/job/impl/TestJobImpl.java Mon Apr 2 19:51:06 2012 @@ -20,6 +20,7 @@ package org.apache.hadoop.mapreduce.v2.a import static org.mockito.Matchers.any; import static org.mockito.Mockito.doNothing; +import static org.mockito.Mockito.doThrow; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; @@ -73,6 +74,37 @@ public class TestJobImpl { } @Test + public void testCommitJobFailsJob() { + + JobImpl mockJob = mock(JobImpl.class); + mockJob.tasks = new HashMap(); + OutputCommitter mockCommitter = mock(OutputCommitter.class); + EventHandler mockEventHandler = mock(EventHandler.class); + JobContext mockJobContext = mock(JobContext.class); + + when(mockJob.getCommitter()).thenReturn(mockCommitter); + when(mockJob.getEventHandler()).thenReturn(mockEventHandler); + when(mockJob.getJobContext()).thenReturn(mockJobContext); + doNothing().when(mockJob).setFinishTime(); + doNothing().when(mockJob).logJobHistoryFinishedEvent(); + when(mockJob.finished(JobState.KILLED)).thenReturn(JobState.KILLED); + when(mockJob.finished(JobState.FAILED)).thenReturn(JobState.FAILED); + when(mockJob.finished(JobState.SUCCEEDED)).thenReturn(JobState.SUCCEEDED); + + try { + doThrow(new IOException()).when(mockCommitter).commitJob(any(JobContext.class)); + } catch (IOException e) { + // commitJob stubbed out, so this can't happen + } + doNothing().when(mockEventHandler).handle(any(JobHistoryEvent.class)); + Assert.assertNotNull("checkJobCompleteSuccess incorrectly returns null " + + "for successful job", + JobImpl.checkJobCompleteSuccess(mockJob)); + Assert.assertEquals("checkJobCompleteSuccess returns incorrect state", + JobState.FAILED, JobImpl.checkJobCompleteSuccess(mockJob)); + } + + @Test public void testCheckJobCompleteSuccess() { JobImpl mockJob = mock(JobImpl.class); @@ -98,9 +130,7 @@ public class TestJobImpl { "for successful job", JobImpl.checkJobCompleteSuccess(mockJob)); Assert.assertEquals("checkJobCompleteSuccess returns incorrect state", - JobImpl.checkJobCompleteSuccess(mockJob), JobState.SUCCEEDED); - - + JobState.SUCCEEDED, JobImpl.checkJobCompleteSuccess(mockJob)); } @Test