hadoop-common-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From deva...@apache.org
Subject hadoop git commit: MAPREDUCE-6049. AM JVM does not exit if MRClientService graceful shutdown fails. Contributed by Rohith. (cherry picked from commit 7250b0bf914a55d0fa4802834de7f1909f1b0d6b)
Date Tue, 18 Nov 2014 16:41:23 GMT
Repository: hadoop
Updated Branches:
  refs/heads/branch-2 ad32886ae -> 09df35e51


MAPREDUCE-6049. AM JVM does not exit if MRClientService graceful shutdown
fails. Contributed by Rohith.
(cherry picked from commit 7250b0bf914a55d0fa4802834de7f1909f1b0d6b)


Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/09df35e5
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/09df35e5
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/09df35e5

Branch: refs/heads/branch-2
Commit: 09df35e51d8d207f9d90afb6dc7c3c8e86827601
Parents: ad32886
Author: Devaraj K <devaraj@apache.org>
Authored: Tue Nov 18 22:05:13 2014 +0530
Committer: Devaraj K <devaraj@apache.org>
Committed: Tue Nov 18 22:07:26 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/09df35e5/hadoop-mapreduce-project/CHANGES.txt
----------------------------------------------------------------------
diff --git a/hadoop-mapreduce-project/CHANGES.txt b/hadoop-mapreduce-project/CHANGES.txt
index 6402bbe..0297d9a 100644
--- a/hadoop-mapreduce-project/CHANGES.txt
+++ b/hadoop-mapreduce-project/CHANGES.txt
@@ -16,6 +16,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/09df35e5/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 7c882ef..6301121 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
@@ -586,7 +586,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);
     }
 
   }


Mime
View raw message