fix bug when killTask may kill main thread

WeDataSphere · Dec 13, 2023 · f12436c · f12436c
1 parent 7599b05
commit f12436c
Showing 1 changed file with 8 additions and 3 deletions.
diff --git a/...rc/main/scala/org/apache/linkis/engineplugin/spark/executor/SparkEngineConnExecutor.scala b/...rc/main/scala/org/apache/linkis/engineplugin/spark/executor/SparkEngineConnExecutor.scala
@@ -315,9 +315,14 @@ abstract class SparkEngineConnExecutor(val sc: SparkContext, id: Long)
         logger.info(s"thread isInterrupted:${thread.isInterrupted}")
 
         if (closeThreadEnable) {
-          logger.info(s"try to force stop thread:${thread.getName}")
-          // force to stop scala thread
-          Utils.tryAndWarn(thread.stop())
+          val threadName = thread.getName
+          if (threadName.contains("Linkis-Default-Scheduler-Thread-")) {
+            logger.info(s"try to force stop thread:${threadName}")
+            // force to stop scala thread
+            Utils.tryAndWarn(thread.stop())
+          } else {
+            logger.info(s"skip to force stop thread:${threadName}")
+          }
         }
       }
       killRunningTask()