Repository: hadoop Updated Branches: refs/heads/trunk 9dd5d673c -> 7250b0bf9
MAPREDUCE-6049. AM JVM does not exit if MRClientService graceful shutdown fails. Contributed by Rohith. Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/7250b0bf Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/7250b0bf Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/7250b0bf Branch: refs/heads/trunk Commit: 7250b0bf914a55d0fa4802834de7f1909f1b0d6b Parents: 9dd5d67 Author: Devaraj K <[email protected]> Authored: Tue Nov 18 22:05:13 2014 +0530 Committer: Devaraj K <[email protected]> Committed: Tue Nov 18 22:05:13 2014 +0530 ---------------------------------------------------------------------- hadoop-mapreduce-project/CHANGES.txt | 3 +++ .../main/java/org/apache/hadoop/mapreduce/v2/app/MRAppMaster.java | 3 ++- 2 files changed, 5 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hadoop/blob/7250b0bf/hadoop-mapreduce-project/CHANGES.txt ---------------------------------------------------------------------- diff --git a/hadoop-mapreduce-project/CHANGES.txt b/hadoop-mapreduce-project/CHANGES.txt index cd5f965..a58d602 100644 --- a/hadoop-mapreduce-project/CHANGES.txt +++ b/hadoop-mapreduce-project/CHANGES.txt @@ -243,6 +243,9 @@ Release 2.7.0 - UNRELEASED CodecPool multiple times (Sergey Murylev via raviprak) MAPREDUCE-6162. mapred hsadmin fails on a secure cluster (jlowe) + + MAPREDUCE-6049. AM JVM does not exit if MRClientService graceful shutdown + fails (Rohith via devaraj) Release 2.6.0 - 2014-11-18 http://git-wip-us.apache.org/repos/asf/hadoop/blob/7250b0bf/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 134137f..8d5be86 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 @@ -604,7 +604,8 @@ public class MRAppMaster extends CompositeService { } clientService.stop(); } catch (Throwable t) { - LOG.warn("Graceful stop failed ", t); + LOG.warn("Graceful stop failed. Exiting.. ", t); + ExitUtil.terminate(1, t); } }
