Preparing Kyuubi v0.4.0 release

[KYUUBI-143][Backport] Set active SparkContext in KyuubiOperation

kyuubi-server/pom.xml

@@ -22,7 +22,7 @@
     <parent>
         <artifactId>kyuubi</artifactId>
         <groupId>yaooqinn</groupId>
-        <version>0.4.0-SNAPSHOT</version>
+        <version>0.4.1</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

kyuubi-server/src/main/scala/org/apache/spark/KyuubiSparkUtil.scala

@@ -238,6 +238,10 @@ object KyuubiSparkUtil extends Logging {
     Utils.getPropertiesFromFile(filename)
   }
 
+  def setActiveSparkContext(sc: SparkContext): Unit = {
+    SparkContext.setActiveContext(sc, allowMultipleContexts = true)
+  }
+
   /**
    * Get and set Kyuubi Jar First ClassLoader
    */

kyuubi-server/src/main/scala/yaooqinn/kyuubi/operation/KyuubiOperation.scala

@@ -314,6 +314,7 @@ class KyuubiOperation(session: KyuubiSession, statement: String) extends Logging
           session.getUserName)
       }
       session.sparkSession.sparkContext.setJobGroup(statementId, statement)
+      KyuubiSparkUtil.setActiveSparkContext(session.sparkSession.sparkContext)
       result = session.sparkSession.sql(statement)
       KyuubiServerMonitor.getListener(session.getUserName).foreach {
         _.onStatementParsed(statementId, result.queryExecution.toString())

kyuubi-server/src/test/scala/org/apache/spark/KyuubiSparkUtilSuite.scala

@@ -335,4 +335,18 @@ class KyuubiSparkUtilSuite extends SparkFunSuite with Logging {
     val e9 = KyuubiSparkUtil.findCause(e0)
     assert(e9 === e0)
   }
+
+  test("set active spark context") {
+    val conf = new SparkConf(true)
+      .setMaster("local")
+      .setAppName("active context")
+      .set(KyuubiSparkUtil.MULTIPLE_CONTEXTS, "true")
+    val sc1 = new SparkContext(conf)
+    assert(SparkContext.getActive.contains(sc1))
+    sc1.stop()
+    assert(SparkContext.getActive.isEmpty)
+    KyuubiSparkUtil.setActiveSparkContext(sc1)
+    assert(SparkContext.getActive.contains(sc1))
+    SparkContext.clearActiveContext()
+  }
 }

pom.xml

@@ -23,7 +23,7 @@
     <groupId>yaooqinn</groupId>
     <artifactId>kyuubi</artifactId>
     <name>Kyuubi Parent</name>
-    <version>0.4.0-SNAPSHOT</version>
+    <version>0.4.1</version>
     <modules>
         <module>kyuubi-server</module>
     </modules>