Browse Source

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

Co-authored-by: Kerwin <37063904+zhuangchong@users.noreply.github.com>

(cherry picked from commit ba538067f2)
3.0.3-release
simsicon 2 years ago committed by Jay Chung
parent
commit
9f14571713
  1. 13
      docs/docs/en/guide/upgrade/incompatible.md
  2. 13
      docs/docs/zh/guide/upgrade/incompatible.md
  3. 9
      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

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

@ -0,0 +1,13 @@
# Incompatible
This document records the incompatible updates between each version. You need to check this document before you upgrade to related version.
## dev
* 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
* 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)

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

@ -0,0 +1,13 @@
# 不向前兼容的更新
本文档记录了各版本之间不兼容的更新内容。在升级到相关版本前,请检查本文档。
## dev
* 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
* 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)

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

@ -122,9 +122,10 @@ public abstract class AbstractCommandExecutor {
// if sudo.enable=true,setting up user to run commands
if (OSUtils.isSudoEnable()) {
command.add("sudo");
command.add("-u");
command.add(taskRequest.getTenantCode());
command.add("sudo");
command.add("-u");
command.add(taskRequest.getTenantCode());
command.add("-E");
}
command.add(commandInterpreter());
command.addAll(Collections.emptyList());
@ -398,7 +399,7 @@ public abstract class AbstractCommandExecutor {
return lineList;
}
/**
* find var pool
*

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

@ -38,9 +38,9 @@ import org.slf4j.Logger;
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

Loading…
Cancel
Save