[zeppelin] branch master updated: [hotfix] FLINK_CONF_DIR is not configurable

[zj...@apache.org]

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 f857985  [hotfix] FLINK_CONF_DIR is not configurable
f857985 is described below

commit f85798535969a2bb43ff165a67f56429ea5108f2
Author: Jeff Zhang <zj...@apache.org>
AuthorDate: Mon Jul 27 23:02:13 2020 +0800

    [hotfix] FLINK_CONF_DIR is not configurable
---
 .../zeppelin/interpreter/launcher/FlinkInterpreterLauncher.java       | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/zeppelin-plugins/launcher/flink/src/main/java/org/apache/zeppelin/interpreter/launcher/FlinkInterpreterLauncher.java b/zeppelin-plugins/launcher/flink/src/main/java/org/apache/zeppelin/interpreter/launcher/FlinkInterpreterLauncher.java
index 248c7e7..dd162b1 100644
--- a/zeppelin-plugins/launcher/flink/src/main/java/org/apache/zeppelin/interpreter/launcher/FlinkInterpreterLauncher.java
+++ b/zeppelin-plugins/launcher/flink/src/main/java/org/apache/zeppelin/interpreter/launcher/FlinkInterpreterLauncher.java
@@ -47,7 +47,9 @@ public class FlinkInterpreterLauncher extends StandardInterpreterLauncher {
       throw new IOException(String.format("FLINK_HOME '%s' is a file, but should be directory",
               flinkHome));
     }
-    envs.put("FLINK_CONF_DIR", flinkHome + "/conf");
+    if (!envs.containsKey("FLINK_CONF_DIR")) {
+      envs.put("FLINK_CONF_DIR", flinkHome + "/conf");
+    }
     envs.put("FLINK_LIB_DIR", flinkHome + "/lib");
     envs.put("FLINK_PLUGINS_DIR", flinkHome + "/plugins");
     return envs;