From 070fd511453ca03ac4c1d4991cc3ebc190944c92 Mon Sep 17 00:00:00 2001 From: qiaozhanwei Date: Mon, 30 Sep 2019 15:21:59 +0800 Subject: [PATCH] .escheduler_env.sh to dolphinscheduler_env.sh (#941) * add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml * .escheduler_env.sh to dolphinscheduler_env.sh --- .../src/main/resources/common/common.properties | 2 +- .../org/apache/dolphinscheduler/server/worker/EnvFileTest.java | 2 +- install.sh | 2 +- script/env/{.escheduler_env.sh => .dolphinscheduler_env.sh} | 0 4 files changed, 3 insertions(+), 3 deletions(-) rename script/env/{.escheduler_env.sh => .dolphinscheduler_env.sh} (100%) diff --git a/dolphinscheduler-common/src/main/resources/common/common.properties b/dolphinscheduler-common/src/main/resources/common/common.properties index 27d525f8f5..56b13dd373 100644 --- a/dolphinscheduler-common/src/main/resources/common/common.properties +++ b/dolphinscheduler-common/src/main/resources/common/common.properties @@ -32,7 +32,7 @@ login.user.keytab.username=hdfs-mycluster@ESZ.COM login.user.keytab.path=/opt/hdfs.headless.keytab # system env path. self configuration, please make sure the directory and file exists and have read write execute permissions -escheduler.env.path=/opt/.escheduler_env.sh +escheduler.env.path=/opt/.dolphinscheduler_env.sh #resource.view.suffixs resource.view.suffixs=txt,log,sh,conf,cfg,py,java,sql,hql,xml diff --git a/dolphinscheduler-server/src/test/java/org/apache/dolphinscheduler/server/worker/EnvFileTest.java b/dolphinscheduler-server/src/test/java/org/apache/dolphinscheduler/server/worker/EnvFileTest.java index 5aceb67573..3556ee4502 100644 --- a/dolphinscheduler-server/src/test/java/org/apache/dolphinscheduler/server/worker/EnvFileTest.java +++ b/dolphinscheduler-server/src/test/java/org/apache/dolphinscheduler/server/worker/EnvFileTest.java @@ -17,7 +17,7 @@ public class EnvFileTest { @Test public void test() { - String path = System.getProperty("user.dir")+"/script/env/.escheduler_env.sh"; + String path = System.getProperty("user.dir")+"/script/env/.dolphinscheduler_env.sh"; String pythonHome = getPythonHome(path); logger.info(pythonHome); } diff --git a/install.sh b/install.sh index dc09ce3c97..bf87f686dc 100644 --- a/install.sh +++ b/install.sh @@ -161,7 +161,7 @@ downloadPath="/tmp/escheduler/download" execPath="/tmp/escheduler/exec" # SHELL environmental variable path -shellEnvPath="$installPath/conf/env/.escheduler_env.sh" +shellEnvPath="$installPath/conf/env/.dolphinscheduler_env.sh" # suffix of the resource file resSuffixs="txt,log,sh,conf,cfg,py,java,sql,hql,xml" diff --git a/script/env/.escheduler_env.sh b/script/env/.dolphinscheduler_env.sh similarity index 100% rename from script/env/.escheduler_env.sh rename to script/env/.dolphinscheduler_env.sh