From 378ee0c957ba10bb7c68292193b50bfb009520bc Mon Sep 17 00:00:00 2001 From: Yechao Chen Date: Fri, 22 Sep 2017 16:08:18 +0800 Subject: [PATCH] HBASE-18862 apply HBASE-15109 to branch-1.1,branch-1.2,branch-1.3 --- .../java/org/apache/hadoop/hbase/regionserver/ShutdownHook.java | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) 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); -- 2.7.2.windows.1