[zeppelin] branch master updated: [ZEPPELIN-4809]. Zeppelin FlinkInterpreterLauncher not work in Zeppelin cluster mode

[zjffdu]

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

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


The following commit(s) were added to refs/heads/master by this push:
     new bb05460  [ZEPPELIN-4809]. Zeppelin FlinkInterpreterLauncher not work 
in Zeppelin cluster mode
bb05460 is described below

commit bb05460972e3663363d3540be90ab1c582006ce4
Author: Jeff Zhang <zjf...@apache.org>
AuthorDate: Sat May 9 15:18:52 2020 +0800

    [ZEPPELIN-4809]. Zeppelin FlinkInterpreterLauncher not work in Zeppelin 
cluster mode
    
    ### What is this PR for?
    
    Flink doesn't work in cluster mode because we didn't use 
`FlinkInterpreterLauncher` in `DockerInterpreterLauncher` which is used in 
cluster mode. It is a straightforward change to just use 
`FlinkInterpreterLauncher` in `DockerInterpreterLauncher`
    
    ### What type of PR is it?
    [Bug Fix]
    
    ### Todos
    * [ ] - Task
    
    ### What is the Jira issue?
    * https://issues.apache.org/jira/browse/ZEPPELIN-4809
    
    ### How should this be tested?
    * CI pass
    
    ### Screenshots (if appropriate)
    
    ### Questions:
    * Does the licenses files need update? No
    * Is there breaking changes for older versions? No
    * Does this needs documentation? No
    
    Author: Jeff Zhang <zjf...@apache.org>
    
    Closes #3768 from zjffdu/ZEPPELIN-4809 and squashes the following commits:
    
    1733a7136 [Jeff Zhang] [ZEPPELIN-4809]. Zeppelin FlinkInterpreterLauncher 
not work in Zeppelin cluster mode
---
 zeppelin-plugins/launcher/docker/pom.xml                            | 6 ++++++
 .../zeppelin/interpreter/launcher/DockerInterpreterLauncher.java    | 6 ++++++
 2 files changed, 12 insertions(+)

diff --git a/zeppelin-plugins/launcher/docker/pom.xml 
b/zeppelin-plugins/launcher/docker/pom.xml
index b9a47cb..510c80d 100644
--- a/zeppelin-plugins/launcher/docker/pom.xml
+++ b/zeppelin-plugins/launcher/docker/pom.xml
@@ -42,6 +42,12 @@
 
   <dependencies>
     <dependency>
+      <groupId>org.apache.zeppelin</groupId>
+      <artifactId>launcher-flink</artifactId>
+      <version>${project.version}</version>
+    </dependency>
+
+    <dependency>
       <groupId>com.hubspot.jinjava</groupId>
       <artifactId>jinjava</artifactId>
       <version>2.4.12</version>
diff --git 
a/zeppelin-plugins/launcher/docker/src/main/java/org/apache/zeppelin/interpreter/launcher/DockerInterpreterLauncher.java
 
b/zeppelin-plugins/launcher/docker/src/main/java/org/apache/zeppelin/interpreter/launcher/DockerInterpreterLauncher.java
index 89a38d3..e6c9ae1 100644
--- 
a/zeppelin-plugins/launcher/docker/src/main/java/org/apache/zeppelin/interpreter/launcher/DockerInterpreterLauncher.java
+++ 
b/zeppelin-plugins/launcher/docker/src/main/java/org/apache/zeppelin/interpreter/launcher/DockerInterpreterLauncher.java
@@ -55,6 +55,8 @@ public class DockerInterpreterLauncher extends 
InterpreterLauncher {
     StandardInterpreterLauncher interpreterLauncher = null;
     if (isSpark()) {
       interpreterLauncher = new SparkInterpreterLauncher(zConf, 
recoveryStorage);
+    } else if (isFlink()) {
+      interpreterLauncher = new FlinkInterpreterLauncher(zConf, 
recoveryStorage);
     } else {
       interpreterLauncher = new StandardInterpreterLauncher(zConf, 
recoveryStorage);
     }
@@ -77,4 +79,8 @@ public class DockerInterpreterLauncher extends 
InterpreterLauncher {
   boolean isSpark() {
     return "spark".equalsIgnoreCase(context.getInterpreterSettingName());
   }
+
+  boolean isFlink() {
+    return "flink".equalsIgnoreCase(context.getInterpreterSettingName());
+  }
 }