Return-Path: X-Original-To: apmail-hadoop-common-commits-archive@www.apache.org Delivered-To: apmail-hadoop-common-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 77E9B187C5 for ; Sat, 20 Jun 2015 21:25:31 +0000 (UTC) Received: (qmail 43012 invoked by uid 500); 20 Jun 2015 21:25:08 -0000 Delivered-To: apmail-hadoop-common-commits-archive@hadoop.apache.org Received: (qmail 42515 invoked by uid 500); 20 Jun 2015 21:25:07 -0000 Mailing-List: contact common-commits-help@hadoop.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: common-dev@hadoop.apache.org Delivered-To: mailing list common-commits@hadoop.apache.org Received: (qmail 41974 invoked by uid 99); 20 Jun 2015 21:25:07 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Sat, 20 Jun 2015 21:25:07 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 6FD1EE3632; Sat, 20 Jun 2015 21:25:07 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: arp@apache.org To: common-commits@hadoop.apache.org Date: Sat, 20 Jun 2015 21:25:41 -0000 Message-Id: In-Reply-To: References: X-Mailer: ASF-Git Admin Mailer Subject: [36/50] [abbrv] hadoop git commit: MAPREDUCE-6395. Improve the commit failure messages in MRAppMaster recovery. (Brahma Reddy Battula via gera) MAPREDUCE-6395. Improve the commit failure messages in MRAppMaster recovery. (Brahma Reddy Battula via gera) Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/10107243 Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/10107243 Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/10107243 Branch: refs/heads/HDFS-7240 Commit: 10107243be66bae2212a2cd8575f9f5ade13fe9e Parents: 5b5bb8d Author: Gera Shegalov Authored: Fri Jun 19 02:22:59 2015 -0700 Committer: Gera Shegalov Committed: Fri Jun 19 02:22:59 2015 -0700 ---------------------------------------------------------------------- hadoop-mapreduce-project/CHANGES.txt | 3 +++ .../apache/hadoop/mapreduce/v2/app/MRAppMaster.java | 14 ++++++++++---- 2 files changed, 13 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hadoop/blob/10107243/hadoop-mapreduce-project/CHANGES.txt ---------------------------------------------------------------------- diff --git a/hadoop-mapreduce-project/CHANGES.txt b/hadoop-mapreduce-project/CHANGES.txt index 1037091..7e57804 100644 --- a/hadoop-mapreduce-project/CHANGES.txt +++ b/hadoop-mapreduce-project/CHANGES.txt @@ -349,6 +349,9 @@ Release 2.8.0 - UNRELEASED MAPREDUCE-6392. Document mapred class path options. (Brahma Reddy Battula via cnauroth) + MAPREDUCE-6395. Improve the commit failure messages in MRAppMaster recovery. + (Brahma Reddy Battula via gera) + OPTIMIZATIONS BUG FIXES http://git-wip-us.apache.org/repos/asf/hadoop/blob/10107243/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/src/main/java/org/apache/hadoop/mapreduce/v2/app/MRAppMaster.java ---------------------------------------------------------------------- diff --git a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/src/main/java/org/apache/hadoop/mapreduce/v2/app/MRAppMaster.java b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/src/main/java/org/apache/hadoop/mapreduce/v2/app/MRAppMaster.java index 752b30c..0d3519b 100644 --- a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/src/main/java/org/apache/hadoop/mapreduce/v2/app/MRAppMaster.java +++ b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/src/main/java/org/apache/hadoop/mapreduce/v2/app/MRAppMaster.java @@ -334,14 +334,20 @@ public class MRAppMaster extends CompositeService { " because a commit was started."); copyHistory = true; if (commitSuccess) { - shutDownMessage = "We crashed after successfully committing. Recovering."; + shutDownMessage = + "Job commit succeeded in a prior MRAppMaster attempt " + + "before it crashed. Recovering."; forcedState = JobStateInternal.SUCCEEDED; } else if (commitFailure) { - shutDownMessage = "We crashed after a commit failure."; + shutDownMessage = + "Job commit failed in a prior MRAppMaster attempt " + + "before it crashed. Not retrying."; forcedState = JobStateInternal.FAILED; } else { //The commit is still pending, commit error - shutDownMessage = "We crashed durring a commit"; + shutDownMessage = + "Job commit from a prior MRAppMaster attempt is " + + "potentially in progress. Preventing multiple commit executions"; forcedState = JobStateInternal.ERROR; } } @@ -582,7 +588,7 @@ public class MRAppMaster extends CompositeService { //if isLastAMRetry comes as true, should never set it to false if ( !isLastAMRetry){ if (((JobImpl)job).getInternalState() != JobStateInternal.REBOOT) { - LOG.info("We are finishing cleanly so this is the last retry"); + LOG.info("Job finished cleanly, recording last MRAppMaster retry"); isLastAMRetry = true; } }