You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@kyuubi.apache.org by fe...@apache.org on 2022/12/27 08:33:19 UTC

[kyuubi] branch master updated: [KYUUBI #4031] [PYSPARK] Refactor the python process watcher

This is an automated email from the ASF dual-hosted git repository.

feiwang pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/kyuubi.git


The following commit(s) were added to refs/heads/master by this push:
     new 70bd55dd6 [KYUUBI #4031] [PYSPARK] Refactor the python process watcher
70bd55dd6 is described below

commit 70bd55dd6854ad1e6071878929583c07dad0a83a
Author: fwang12 <fw...@ebay.com>
AuthorDate: Tue Dec 27 16:33:12 2022 +0800

    [KYUUBI #4031] [PYSPARK] Refactor the python process watcher
    
    ### _Why are the changes needed?_
    
    Before:
    <img width="1096" alt="image" src="https://user-images.githubusercontent.com/6757692/209627576-1eb2759c-48cd-446a-bbec-4dd219a8bec9.png">
    
    After:
    <img width="956" alt="image" src="https://user-images.githubusercontent.com/6757692/209627658-2c9c09e6-a9b0-478e-ae13-f1c6e7538a3e.png">
    
    ### _How was this patch tested?_
    - [ ] Add some test cases that check the changes thoroughly including negative and positive cases if possible
    
    - [x] Add screenshots for manual tests if appropriate
    
    - [x] [Run test](https://kyuubi.apache.org/docs/latest/develop_tools/testing.html#running-tests) locally before make a pull request
    
    Closes #4031 from turboFei/inter_exception.
    
    Closes #4031
    
    c551c45cb [fwang12] refactor
    c490a40d0 [fwang12] ignore interrupted exception for watcher
    
    Authored-by: fwang12 <fw...@ebay.com>
    Signed-off-by: fwang12 <fw...@ebay.com>
---
 .../engine/spark/operation/ExecutePython.scala     | 26 ++++++++++++++--------
 1 file changed, 17 insertions(+), 9 deletions(-)

diff --git a/externals/kyuubi-spark-sql-engine/src/main/scala/org/apache/kyuubi/engine/spark/operation/ExecutePython.scala b/externals/kyuubi-spark-sql-engine/src/main/scala/org/apache/kyuubi/engine/spark/operation/ExecutePython.scala
index 06d1e19a2..78a016d54 100644
--- a/externals/kyuubi-spark-sql-engine/src/main/scala/org/apache/kyuubi/engine/spark/operation/ExecutePython.scala
+++ b/externals/kyuubi-spark-sql-engine/src/main/scala/org/apache/kyuubi/engine/spark/operation/ExecutePython.scala
@@ -251,6 +251,7 @@ object ExecutePython extends Logging {
   }
 
   def createSessionPythonWorker(spark: SparkSession, session: Session): SessionPythonWorker = {
+    val sessionId = session.handle.identifier.toString
     val pythonExec = StringUtils.firstNonBlank(
       spark.conf.getOption("spark.pyspark.driver.python").orNull,
       spark.conf.getOption("spark.pyspark.python").orNull,
@@ -278,7 +279,7 @@ object ExecutePython extends Logging {
           "SPARK_HOME",
           getSparkPythonHomeFromArchive(spark, session).getOrElse(defaultSparkHome)))
     }
-    env.put("KYUUBI_SPARK_SESSION_UUID", session.handle.identifier.toString)
+    env.put("KYUUBI_SPARK_SESSION_UUID", sessionId)
     env.put("PYTHON_GATEWAY_CONNECTION_INFO", KyuubiPythonGatewayServer.CONNECTION_FILE_PATH)
     logger.info(
       s"""
@@ -288,7 +289,10 @@ object ExecutePython extends Logging {
          |""".stripMargin)
     builder.redirectError(Redirect.PIPE)
     val process = builder.start()
-    SessionPythonWorker(startStderrSteamReader(process), startWatcher(process), process)
+    SessionPythonWorker(
+      startStderrSteamReader(process, sessionId),
+      startWatcher(process, sessionId),
+      process)
   }
 
   def getSparkPythonExecFromArchive(spark: SparkSession, session: Session): Option[String] = {
@@ -337,8 +341,8 @@ object ExecutePython extends Logging {
       }
   }
 
-  private def startStderrSteamReader(process: Process): Thread = {
-    val stderrThread = new Thread("process stderr thread") {
+  private def startStderrSteamReader(process: Process, sessionId: String): Thread = {
+    val stderrThread = new Thread(s"session[$sessionId] process stderr thread") {
       override def run(): Unit = {
         val lines = scala.io.Source.fromInputStream(process.getErrorStream).getLines()
         lines.filter(_.trim.nonEmpty).foreach(logger.error)
@@ -349,12 +353,16 @@ object ExecutePython extends Logging {
     stderrThread
   }
 
-  def startWatcher(process: Process): Thread = {
-    val processWatcherThread = new Thread("process watcher thread") {
+  def startWatcher(process: Process, sessionId: String): Thread = {
+    val processWatcherThread = new Thread(s"session[$sessionId] process watcher thread") {
       override def run(): Unit = {
-        val exitCode = process.waitFor()
-        if (exitCode != 0) {
-          logger.error(f"Process has died with $exitCode")
+        try {
+          val exitCode = process.waitFor()
+          if (exitCode != 0) {
+            logger.error(f"Process has died with $exitCode")
+          }
+        } catch {
+          case _: InterruptedException => logger.warn("Process has been interrupted")
         }
       }
     }