From 7250b0bf914a55d0fa4802834de7f1909f1b0d6b Mon Sep 17 00:00:00 2001 From: Devaraj K Date: Tue, 18 Nov 2014 22:05:13 +0530 Subject: [PATCH] MAPREDUCE-6049. AM JVM does not exit if MRClientService graceful shutdown fails. Contributed by Rohith. --- hadoop-mapreduce-project/CHANGES.txt | 3 +++ .../java/org/apache/hadoop/mapreduce/v2/app/MRAppMaster.java | 3 ++- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/hadoop-mapreduce-project/CHANGES.txt b/hadoop-mapreduce-project/CHANGES.txt index cd5f965c816..a58d6024ab2 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 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 134137f35e2..8d5be868630 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); } }