Browse Source

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

Devaraj K 10 years ago
parent
commit
09df35e51d

+ 3 - 0
hadoop-mapreduce-project/CHANGES.txt

@@ -16,6 +16,9 @@ Release 2.7.0 - UNRELEASED
     CodecPool multiple times (Sergey Murylev via raviprak)
     CodecPool multiple times (Sergey Murylev via raviprak)
 
 
     MAPREDUCE-6162. mapred hsadmin fails on a secure cluster (jlowe)
     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
 Release 2.6.0 - 2014-11-18
 
 

+ 2 - 1
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();
       clientService.stop();
     } catch (Throwable t) {
     } catch (Throwable t) {
-      LOG.warn("Graceful stop failed ", t);
+      LOG.warn("Graceful stop failed. Exiting.. ", t);
+      ExitUtil.terminate(1, t);
     }
     }
 
 
   }
   }