diff --git a/dolphinscheduler-server/src/main/java/org/apache/dolphinscheduler/server/worker/task/AbstractCommandExecutor.java b/dolphinscheduler-server/src/main/java/org/apache/dolphinscheduler/server/worker/task/AbstractCommandExecutor.java index 7a14223b95219aaf9d90dfa9447e2587f397da78..11934dea4c1f520712e32043f595df116969b70e 100644 --- a/dolphinscheduler-server/src/main/java/org/apache/dolphinscheduler/server/worker/task/AbstractCommandExecutor.java +++ b/dolphinscheduler-server/src/main/java/org/apache/dolphinscheduler/server/worker/task/AbstractCommandExecutor.java @@ -207,7 +207,7 @@ public abstract class AbstractCommandExecutor { // merge error information to standard output stream processBuilder.redirectErrorStream(true); // setting up user to run commands - processBuilder.command("sudo", "-u", tenantCode, commandType(), commandFile); + processBuilder.command("sudo", "-u", tenantCode, commandInterpreter(), commandFile); process = processBuilder.start(); @@ -561,7 +561,7 @@ public abstract class AbstractCommandExecutor { protected abstract String buildCommandFilePath(); - protected abstract String commandType(); + protected abstract String commandInterpreter(); protected abstract boolean checkFindApp(String line); protected abstract void createCommandFileIfNotExists(String execCommand, String commandFile) throws IOException; } diff --git a/dolphinscheduler-server/src/main/java/org/apache/dolphinscheduler/server/worker/task/PythonCommandExecutor.java b/dolphinscheduler-server/src/main/java/org/apache/dolphinscheduler/server/worker/task/PythonCommandExecutor.java index c1ff89d4cfb19b814cc38199b1a304bbd02fdec3..c943e5d9d7caaf83a1a09ba2d690027e6464af98 100644 --- a/dolphinscheduler-server/src/main/java/org/apache/dolphinscheduler/server/worker/task/PythonCommandExecutor.java +++ b/dolphinscheduler-server/src/main/java/org/apache/dolphinscheduler/server/worker/task/PythonCommandExecutor.java @@ -113,7 +113,7 @@ public class PythonCommandExecutor extends AbstractCommandExecutor { * @return python home */ @Override - protected String commandType() { + protected String commandInterpreter() { String pythonHome = getPythonHome(envFile); if (StringUtils.isEmpty(pythonHome)){ return PYTHON; diff --git a/dolphinscheduler-server/src/main/java/org/apache/dolphinscheduler/server/worker/task/ShellCommandExecutor.java b/dolphinscheduler-server/src/main/java/org/apache/dolphinscheduler/server/worker/task/ShellCommandExecutor.java index d1a7fa225869f815f31fdb648a2e732abece7beb..db46d0d8562ad5d1d2c9a5fa2a91cdd4b23eef52 100644 --- a/dolphinscheduler-server/src/main/java/org/apache/dolphinscheduler/server/worker/task/ShellCommandExecutor.java +++ b/dolphinscheduler-server/src/main/java/org/apache/dolphinscheduler/server/worker/task/ShellCommandExecutor.java @@ -74,7 +74,7 @@ public class ShellCommandExecutor extends AbstractCommandExecutor { * @return command type */ @Override - protected String commandType() { + protected String commandInterpreter() { return SH; }