You are viewing a plain text version of this content. The canonical link for it is here.
Posted to common-commits@hadoop.apache.org by ge...@apache.org on 2015/06/19 11:28:39 UTC
hadoop git commit: MAPREDUCE-6395. Improve the commit failure
messages in MRAppMaster recovery. (Brahma Reddy Battula via gera)
Repository: hadoop
Updated Branches:
refs/heads/trunk 5b5bb8dcd -> 10107243b
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/trunk
Commit: 10107243be66bae2212a2cd8575f9f5ade13fe9e
Parents: 5b5bb8d
Author: Gera Shegalov <ge...@apache.org>
Authored: Fri Jun 19 02:22:59 2015 -0700
Committer: Gera Shegalov <ge...@apache.org>
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;
}
}