Don't source env file in task, this will override tenant's environment (

#13028)
apache · Nov 28, 2022 · 32a8241 · 32a8241
1 parent a0eb45b
commit 32a8241
Show file tree

Hide file tree

Showing 4 changed files with 0 additions and 33 deletions.
diff --git a/...k-api/src/main/java/org/apache/dolphinscheduler/plugin/task/api/ShellCommandExecutor.java b/...k-api/src/main/java/org/apache/dolphinscheduler/plugin/task/api/ShellCommandExecutor.java
@@ -95,21 +95,13 @@ protected void createCommandFileIfNotExists(String execCommand, String commandFi
             sb.append("cd /d %~dp0").append(System.lineSeparator());
             if (StringUtils.isNotBlank(taskRequest.getEnvironmentConfig())) {
                 sb.append(taskRequest.getEnvironmentConfig()).append(System.lineSeparator());
-            } else {
-                if (taskRequest.getEnvFile() != null) {
-                    sb.append("call ").append(taskRequest.getEnvFile()).append(System.lineSeparator());
-                }
             }
         } else {
             sb.append("#!/bin/bash").append(System.lineSeparator());
             sb.append("BASEDIR=$(cd `dirname $0`; pwd)").append(System.lineSeparator());
             sb.append("cd $BASEDIR").append(System.lineSeparator());
             if (StringUtils.isNotBlank(taskRequest.getEnvironmentConfig())) {
                 sb.append(taskRequest.getEnvironmentConfig()).append(System.lineSeparator());
-            } else {
-                if (taskRequest.getEnvFile() != null) {
-                    sb.append("source ").append(taskRequest.getEnvFile()).append(System.lineSeparator());
-                }
             }
         }
         sb.append(execCommand);

diff --git a/...k-api/src/main/java/org/apache/dolphinscheduler/plugin/task/api/TaskExecutionContext.java b/...k-api/src/main/java/org/apache/dolphinscheduler/plugin/task/api/TaskExecutionContext.java
@@ -166,11 +166,6 @@ public class TaskExecutionContext implements Serializable {
      */
     private String taskParams;
 
-    /**
-     * envFile
-     */
-    private String envFile;
-
     /**
      * environmentConfig
      */

diff --git a/...main/java/org/apache/dolphinscheduler/server/worker/runner/WorkerTaskExecuteRunnable.java b/...main/java/org/apache/dolphinscheduler/server/worker/runner/WorkerTaskExecuteRunnable.java
@@ -196,10 +196,6 @@ protected void initializeTask() {
         taskExecutionContext.setStartTime(taskStartTime);
         logger.info("Set task startTime: {}", taskStartTime);
 
-        String systemEnvPath = CommonUtils.getSystemEnvPath();
-        taskExecutionContext.setEnvFile(systemEnvPath);
-        logger.info("Set task envFile: {}", systemEnvPath);
-
         String taskAppId = String.format("%s_%s", taskExecutionContext.getProcessInstanceId(),
                 taskExecutionContext.getTaskInstanceId());
         taskExecutionContext.setTaskAppId(taskAppId);

diff --git a/script/env/dolphinscheduler_env.sh b/script/env/dolphinscheduler_env.sh
@@ -15,26 +15,10 @@
 # limitations under the License.
 #
 
-# JAVA_HOME, will use it to start DolphinScheduler server
-export JAVA_HOME=${JAVA_HOME:-/opt/java/openjdk}
 
 # Never put sensitive config such as database password here in your production environment,
 # this file will be sourced everytime a new task is executed.
 
-# Tasks related configurations, need to change the configuration if you use the related tasks.
-export HADOOP_HOME=${HADOOP_HOME:-/opt/soft/hadoop}
-export HADOOP_CONF_DIR=${HADOOP_CONF_DIR:-/opt/soft/hadoop/etc/hadoop}
-export SPARK_HOME=${SPARK_HOME:-/opt/soft/spark}
-export PYTHON_HOME=${PYTHON_HOME:-/opt/soft/python}
-export HIVE_HOME=${HIVE_HOME:-/opt/soft/hive}
-export FLINK_HOME=${FLINK_HOME:-/opt/soft/flink}
-export DATAX_HOME=${DATAX_HOME:-/opt/soft/datax}
-export SEATUNNEL_HOME=${SEATUNNEL_HOME:-/opt/soft/seatunnel}
-export CHUNJUN_HOME=${CHUNJUN_HOME:-/opt/soft/chunjun}
-export LINKIS_HOME=${LINKIS_HOME:-/opt/soft/linkis}
-
-export PATH=$HADOOP_HOME/bin:$SPARK_HOME/bin:$PYTHON_HOME/bin:$JAVA_HOME/bin:$HIVE_HOME/bin:$FLINK_HOME/bin:$DATAX_HOME/bin:$SEATUNNEL_HOME/bin:$CHUNJUN_HOME/bin:$PATH
-
 # applicationId auto collection related configuration, the following configurations are unnecessary if setting appId.collect=log
 #export HADOOP_CLASSPATH=`hadoop classpath`:${DOLPHINSCHEDULER_HOME}/tools/libs/*
 #export SPARK_DIST_CLASSPATH=$HADOOP_CLASSPATH:$SPARK_DIST_CLASS_PATH