Apache
/
hadoop
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

MAPREDUCE-6395. Improve the commit failure messages in MRAppMaster recovery. (Brahma Reddy Battula via gera)

This commit is contained in:
Gera Shegalov 2015-06-19 02:22:59 -07:00
parent 5b5bb8dcdc
commit 10107243be
2 changed files with 13 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
hadoop-mapreduce-project/CHANGES.txt
View File

@ -349,6 +349,9 @@ Release 2.8.0 - UNRELEASED
MAPREDUCE-6392. Document mapred class path options. MAPREDUCE-6392. Document mapred class path options.
(Brahma Reddy Battula via cnauroth) (Brahma Reddy Battula via cnauroth)
MAPREDUCE-6395. Improve the commit failure messages in MRAppMaster recovery.
(Brahma Reddy Battula via gera)
OPTIMIZATIONS OPTIMIZATIONS
BUG FIXES BUG FIXES

14
hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/src/main/java/org/apache/hadoop/mapreduce/v2/app/MRAppMaster.java
View File

@ -334,14 +334,20 @@ public class MRAppMaster extends CompositeService {
" because a commit was started."); " because a commit was started.");
copyHistory = true; copyHistory = true;
if (commitSuccess) { 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; forcedState = JobStateInternal.SUCCEEDED;
} else if (commitFailure) { } 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; forcedState = JobStateInternal.FAILED;
} else { } else {
//The commit is still pending, commit error //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; 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 comes as true, should never set it to false
if ( !isLastAMRetry){ if ( !isLastAMRetry){
if (((JobImpl)job).getInternalState() != JobStateInternal.REBOOT) { 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; isLastAMRetry = true;
} }
} }