You are viewing a plain text version of this content. The canonical link for it is here.
Posted to common-commits@hadoop.apache.org by vi...@apache.org on 2016/01/21 15:45:55 UTC
[2/3] hadoop git commit: HADOOP-12423. Handle failure of registering
shutdownhook by ShutdownHookManager in static block (Contributed by Abhishek
Agarwal)
HADOOP-12423. Handle failure of registering shutdownhook by ShutdownHookManager in static block (Contributed by Abhishek Agarwal)
(cherry picked from commit 446987e20aacd870e1bc3f950b2bd4bbda1f9571)
Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/c13929b3
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/c13929b3
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/c13929b3
Branch: refs/heads/branch-2
Commit: c13929b385cf2eddcf580b242ffef1f88b7c5d40
Parents: 845acfd
Author: Vinayakumar B <vi...@apache.org>
Authored: Thu Jan 21 20:08:24 2016 +0530
Committer: Vinayakumar B <vi...@apache.org>
Committed: Thu Jan 21 20:10:11 2016 +0530
----------------------------------------------------------------------
hadoop-common-project/hadoop-common/CHANGES.txt | 3 ++
.../apache/hadoop/util/ShutdownHookManager.java | 31 ++++++++++++--------
2 files changed, 21 insertions(+), 13 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hadoop/blob/c13929b3/hadoop-common-project/hadoop-common/CHANGES.txt
----------------------------------------------------------------------
diff --git a/hadoop-common-project/hadoop-common/CHANGES.txt b/hadoop-common-project/hadoop-common/CHANGES.txt
index c2e8781..9b394e6 100644
--- a/hadoop-common-project/hadoop-common/CHANGES.txt
+++ b/hadoop-common-project/hadoop-common/CHANGES.txt
@@ -1000,6 +1000,9 @@ Release 2.8.0 - UNRELEASED
HADOOP-12356. Fix computing CPU usage statistics on Windows.
(Inigo Goiri via wangda)
+ HADOOP-12423. Handle failure of registering shutdownhook by
+ ShutdownHookManager in static block (Abhishek Agarwal via vinayakumarb)
+
Release 2.7.3 - UNRELEASED
INCOMPATIBLE CHANGES
http://git-wip-us.apache.org/repos/asf/hadoop/blob/c13929b3/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/util/ShutdownHookManager.java
----------------------------------------------------------------------
diff --git a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/util/ShutdownHookManager.java b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/util/ShutdownHookManager.java
index 85533db..843454b 100644
--- a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/util/ShutdownHookManager.java
+++ b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/util/ShutdownHookManager.java
@@ -44,22 +44,27 @@ public class ShutdownHookManager {
private static final Log LOG = LogFactory.getLog(ShutdownHookManager.class);
static {
- Runtime.getRuntime().addShutdownHook(
- new Thread() {
- @Override
- public void run() {
- MGR.shutdownInProgress.set(true);
- for (Runnable hook: MGR.getShutdownHooksInOrder()) {
- try {
- hook.run();
- } catch (Throwable ex) {
- LOG.warn("ShutdownHook '" + hook.getClass().getSimpleName() +
- "' failed, " + ex.toString(), ex);
+ try {
+ Runtime.getRuntime().addShutdownHook(
+ new Thread() {
+ @Override
+ public void run() {
+ MGR.shutdownInProgress.set(true);
+ for (Runnable hook: MGR.getShutdownHooksInOrder()) {
+ try {
+ hook.run();
+ } catch (Throwable ex) {
+ LOG.warn("ShutdownHook '" + hook.getClass().getSimpleName() +
+ "' failed, " + ex.toString(), ex);
+ }
}
}
}
- }
- );
+ );
+ } catch (IllegalStateException ex) {
+ // JVM is being shut down. Ignore
+ LOG.warn("Failed to add the ShutdownHook", ex);
+ }
}
/**