You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hbase.apache.org by bu...@apache.org on 2018/04/20 15:42:25 UTC
[2/2] hbase git commit: HBASE-18862 apply HBASE-15109 to branch-1.2,
branch-1.3
HBASE-18862 apply HBASE-15109 to branch-1.2,branch-1.3
Signed-off-by: Pankaj Kumar <pa...@huawei.com>
Signed-off-by: Sean Busbey <bu...@apache.org>
Project: http://git-wip-us.apache.org/repos/asf/hbase/repo
Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/42471ddf
Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/42471ddf
Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/42471ddf
Branch: refs/heads/branch-1.2
Commit: 42471ddf1515a4715b505b4e46774572965c5835
Parents: ff1c816
Author: Yechao Chen <ch...@gmail.com>
Authored: Fri Sep 22 16:08:18 2017 +0800
Committer: Sean Busbey <bu...@apache.org>
Committed: Fri Apr 20 10:36:42 2018 -0500
----------------------------------------------------------------------
.../org/apache/hadoop/hbase/regionserver/ShutdownHook.java | 9 +++++----
1 file changed, 5 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hbase/blob/42471ddf/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/ShutdownHook.java
----------------------------------------------------------------------
diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/ShutdownHook.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/ShutdownHook.java
index 25ff51c..f19f26f 100644
--- a/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/ShutdownHook.java
+++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/ShutdownHook.java
@@ -200,10 +200,11 @@ public class ShutdownHook {
throw new RuntimeException("Client finalizer is null, can't suppress!");
}
synchronized (fsShutdownHooks) {
- if (!fsShutdownHooks.containsKey(hdfsClientFinalizer) &&
- !ShutdownHookManager.deleteShutdownHook(hdfsClientFinalizer)) {
- throw new RuntimeException("Failed suppression of fs shutdown hook: " +
- hdfsClientFinalizer);
+ boolean isFSCacheDisabled = fs.getConf().getBoolean("fs.hdfs.impl.disable.cache", false);
+ if (!isFSCacheDisabled && !fsShutdownHooks.containsKey(hdfsClientFinalizer)
+ && !ShutdownHookManager.deleteShutdownHook(hdfsClientFinalizer)) {
+ throw new RuntimeException(
+ "Failed suppression of fs shutdown hook: " + hdfsClientFinalizer);
}
Integer refs = fsShutdownHooks.get(hdfsClientFinalizer);
fsShutdownHooks.put(hdfsClientFinalizer, refs == null ? 1 : refs + 1);