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 5bda7c344c940bcf011f8558a68c0b1ce9baa477 Merge: 8b35e21 8112f5b Author: lenboo <[email protected]> AuthorDate: Fri Mar 5 22:11:55 2021 +0800 Merge remote-tracking branch 'upstream/dev' into spilit .github/workflows/ci_e2e.yml | 4 +- .github/workflows/ci_ut.yml | 2 +- .licenserc.yaml | 1 + docker/README.md | 2 +- docker/build/Dockerfile | 3 +- docker/build/README.md | 2 +- docker/build/README_zh_CN.md | 2 +- .../dolphinscheduler/logback/logback-alert.xml | 9 + .../conf/dolphinscheduler/logback/logback-api.xml | 9 + .../dolphinscheduler/logback/logback-master.xml | 9 + .../dolphinscheduler/logback/logback-worker.xml | 9 + .../dolphinscheduler/supervisor/supervisor.ini | 92 +++++ docker/build/startup-init-conf.sh | 23 +- docker/build/startup.sh | 79 ++--- docker/kubernetes/dolphinscheduler/README.md | 5 +- .../dolphinscheduler/templates/NOTES.txt | 11 +- .../configmap-dolphinscheduler-alert.yaml | 14 - .../deployment-dolphinscheduler-alert.yaml | 73 +--- .../templates/deployment-dolphinscheduler-api.yaml | 4 +- .../dolphinscheduler/templates/ingress.yaml | 22 +- .../statefulset-dolphinscheduler-worker.yaml | 79 +---- ...er-api.yaml => svc-dolphinscheduler-alert.yaml} | 14 +- .../templates/svc-dolphinscheduler-api.yaml | 4 +- docker/kubernetes/dolphinscheduler/values.yaml | 40 +-- .../api/service/impl/TaskInstanceServiceImpl.java | 4 +- .../api/service/impl/WorkerGroupServiceImpl.java | 21 +- .../api/service/WorkerGroupServiceTest.java | 4 +- .../apache/dolphinscheduler/common/Constants.java | 7 +- .../common/enums/ExecutionStatus.java | 2 +- .../common/task/flink/FlinkParameters.java | 386 +++++++++++---------- .../dolphinscheduler/common/utils/NetUtils.java | 13 +- .../apache/dolphinscheduler/common/CommonTest.java | 46 +++ .../common/utils/NetUtilsTest.java | 30 +- .../server/master/MasterServer.java | 36 +- .../server/utils/FlinkArgsUtils.java | 19 +- .../server/worker/WorkerServer.java | 34 +- .../dolphinscheduler/server/zk/ZKMasterClient.java | 8 +- .../server/utils/FlinkArgsUtilsTest.java | 32 +- .../service/zk/ZookeeperOperator.java | 13 +- .../service/zk/RegisterOperatorTest.java | 15 + .../pages/dag/_source/formModel/tasks/flink.vue | 26 +- .../conf/home/pages/projects/pages/index/index.vue | 2 + .../pages/instance/pages/list/_source/list.vue | 8 +- .../projects/pages/taskInstance/_source/list.vue | 12 +- .../pages/file/pages/subdirectory/index.vue | 1 + .../src/js/module/i18n/locale/en_US.js | 2 + .../src/js/module/i18n/locale/zh_CN.js | 2 + script/dolphinscheduler-daemon.sh | 47 ++- 48 files changed, 683 insertions(+), 599 deletions(-)
