Author: eyang
Date: Sat Apr 26 18:04:18 2014
New Revision: 1590268
URL: http://svn.apache.org/r1590268
Log:
MAPREDUCE-5714. Removed forceful JVM exit in shutDownJob.
(Jinghui Wang via Eric Yang)
Modified:
hadoop/common/branches/branch-2.4/hadoop-mapreduce-project/CHANGES.txt
hadoop/common/branches/branch-2.4/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/src/main/java/org/apache/hadoop/mapreduce/v2/app/MRAppMaster.java
Modified: hadoop/common/branches/branch-2.4/hadoop-mapreduce-project/CHANGES.txt
URL:
http://svn.apache.org/viewvc/hadoop/common/branches/branch-2.4/hadoop-mapreduce-project/CHANGES.txt?rev=1590268&r1=1590267&r2=1590268&view=diff
==============================================================================
--- hadoop/common/branches/branch-2.4/hadoop-mapreduce-project/CHANGES.txt
(original)
+++ hadoop/common/branches/branch-2.4/hadoop-mapreduce-project/CHANGES.txt Sat
Apr 26 18:04:18 2014
@@ -12,6 +12,9 @@ Release 2.4.1 - UNRELEASED
BUG FIXES
+ MAPREDUCE-5714. Removed forceful JVM exit in shutDownJob.
+ (Jinghui Wang via Eric Yang)
+
MAPREDUCE-5818. Added "hsadmin" command into mapred.cmd. (Jian He via
zjshen)
MAPREDUCE-5824. Fixed test-failure of TestPipesNonJavaInputFormat in
Modified:
hadoop/common/branches/branch-2.4/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/src/main/java/org/apache/hadoop/mapreduce/v2/app/MRAppMaster.java
URL:
http://svn.apache.org/viewvc/hadoop/common/branches/branch-2.4/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/src/main/java/org/apache/hadoop/mapreduce/v2/app/MRAppMaster.java?rev=1590268&r1=1590267&r2=1590268&view=diff
==============================================================================
---
hadoop/common/branches/branch-2.4/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/src/main/java/org/apache/hadoop/mapreduce/v2/app/MRAppMaster.java
(original)
+++
hadoop/common/branches/branch-2.4/hadoop-mapreduce-project/hadoop-mapreduce-client/hadoop-mapreduce-client-app/src/main/java/org/apache/hadoop/mapreduce/v2/app/MRAppMaster.java
Sat Apr 26 18:04:18 2014
@@ -587,10 +587,6 @@ public class MRAppMaster extends Composi
LOG.warn("Graceful stop failed ", t);
}
- //Bring the process down by force.
- //Not needed after HADOOP-7140
- LOG.info("Exiting MR AppMaster..GoodBye!");
- sysexit();
}
private class JobFinishEventHandler implements EventHandler<JobFinishEvent> {
