You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@dolphinscheduler.apache.org by ke...@apache.org on 2022/10/18 05:25:04 UTC
[dolphinscheduler] branch 3.1.1-prepare updated: cherry-pick source is not available in sh (#12413)
This is an automated email from the ASF dual-hosted git repository.
kerwin pushed a commit to branch 3.1.1-prepare
in repository https://gitbox.apache.org/repos/asf/dolphinscheduler.git
The following commit(s) were added to refs/heads/3.1.1-prepare by this push:
new f0ad67f992 cherry-pick source is not available in sh (#12413)
f0ad67f992 is described below
commit f0ad67f99262fc825a5bcdd4a067012c86f19c52
Author: Kerwin <37...@users.noreply.github.com>
AuthorDate: Tue Oct 18 13:24:57 2022 +0800
cherry-pick source is not available in sh (#12413)
Co-authored-by: simsicon <si...@gmail.com>
---
docs/docs/en/guide/upgrade/incompatible.md | 6 ++++++
docs/docs/zh/guide/upgrade/incompatible.md | 6 ++++++
.../dolphinscheduler/plugin/task/api/AbstractCommandExecutor.java | 1 +
.../dolphinscheduler/plugin/task/api/ShellCommandExecutor.java | 4 ++--
4 files changed, 15 insertions(+), 2 deletions(-)
diff --git a/docs/docs/en/guide/upgrade/incompatible.md b/docs/docs/en/guide/upgrade/incompatible.md
index fcdd7dd199..3f39beab0f 100644
--- a/docs/docs/en/guide/upgrade/incompatible.md
+++ b/docs/docs/en/guide/upgrade/incompatible.md
@@ -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)).
diff --git a/docs/docs/zh/guide/upgrade/incompatible.md b/docs/docs/zh/guide/upgrade/incompatible.md
index 9b154d37f5..e7e63f19b0 100644
--- a/docs/docs/zh/guide/upgrade/incompatible.md
+++ b/docs/docs/zh/guide/upgrade/incompatible.md
@@ -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)).
diff --git a/dolphinscheduler-task-plugin/dolphinscheduler-task-api/src/main/java/org/apache/dolphinscheduler/plugin/task/api/AbstractCommandExecutor.java b/dolphinscheduler-task-plugin/dolphinscheduler-task-api/src/main/java/org/apache/dolphinscheduler/plugin/task/api/AbstractCommandExecutor.java
index 49e224e95d..1f9897f5fe 100644
--- a/dolphinscheduler-task-plugin/dolphinscheduler-task-api/src/main/java/org/apache/dolphinscheduler/plugin/task/api/AbstractCommandExecutor.java
+++ b/dolphinscheduler-task-plugin/dolphinscheduler-task-api/src/main/java/org/apache/dolphinscheduler/plugin/task/api/AbstractCommandExecutor.java
@@ -127,6 +127,7 @@ public abstract class AbstractCommandExecutor {
command.add("sudo");
command.add("-u");
command.add(taskRequest.getTenantCode());
+ command.add("-E");
}
}
command.add(commandInterpreter());
diff --git a/dolphinscheduler-task-plugin/dolphinscheduler-task-api/src/main/java/org/apache/dolphinscheduler/plugin/task/api/ShellCommandExecutor.java b/dolphinscheduler-task-plugin/dolphinscheduler-task-api/src/main/java/org/apache/dolphinscheduler/plugin/task/api/ShellCommandExecutor.java
index cd2f0b630e..71cba15462 100644
--- a/dolphinscheduler-task-plugin/dolphinscheduler-task-api/src/main/java/org/apache/dolphinscheduler/plugin/task/api/ShellCommandExecutor.java
+++ b/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 {
/**
- * 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