[flink] branch master updated: [FLINK-10702][scala-shell] Yarn app is not killed when scala shell is terminated

[tr...@apache.org]

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

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


The following commit(s) were added to refs/heads/master by this push:
     new f1eaf06  [FLINK-10702][scala-shell] Yarn app is not killed when scala shell is terminated
f1eaf06 is described below

commit f1eaf060d77d7942a5594a433bceb4fc740e7f97
Author: Jeff Zhang <zj...@apache.org>
AuthorDate: Sat Oct 27 11:23:14 2018 +0800

    [FLINK-10702][scala-shell] Yarn app is not killed when scala shell is terminated
---
 .../src/main/scala/org/apache/flink/api/scala/FlinkShell.scala        | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/flink-scala-shell/src/main/scala/org/apache/flink/api/scala/FlinkShell.scala b/flink-scala-shell/src/main/scala/org/apache/flink/api/scala/FlinkShell.scala
index cf60a14..835c01c 100644
--- a/flink-scala-shell/src/main/scala/org/apache/flink/api/scala/FlinkShell.scala
+++ b/flink-scala-shell/src/main/scala/org/apache/flink/api/scala/FlinkShell.scala
@@ -228,7 +228,9 @@ object FlinkShell {
       repl.closeInterpreter()
       cluster match {
         case Some(Left(miniCluster)) => miniCluster.close()
-        case Some(Right(yarnCluster)) => yarnCluster.shutdown()
+        case Some(Right(yarnCluster)) =>
+          yarnCluster.shutDownCluster()
+          yarnCluster.shutdown()
         case _ =>
       }
     }