From 977d7cc5b947682478ad7b38bd442f0efa1cd204 Mon Sep 17 00:00:00 2001 From: Vinod Kumar Vavilapalli Date: Sat, 22 Oct 2011 08:11:47 +0000 Subject: [PATCH] MAPREDUCE-3233. Fixed a bug in MR Job so as to be able to restart the application on AM crash. Contributed by Mahadev Konar. git-svn-id: https://svn.apache.org/repos/asf/hadoop/common/trunk@1187669 13f79535-47bb-0310-9956-ffa450edef68 --- hadoop-mapreduce-project/CHANGES.txt | 3 +++ .../apache/hadoop/mapreduce/v2/app/job/impl/JobImpl.java | 7 ------- 2 files changed, 3 insertions(+), 7 deletions(-) diff --git a/hadoop-mapreduce-project/CHANGES.txt b/hadoop-mapreduce-project/CHANGES.txt index 45852a837d..13e41ddfe8 100644 --- a/hadoop-mapreduce-project/CHANGES.txt +++ b/hadoop-mapreduce-project/CHANGES.txt @@ -1735,6 +1735,9 @@ Release 0.23.0 - Unreleased MAPREDUCE-3087. Fixed the mapreduce classpath to correctly include the generated-classpath file needed for tests. (Ravi Prakash via vinodkv) + MAPREDUCE-3233. Fixed a bug in MR Job so as to be able to restart the + application on AM crash. (Mahadev Konar via vinodkv) + Release 0.22.0 - Unreleased INCOMPATIBLE CHANGES diff --git a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/src/main/java/org/apache/hadoop/mapreduce/v2/app/job/impl/JobImpl.java b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/src/main/java/org/apache/hadoop/mapreduce/v2/app/job/impl/JobImpl.java index 565253fe04..dcaf7e00e5 100644 --- a/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/src/main/java/org/apache/hadoop/mapreduce/v2/app/job/impl/JobImpl.java +++ b/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/src/main/java/org/apache/hadoop/mapreduce/v2/app/job/impl/JobImpl.java @@ -1044,13 +1044,6 @@ protected void setup(JobImpl job) throws IOException { if (UserGroupInformation.isSecurityEnabled()) { tokenStorage.addAll(job.fsTokens); } - - Path remoteJobTokenFile = - new Path(job.remoteJobSubmitDir, - MRJobConfig.APPLICATION_TOKENS_FILE); - tokenStorage.writeTokenStorageFile(remoteJobTokenFile, job.conf); - LOG.info("Writing back the job-token file on the remote file system:" - + remoteJobTokenFile.toString()); } /**