From d43fa9504350a5ec5b7f8e62a22f517b3749e172 Mon Sep 17 00:00:00 2001 From: Xing Lin Date: Fri, 16 Dec 2022 08:46:14 -0800 Subject: [PATCH] HDFS-16852. Skip KeyProviderCache shutdown hook registration if already shutting down (#5160) Signed-off-by: Erik Krogen (cherry picked from commit f7bdf6c667d503c0eebbc3efcdfe4ba6bf2d6275) --- .../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 62902f2a7e..48afed1816 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 class KeyProviderCache { }) .build(); - ShutdownHookManager.get().addShutdownHook(new KeyProviderCacheFinalizer(), - SHUTDOWN_HOOK_PRIORITY); + // Register the shutdown hook when not in shutdown + if (!ShutdownHookManager.get().isShutdownInProgress()) { + ShutdownHookManager.get().addShutdownHook( + new KeyProviderCacheFinalizer(), SHUTDOWN_HOOK_PRIORITY); + } } public KeyProvider get(final Configuration conf,