You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@dolphinscheduler.apache.org by le...@apache.org on 2021/03/05 14:12:20 UTC
[incubator-dolphinscheduler] branch json_split updated (8b35e21 ->
5bda7c3)
This is an automated email from the ASF dual-hosted git repository.
leonbao pushed a change to branch json_split
in repository https://gitbox.apache.org/repos/asf/incubator-dolphinscheduler.git.
from 8b35e21 [Feature][jsonsplit] replace processDefinitionVersion with processDefinitionLog (#4942)
add 53aedc5 [Fix-4934][UI] Fix task statics info bug (#4935)
add 658a7f5 [Fix-4940][UI]Fix when upload a file to directory call resources/list-paging error (#4941)
add e5fb79b the instance page duration field content added empty filter processing. (#4938)
add 24fda3f [Feature][Flink] Support parallelism input (#4937)
add 79b5f8c [Improvement][K8s] Optimize ingress compatibility
add 4706de7 Merge pull request #4902 from chengshiwen/improve-k8s-compatibility
add d667525 [Fix-4905][K8s] Fix incorrect host problem in minikube (#4906)
add 61f4086 [Fix-4897][Docker] Support supervisor management and fix log stdout
add cf13c87 Merge pull request #4900 from chengshiwen/improve-docker-supervisor-and-log
add 01ee2b3 [Improvement][K8s] Adapt to the latest alert-server with updated config and port 50052
add 969fba8 Merge pull request #4783 from chengshiwen/improve-k8s-adapt-alert-server
add 55389c0 close e2e test
add 6d1537a Merge pull request #4945 from CalvinKirs/e2e_test
add 01b71f1 [Fix-4839][Server] Process cannot stop when killed with retry (#4841)
add 8c68e2c [Fix][Worker] Fix worker cannot start and alertClientService NullPointerException (#4956)
add fb2b55c [Improvement][Docker] Improve readme, notes, and long host display
add e851ec1 Merge pull request #4962 from chengshiwen/improve-docker-readme
add 8112f5b [Fix][API] Fix KeeperException (#4961)
new 5bda7c3 Merge remote-tracking branch 'upstream/dev' into spilit
The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.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 +-
.../common/{ConstantsTest.java => CommonTest.java} | 32 +-
.../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, 656 insertions(+), 612 deletions(-)
create mode 100644 docker/build/conf/dolphinscheduler/supervisor/supervisor.ini
copy docker/kubernetes/dolphinscheduler/templates/{svc-dolphinscheduler-api.yaml => svc-dolphinscheduler-alert.yaml} (86%)
copy dolphinscheduler-common/src/test/java/org/apache/dolphinscheduler/common/{ConstantsTest.java => CommonTest.java} (55%)
[incubator-dolphinscheduler] 01/01: Merge remote-tracking branch
'upstream/dev' into spilit
Posted by le...@apache.org.
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 <ba...@gmail.com>
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(-)