Repository: hadoop Updated Branches: refs/heads/branch-2 86b75ac54 -> 01991876e
MAPREDUCE-6395. Improve the commit failure messages in MRAppMaster recovery. (Brahma Reddy Battula via gera) (cherry picked from commit 10107243be66bae2212a2cd8575f9f5ade13fe9e) Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/01991876 Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/01991876 Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/01991876 Branch: refs/heads/branch-2 Commit: 01991876edaed0fdbbadf3aafc2435330ed7f259 Parents: 86b75ac Author: Gera Shegalov <g...@apache.org> Authored: Fri Jun 19 02:22:59 2015 -0700 Committer: Gera Shegalov <g...@apache.org> Committed: Fri Jun 19 02:29:31 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/01991876/hadoop-mapreduce-project/CHANGES.txt ---------------------------------------------------------------------- diff --git a/hadoop-mapreduce-project/CHANGES.txt b/hadoop-mapreduce-project/CHANGES.txt index c66535d..cc4bb9c 100644 --- a/hadoop-mapreduce-project/CHANGES.txt +++ b/hadoop-mapreduce-project/CHANGES.txt @@ -85,6 +85,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/01991876/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 942e25b..fb73eba 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 @@ -331,14 +331,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; } } @@ -564,7 +570,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; } }
