This is an automated email from the ASF dual-hosted git repository. leonbao pushed a commit to branch json_split in repository https://gitbox.apache.org/repos/asf/incubator-dolphinscheduler.git
commit c8ac6f99fef348ab37905823ac491a904171d321 Merge: 689106d 9c3cec5 Author: lenboo <[email protected]> AuthorDate: Tue Mar 30 11:31:42 2021 +0800 Merge remote-tracking branch 'upstream/dev' into spilit # Conflicts: # dolphinscheduler-common/src/main/resources/common.properties README.md | 2 +- README_zh_CN.md | 2 +- .../apache/dolphinscheduler/common/Constants.java | 5 +++ .../dolphinscheduler/common/utils/CommonUtils.java | 7 ++++ .../dolphinscheduler/common/utils/FileUtils.java | 23 +---------- .../dolphinscheduler/common/utils/OSUtils.java | 10 +++-- .../src/main/resources/common.properties | 3 ++ .../common/utils/FileUtilsTest.java | 4 +- .../server/master/MasterServer.java | 2 + .../server/master/config/MasterConfig.java | 2 +- .../server/master/runner/MasterExecThread.java | 33 +--------------- .../server/worker/WorkerServer.java | 4 +- .../worker/processor/TaskExecuteProcessor.java | 5 ++- .../server/worker/runner/TaskExecuteThread.java | 45 ++++++++++++++++++---- .../worker/task/AbstractCommandExecutor.java | 15 +++++--- .../server/master/MasterExecThreadTest.java | 6 +-- .../server/master/config/MasterConfigTest.java | 39 +++++++++++++++++++ .../src/test/resources/master.properties | 43 +++++++++++++++++++++ .../projects/pages/instance/pages/gantt/index.vue | 2 +- .../pages/resource/pages/file/pages/edit/index.vue | 3 +- pom.xml | 1 + 21 files changed, 170 insertions(+), 86 deletions(-) diff --cc dolphinscheduler-common/src/main/resources/common.properties index b3d9156,e46dd15..6aad271 --- a/dolphinscheduler-common/src/main/resources/common.properties +++ b/dolphinscheduler-common/src/main/resources/common.properties @@@ -76,5 -76,6 +76,8 @@@ datasource.encryption.salt=!@#$%^& # Network IP gets priority, default inner outer #dolphin.scheduler.network.priority.strategy=default +# 0<dataCenterId<32 +#data.center.id=1 + + # use sudo or not, if set true ,executing user is tenant user and deploy user need sudo permissions ; if set false, executing user is the deploy user, don't need sudo permissions. + sudo.enable=true
