natas_hw
/
dolphinscheduler0701
0
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

cherry-pick source is not available in sh (#12413) 

Co-authored-by: simsicon <simsicon@gmail.com>
This commit is contained in:
Kerwin 2022-10-18 13:24:57 +08:00 committed by GitHub
parent 703f9991b4
commit f0ad67f992
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 15 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
docs/docs/en/guide/upgrade/incompatible.md
View File

@ -4,7 +4,13 @@ This document records the incompatible updates between each version. You need to
## dev
* Remove the spark version of spark task ([#11860](https://github.com/apache/dolphinscheduler/pull/11860)).
## 3.0.0
* 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)
## 3.1.1
* Change the default unix shell executor from sh to bash ([#12180](https://github.com/apache/dolphinscheduler/pull/12180)).

6
docs/docs/zh/guide/upgrade/incompatible.md
View File

@ -4,7 +4,13 @@
## dev
* Remove the spark version of spark task ([#11860](https://github.com/apache/dolphinscheduler/pull/11860)).
## 3.0.0
* 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)
## 3.1.1
* Change the default unix shell executor from sh to bash ([#12180](https://github.com/apache/dolphinscheduler/pull/12180)).

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

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

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

@ -38,9 +38,9 @@ import com.google.common.base.Strings;
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