Merge pull request #127 from hustfeiwang/KYUUBI-125

KYUUBI-125 fix the error when create session in SparkSessionWithUGI fix #125
apache · Dec 6, 2018 · df1abd4 · df1abd4
2 parents 989068b + 1e204ba
commit df1abd4
Showing 1 changed file with 5 additions and 2 deletions.
diff --git a/kyuubi-server/src/main/scala/yaooqinn/kyuubi/spark/SparkSessionWithUGI.scala b/kyuubi-server/src/main/scala/yaooqinn/kyuubi/spark/SparkSessionWithUGI.scala
@@ -156,9 +156,10 @@ class SparkSessionWithUGI(
     conf.setAppName(appName)
     configureSparkConf(sessionConf)
     val totalWaitTime: Long = conf.getTimeAsSeconds(BACKEND_SESSTION_INIT_TIMEOUT)
+    val newContextThread = newContext()
     try {
       KyuubiHadoopUtil.doAs(user) {
-        newContext().start()
+        newContextThread.start()
         val context =
           Await.result(promisedSparkContext.future, Duration(totalWaitTime, TimeUnit.SECONDS))
         _sparkSession = ReflectUtils.newInstance(
@@ -181,7 +182,9 @@ class SparkSessionWithUGI(
         throw ke
     } finally {
       SparkSessionWithUGI.setFullyConstructed(userName)
-      newContext().join()
+      if (newContextThread.isAlive) {
+        newContextThread.join()
+      }
     }
 
     KyuubiServerMonitor.setListener(userName, new KyuubiServerListener(conf))