Author: vinodkv
Date: Sat Oct 22 08:13:20 2011
New Revision: 1187670
URL: http://svn.apache.org/viewvc?rev=1187670&view=rev
Log:
MAPREDUCE-3233. Fixed a bug in MR Job so as to be able to restart the
application on AM crash. Contributed by Mahadev Konar.
svn merge -c r1187669 --ignore-ancestry ../../trunk/
Modified:
hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/CHANGES.txt
hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/src/main/java/org/apache/hadoop/mapreduce/v2/app/job/impl/JobImpl.java
Modified:
hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/CHANGES.txt
URL:
http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/CHANGES.txt?rev=1187670&r1=1187669&r2=1187670&view=diff
==============================================================================
--- hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/CHANGES.txt
(original)
+++ hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/CHANGES.txt Sat
Oct 22 08:13:20 2011
@@ -1679,6 +1679,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
Modified:
hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/src/main/java/org/apache/hadoop/mapreduce/v2/app/job/impl/JobImpl.java
URL:
http://svn.apache.org/viewvc/hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/src/main/java/org/apache/hadoop/mapreduce/v2/app/job/impl/JobImpl.java?rev=1187670&r1=1187669&r2=1187670&view=diff
==============================================================================
---
hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/src/main/java/org/apache/hadoop/mapreduce/v2/app/job/impl/JobImpl.java
(original)
+++
hadoop/common/branches/branch-0.23/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/src/main/java/org/apache/hadoop/mapreduce/v2/app/job/impl/JobImpl.java
Sat Oct 22 08:13:20 2011
@@ -1044,13 +1044,6 @@ public class JobImpl implements org.apac
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());
}
/**
