prevent npe

apache · Oct 28, 2024 · 78c2a6c · 78c2a6c
1 parent cbb11f5
commit 78c2a6c
Showing 1 changed file with 11 additions and 1 deletion.
diff --git a/kyuubi-server/src/main/scala/org/apache/kyuubi/engine/KubernetesApplicationOperation.scala b/kyuubi-server/src/main/scala/org/apache/kyuubi/engine/KubernetesApplicationOperation.scala
@@ -151,6 +151,7 @@ class KubernetesApplicationOperation extends ApplicationOperation with Logging {
       expireCleanUpTriggerCacheExecutor,
       () => {
         try {
+          if (cleanupTerminatedAppInfoTrigger == null) return
           cleanupTerminatedAppInfoTrigger.asMap().asScala.foreach {
             case (key, _) =>
               // do get to trigger cache eviction
@@ -266,14 +267,23 @@ class KubernetesApplicationOperation extends ApplicationOperation with Logging {
 
     if (cleanupTerminatedAppInfoTrigger != null) {
       cleanupTerminatedAppInfoTrigger.invalidateAll()
-      ThreadUtils.shutdown(expireCleanUpTriggerCacheExecutor)
       cleanupTerminatedAppInfoTrigger = null
     }
 
     kubernetesClients.asScala.foreach { case (_, client) =>
       Utils.tryLogNonFatalError(client.close())
     }
     kubernetesClients.clear()
+
+    if (expireCleanUpTriggerCacheExecutor != null) {
+      ThreadUtils.shutdown(expireCleanUpTriggerCacheExecutor)
+      expireCleanUpTriggerCacheExecutor = null
+    }
+
+    if (cleanupCanceledAppPodExecutor != null) {
+      ThreadUtils.shutdown(cleanupCanceledAppPodExecutor)
+      cleanupCanceledAppPodExecutor = null
+    }
   }
 
   private class SparkEnginePodEventHandler(kubernetesInfo: KubernetesInfo)