From 61a10bb9916414a69512bf57ad8828769ab8ddb6 Mon Sep 17 00:00:00 2001 From: Xing Lin Date: Tue, 22 Nov 2022 11:54:03 -0800 Subject: [PATCH 1/3] HDFS-16852 Swallow IllegalStateException in KeyProviderCache constructor. --- .../main/java/org/apache/hadoop/hdfs/KeyProviderCache.java | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/hadoop-hdfs-project/hadoop-hdfs-client/src/main/java/org/apache/hadoop/hdfs/KeyProviderCache.java b/hadoop-hdfs-project/hadoop-hdfs-client/src/main/java/org/apache/hadoop/hdfs/KeyProviderCache.java index d8dd485101bce..a7ebd96c68e45 100644 --- a/hadoop-hdfs-project/hadoop-hdfs-client/src/main/java/org/apache/hadoop/hdfs/KeyProviderCache.java +++ b/hadoop-hdfs-project/hadoop-hdfs-client/src/main/java/org/apache/hadoop/hdfs/KeyProviderCache.java @@ -68,8 +68,11 @@ public void onRemoval( }) .build(); - ShutdownHookManager.get().addShutdownHook(new KeyProviderCacheFinalizer(), - SHUTDOWN_HOOK_PRIORITY); + try { + ShutdownHookManager.get().addShutdownHook(new KeyProviderCacheFinalizer(), SHUTDOWN_HOOK_PRIORITY); + } catch (IllegalStateException e) { + LOG.warn("shutdownHook not added", e); + } } public KeyProvider get(final Configuration conf, From b8eb01256257629b13f62dfea654b9417439609e Mon Sep 17 00:00:00 2001 From: Xing Lin Date: Fri, 2 Dec 2022 17:09:47 -0800 Subject: [PATCH 2/3] Register the shutdownhook when not in shutdown. --- .../main/java/org/apache/hadoop/hdfs/KeyProviderCache.java | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/hadoop-hdfs-project/hadoop-hdfs-client/src/main/java/org/apache/hadoop/hdfs/KeyProviderCache.java b/hadoop-hdfs-project/hadoop-hdfs-client/src/main/java/org/apache/hadoop/hdfs/KeyProviderCache.java index a7ebd96c68e45..08a2c3580a22c 100644 --- a/hadoop-hdfs-project/hadoop-hdfs-client/src/main/java/org/apache/hadoop/hdfs/KeyProviderCache.java +++ b/hadoop-hdfs-project/hadoop-hdfs-client/src/main/java/org/apache/hadoop/hdfs/KeyProviderCache.java @@ -68,10 +68,9 @@ public void onRemoval( }) .build(); - try { + // Register the shutdown hook when not in shutdown + if (!ShutdownHookManager.get().isShutdownInProgress()) { ShutdownHookManager.get().addShutdownHook(new KeyProviderCacheFinalizer(), SHUTDOWN_HOOK_PRIORITY); - } catch (IllegalStateException e) { - LOG.warn("shutdownHook not added", e); } } From 3c8fd54901769d4be5f14710bebf60259764c1c7 Mon Sep 17 00:00:00 2001 From: Xing Lin Date: Tue, 13 Dec 2022 11:03:05 -0800 Subject: [PATCH 3/3] Fixed checkstyle --- .../src/main/java/org/apache/hadoop/hdfs/KeyProviderCache.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/hadoop-hdfs-project/hadoop-hdfs-client/src/main/java/org/apache/hadoop/hdfs/KeyProviderCache.java b/hadoop-hdfs-project/hadoop-hdfs-client/src/main/java/org/apache/hadoop/hdfs/KeyProviderCache.java index 08a2c3580a22c..ee97b96ea78c8 100644 --- a/hadoop-hdfs-project/hadoop-hdfs-client/src/main/java/org/apache/hadoop/hdfs/KeyProviderCache.java +++ b/hadoop-hdfs-project/hadoop-hdfs-client/src/main/java/org/apache/hadoop/hdfs/KeyProviderCache.java @@ -70,7 +70,8 @@ public void onRemoval( // Register the shutdown hook when not in shutdown if (!ShutdownHookManager.get().isShutdownInProgress()) { - ShutdownHookManager.get().addShutdownHook(new KeyProviderCacheFinalizer(), SHUTDOWN_HOOK_PRIORITY); + ShutdownHookManager.get().addShutdownHook( + new KeyProviderCacheFinalizer(), SHUTDOWN_HOOK_PRIORITY); } }