Răsfoiți Sursa

[livy] Kill the Yarn Job if livy-repl didn't cleanly shut down

Erick Tryzelaar 10 ani în urmă
părinte
comite
243c54c

+ 4 - 2
apps/spark/java/livy-server/src/main/scala/com/cloudera/hue/livy/server/sessions/YarnSession.scala

@@ -86,8 +86,10 @@ private class YarnSession(id: Int,
     super.stop().andThen {
       case _ =>
         try {
-          val job_ = Await.result(job, Duration(1, TimeUnit.SECONDS))
-          job_.waitForFinish(10000)
+          val job_ = Await.result(job, Duration(10, TimeUnit.SECONDS))
+          job_.waitForFinish(10000).getOrElse {
+            job_.stop()
+          }
         } catch {
           case e: Throwable =>
             _state = Error()