Browse Source

[fix] Change the default unix shell executor from sh to bash (#12180)

Co-authored-by: Kerwin <37063904+zhuangchong@users.noreply.github.com>
3.2.0-release
simsicon 2 years ago committed by GitHub
parent
commit
ba538067f2
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
  1. 3
      docs/docs/en/guide/upgrade/incompatible.md
  2. 3
      docs/docs/zh/guide/upgrade/incompatible.md
  3. 1
      dolphinscheduler-task-plugin/dolphinscheduler-task-api/src/main/java/org/apache/dolphinscheduler/plugin/task/api/AbstractCommandExecutor.java
  4. 4
      dolphinscheduler-task-plugin/dolphinscheduler-task-api/src/main/java/org/apache/dolphinscheduler/plugin/task/api/ShellCommandExecutor.java

3
docs/docs/en/guide/upgrade/incompatible.md

@ -5,8 +5,9 @@ This document records the incompatible updates between each version. You need to
## dev ## dev
* Remove the spark version of spark task ([#11860](https://github.com/apache/dolphinscheduler/pull/11860)). * Remove the spark version of spark task ([#11860](https://github.com/apache/dolphinscheduler/pull/11860)).
* Change the default unix shell executor from sh to bash ([#12180](https://github.com/apache/dolphinscheduler/pull/12180)).
## 3.0.0 ## 3.0.0
* Copy and import workflow without 'copy' suffix [#10607](https://github.com/apache/dolphinscheduler/pull/10607) * Copy and import workflow without 'copy' suffix [#10607](https://github.com/apache/dolphinscheduler/pull/10607)
* Use semicolon as default sql segment separator [#10869](https://github.com/apache/dolphinscheduler/pull/10869) * Use semicolon as default sql segment separator [#10869](https://github.com/apache/dolphinscheduler/pull/10869)

3
docs/docs/zh/guide/upgrade/incompatible.md

@ -5,8 +5,9 @@
## dev ## dev
* Remove the spark version of spark task ([#11860](https://github.com/apache/dolphinscheduler/pull/11860)). * Remove the spark version of spark task ([#11860](https://github.com/apache/dolphinscheduler/pull/11860)).
* Change the default unix shell executor from sh to bash ([#12180](https://github.com/apache/dolphinscheduler/pull/12180)).
## 3.0.0 ## 3.0.0
* Copy and import workflow without 'copy' suffix [#10607](https://github.com/apache/dolphinscheduler/pull/10607) * Copy and import workflow without 'copy' suffix [#10607](https://github.com/apache/dolphinscheduler/pull/10607)
* Use semicolon as default sql segment separator [#10869](https://github.com/apache/dolphinscheduler/pull/10869) * Use semicolon as default sql segment separator [#10869](https://github.com/apache/dolphinscheduler/pull/10869)

1
dolphinscheduler-task-plugin/dolphinscheduler-task-api/src/main/java/org/apache/dolphinscheduler/plugin/task/api/AbstractCommandExecutor.java

@ -131,6 +131,7 @@ public abstract class AbstractCommandExecutor {
command.add("sudo"); command.add("sudo");
command.add("-u"); command.add("-u");
command.add(taskRequest.getTenantCode()); command.add(taskRequest.getTenantCode());
command.add("-E");
} }
} }
command.add(commandInterpreter()); command.add(commandInterpreter());

4
dolphinscheduler-task-plugin/dolphinscheduler-task-api/src/main/java/org/apache/dolphinscheduler/plugin/task/api/ShellCommandExecutor.java

@ -38,9 +38,9 @@ import com.google.common.base.Strings;
public class ShellCommandExecutor extends AbstractCommandExecutor { public class ShellCommandExecutor extends AbstractCommandExecutor {
/** /**
* For Unix-like, using sh * For Unix-like, using bash
*/ */
private static final String SH = "sh"; private static final String SH = "bash";
/** /**
* For Windows, using cmd.exe * For Windows, using cmd.exe

Loading…
Cancel
Save