[incubator-dolphinscheduler] branch dev-merge updated (0dca8d8 -> 2638b81)

[le...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

leonbao pushed a change to branch dev-merge
in repository https://gitbox.apache.org/repos/asf/incubator-dolphinscheduler.git.


    from 0dca8d8  Merge branch 'dev' into dev-merge
     add 39b3a37  [bugfix] remove Conflicting configuration sudo and user (#3038)
     add 0fc49b2  [bugfix] 1. fix alert.json includes repeated tag 'DOLPHIN_ALERT' 2. metainfo.xml The version number of the RPM package is no longer specified in the metainfo.xml (#3032)
     add 8c29e2a  [feature] readme.md adds instructions for changing environment variables (#3031)
     add cb6c711  merge from dev-1.3.0
     add 6dffa97  fix release for nginx not package config files, eg: zookeeper.properties (#3041)
     add f1632e2  Set up JDK 11 for SonarCloud in github action. (#3052)
     add 8213da5  [WIP] load balance #3054 (#3057)
     add 9bf67d8  Revise annotation spelling errors & Enhanced code robustness (#3042)
     add 38e4853  [Feature-2925][server] Init TaskLogger in TaskExecuteProcessor (#2925) (#2965)
     add fd76f17  Merge remote-tracking branch 'upstream/dev' into dev-merge
     add 9c78e28  merge from dev
     add 2638b81  Merge remote-tracking branch 'upstream/dev-merge' into dev-merge

No new revisions were added by this update.

Summary of changes:
 .github/workflows/ci_ut.yml                        |   8 +-
 ambari_plugin/README.md                            |  25 +++--
 .../common-services/DOLPHIN/1.3.0/alerts.json      |  62 ++++++-------
 .../common-services/DOLPHIN/1.3.0/metainfo.xml     |   4 +-
 .../1.3.0/package/scripts/dolphin_alert_service.py |   3 +-
 .../1.3.0/package/scripts/dolphin_api_service.py   |   3 +-
 .../package/scripts/dolphin_logger_service.py      |   4 +-
 .../package/scripts/dolphin_master_service.py      |   3 +-
 .../package/scripts/dolphin_worker_service.py      |   3 +-
 .../dolphinscheduler/api/utils/CheckUtils.java     |   2 +-
 .../common/shell/AbstractShell.java                |  40 +++++---
 .../dolphinscheduler/common/utils/FileUtils.java   |  60 +++++++++---
 .../dolphinscheduler/common/utils/LoggerUtils.java |  27 +++++-
 .../dolphinscheduler/common/utils/OSUtils.java     | 103 ++++++++++++---------
 .../dolphinscheduler/common/utils/OSUtilsTest.java |   6 +-
 .../src/main/assembly/dolphinscheduler-nginx.xml   |  22 ++---
 .../dolphinscheduler/remote/command/TaskInfo.java  |   2 +-
 .../server/entity/TaskExecutionContext.java        |   2 +-
 .../dolphinscheduler/server/log/TaskLogFilter.java |   9 +-
 ...undRobinSelector.java => AbstractSelector.java} |  25 ++---
 .../host/assign/LowerWeightRoundRobin.java         |   4 +-
 .../dispatch/host/assign/RandomSelector.java       |  15 +--
 .../dispatch/host/assign/RoundRobinSelector.java   |  14 +--
 .../worker/processor/NettyRemoteChannel.java       |   2 +-
 .../worker/processor/TaskCallbackService.java      |   5 +-
 .../worker/processor/TaskExecuteProcessor.java     |  56 ++++++++---
 .../server/worker/runner/TaskExecuteThread.java    |  36 +++----
 .../worker/processor/TaskCallbackServiceTest.java  |  56 ++++++++++-
 pom.xml                                            |   4 +
 29 files changed, 381 insertions(+), 224 deletions(-)
 copy dolphinscheduler-server/src/main/java/org/apache/dolphinscheduler/server/master/dispatch/host/assign/{RoundRobinSelector.java => AbstractSelector.java} (72%)