Repository: hadoop
Updated Branches:
  refs/heads/branch-2 4d7bbee0a -> 5f44bd3eb


MAPREDUCE-7041. MR should not try to clean up at first job attempt. (Gergo 
Repas via Haibo Chen)

(cherry picked from commit cc10852252c2d69294eabc68bd032cc630a53b18)
(cherry picked from commit e6c66baba97c34514e1d7491d5fe80867930f184)


Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/5f44bd3e
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/5f44bd3e
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/5f44bd3e

Branch: refs/heads/branch-2
Commit: 5f44bd3eba4b40daf97010cbcb0768fe95a44b59
Parents: 4d7bbee
Author: Haibo Chen <[email protected]>
Authored: Thu Jan 25 16:11:01 2018 -0800
Committer: Haibo Chen <[email protected]>
Committed: Thu Jan 25 17:23:08 2018 -0800

----------------------------------------------------------------------
 .../main/java/org/apache/hadoop/mapreduce/v2/app/MRAppMaster.java  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/hadoop/blob/5f44bd3e/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 16e6bc5..566bc4e 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
@@ -1382,7 +1382,7 @@ public class MRAppMaster extends CompositeService {
 
   private void cleanUpPreviousJobOutput() {
     // recovered application masters should not remove data from previous job
-    if (!recovered()) {
+    if (!isFirstAttempt() && !recovered()) {
       JobContext jobContext = getJobContextFromConf(getConfig());
       try {
         LOG.info("Starting to clean up previous job's temporary files");


---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]

Reply via email to