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/02/15 02:42:37 UTC
[incubator-dolphinscheduler] branch json_split updated (9d81c5d ->
9f809de)
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 9d81c5d Merge branch 'json_split' of https://github.com/apache/incubator-dolphinscheduler into spilit
add c1efbf3 [Fix-4760][api][Repair dolphinscheduler-postgre.sql error sql] (#4763)
add 7a6b905 [Fix-#4716][mater,worker] The task execution path should be calculated by the worker, not the master (#4717)
add cbada7c [Improvement][Docker] Reduce docker image size, remove frontend/nginx, remove stdout log, improve compose/swarm deployment and fix random PSQLException (#4643)
add 60016fb [Improvement-4740][UI] Set the default Tenant as default or the first exist tenant in save process (#4742)
add a6ea04d [Fix-4741][UI] Fix task instance log not change (#4744)
add 53598fd [Fix-3298][K8s] Fix task log disappear after recreating or upgrading helm release (#4755)
add 93514dd [Improvement][K8s] Improve K8s for helm (#4746)
add 5f40fce [Improvement][UI] Improve long host display in K8s (#4756)
new 9f809de merge from dev
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:
.gitignore | 4 +
docker/build/Dockerfile | 57 ++--
docker/build/README.md | 36 +--
docker/build/README_zh_CN.md | 35 +--
docker/build/checkpoint.sh | 0
.../dolphinscheduler/env/dolphinscheduler_env.sh | 12 +-
.../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 -
docker/build/conf/nginx/dolphinscheduler.conf | 51 ----
docker/build/conf/zookeeper/zoo.cfg | 47 ----
docker/build/hooks/build | 9 +-
docker/build/hooks/push | 0
docker/build/startup-init-conf.sh | 18 +-
docker/build/startup.sh | 55 ++--
docker/docker-swarm/check | 2 +-
docker/docker-swarm/docker-compose.yml | 80 +++---
docker/docker-swarm/docker-stack.yml | 84 +++---
docker/docker-swarm/dolphinscheduler_env.sh | 12 +-
docker/kubernetes/dolphinscheduler/Chart.yaml | 10 +-
docker/kubernetes/dolphinscheduler/README.md | 37 +--
.../kubernetes/dolphinscheduler/requirements.yaml | 25 --
.../dolphinscheduler/templates/NOTES.txt | 6 +-
.../dolphinscheduler/templates/_helpers.tpl | 4 +-
.../configmap-dolphinscheduler-alert.yaml | 1 +
...ql.yaml => configmap-dolphinscheduler-api.yaml} | 11 +-
.../configmap-dolphinscheduler-common.yaml | 8 +-
.../configmap-dolphinscheduler-master.yaml | 2 +-
.../configmap-dolphinscheduler-worker.yaml | 7 +-
.../deployment-dolphinscheduler-alert.yaml | 68 +----
.../templates/deployment-dolphinscheduler-api.yaml | 48 +---
.../deployment-dolphinscheduler-frontend.yaml | 119 --------
.../dolphinscheduler/templates/ingress.yaml | 2 +-
.../templates/pvc-dolphinscheduler-alert.yaml | 2 +-
.../templates/pvc-dolphinscheduler-api.yaml | 2 +-
.../templates/pvc-dolphinscheduler-frontend.yaml | 35 ---
...r-frontend.yaml => secret-external-fs-s3a.yaml} | 22 +-
.../statefulset-dolphinscheduler-master.yaml | 96 +------
.../statefulset-dolphinscheduler-worker.yaml | 184 +++++-------
.../svc-dolphinscheduler-worker-headless.yaml | 4 +-
docker/kubernetes/dolphinscheduler/values.yaml | 310 +++++++++------------
.../apache/dolphinscheduler/common/Constants.java | 8 +
.../dolphinscheduler/common/utils/NetUtils.java | 26 +-
.../common/utils/NetUtilsTest.java | 9 +
.../dolphinscheduler/common/utils/OSUtilsTest.java | 6 -
.../builder/TaskExecutionContextBuilder.java | 1 -
.../master/consumer/TaskPriorityQueueConsumer.java | 14 -
.../server/master/registry/MasterRegistry.java | 2 +-
.../master/runner/ConditionsTaskExecThread.java | 2 +-
.../master/runner/DependentTaskExecThread.java | 2 +-
.../master/runner/MasterSchedulerService.java | 4 +-
.../worker/processor/TaskExecuteProcessor.java | 3 +-
.../server/worker/registry/WorkerRegistry.java | 2 +-
.../executor/NettyExecutorManagerTest.java | 4 +-
.../server/registry/ZookeeperNodeManagerTest.java | 4 +-
.../server/utils/ExecutionContextTestUtils.java | 2 +-
.../server/worker/registry/WorkerRegistryTest.java | 2 +-
dolphinscheduler-ui/install-dolphinscheduler-ui.sh | 0
.../src/js/conf/home/pages/dag/_source/udp/udp.vue | 6 +-
.../home/pages/monitor/pages/servers/master.vue | 22 +-
.../home/pages/monitor/pages/servers/worker.vue | 2 +-
.../projects/pages/taskInstance/_source/list.vue | 2 +-
.../security/pages/users/_source/createUser.vue | 4 +-
e2e/src/test/resources/config/config.properties | 2 +-
pom.xml | 1 +
script/create-dolphinscheduler.sh | 0
script/dolphinscheduler-daemon.sh | 6 +
script/env/dolphinscheduler_env.sh | 0
script/monitor-server.sh | 0
script/scp-hosts.sh | 0
script/start-all.sh | 0
script/status-all.sh | 0
script/stop-all.sh | 0
script/upgrade-dolphinscheduler.sh | 0
sql/dolphinscheduler-postgre.sql | 7 +-
sql/dolphinscheduler_mysql.sql | 4 +-
.../1.3.5_schema/mysql/dolphinscheduler_ddl.sql | 58 ++++
.../mysql}/dolphinscheduler_dml.sql | 0
.../postgresql/dolphinscheduler_ddl.sql | 52 ++++
.../postgresql/dolphinscheduler_dml.sql | 0
81 files changed, 629 insertions(+), 1169 deletions(-)
mode change 100644 => 100755 docker/build/checkpoint.sh
mode change 100644 => 100755 docker/build/conf/dolphinscheduler/env/dolphinscheduler_env.sh
delete mode 100644 docker/build/conf/nginx/dolphinscheduler.conf
delete mode 100644 docker/build/conf/zookeeper/zoo.cfg
mode change 100644 => 100755 docker/build/hooks/build
mode change 100644 => 100755 docker/build/hooks/push
mode change 100644 => 100755 docker/build/startup-init-conf.sh
mode change 100644 => 100755 docker/build/startup.sh
mode change 100644 => 100755 docker/docker-swarm/check
mode change 100644 => 100755 docker/docker-swarm/dolphinscheduler_env.sh
delete mode 100644 docker/kubernetes/dolphinscheduler/requirements.yaml
copy docker/kubernetes/dolphinscheduler/templates/{secret-external-postgresql.yaml => configmap-dolphinscheduler-api.yaml} (81%)
delete mode 100644 docker/kubernetes/dolphinscheduler/templates/deployment-dolphinscheduler-frontend.yaml
delete mode 100644 docker/kubernetes/dolphinscheduler/templates/pvc-dolphinscheduler-frontend.yaml
rename docker/kubernetes/dolphinscheduler/templates/{svc-dolphinscheduler-frontend.yaml => secret-external-fs-s3a.yaml} (69%)
mode change 100644 => 100755 dolphinscheduler-ui/install-dolphinscheduler-ui.sh
mode change 100644 => 100755 script/create-dolphinscheduler.sh
mode change 100644 => 100755 script/dolphinscheduler-daemon.sh
mode change 100644 => 100755 script/env/dolphinscheduler_env.sh
mode change 100644 => 100755 script/monitor-server.sh
mode change 100644 => 100755 script/scp-hosts.sh
mode change 100644 => 100755 script/start-all.sh
mode change 100644 => 100755 script/status-all.sh
mode change 100644 => 100755 script/stop-all.sh
mode change 100644 => 100755 script/upgrade-dolphinscheduler.sh
create mode 100644 sql/upgrade/1.3.5_schema/mysql/dolphinscheduler_ddl.sql
copy sql/upgrade/{1.2.0_schema/postgresql => 1.3.5_schema/mysql}/dolphinscheduler_dml.sql (100%)
create mode 100644 sql/upgrade/1.3.5_schema/postgresql/dolphinscheduler_ddl.sql
copy sql/upgrade/{1.2.0_schema => 1.3.5_schema}/postgresql/dolphinscheduler_dml.sql (100%)
[incubator-dolphinscheduler] 01/01: merge from dev
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 9f809de69370fb2a3af5975279f8e03d513c733a
Merge: 9d81c5d 5f40fce
Author: lenboo <ba...@gmail.com>
AuthorDate: Mon Feb 15 10:42:10 2021 +0800
merge from dev
.gitignore | 4 +
docker/build/Dockerfile | 57 ++--
docker/build/README.md | 36 +--
docker/build/README_zh_CN.md | 35 +--
docker/build/checkpoint.sh | 0
.../dolphinscheduler/env/dolphinscheduler_env.sh | 12 +-
.../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 -
docker/build/conf/nginx/dolphinscheduler.conf | 51 ----
docker/build/conf/zookeeper/zoo.cfg | 47 ----
docker/build/hooks/build | 9 +-
docker/build/hooks/push | 0
docker/build/startup-init-conf.sh | 18 +-
docker/build/startup.sh | 55 ++--
docker/docker-swarm/check | 2 +-
docker/docker-swarm/docker-compose.yml | 80 +++---
docker/docker-swarm/docker-stack.yml | 84 +++---
docker/docker-swarm/dolphinscheduler_env.sh | 12 +-
docker/kubernetes/dolphinscheduler/Chart.yaml | 10 +-
docker/kubernetes/dolphinscheduler/README.md | 37 +--
.../kubernetes/dolphinscheduler/requirements.yaml | 25 --
.../dolphinscheduler/templates/NOTES.txt | 6 +-
.../dolphinscheduler/templates/_helpers.tpl | 4 +-
.../configmap-dolphinscheduler-alert.yaml | 1 +
...nd.yaml => configmap-dolphinscheduler-api.yaml} | 21 +-
.../configmap-dolphinscheduler-common.yaml | 8 +-
.../configmap-dolphinscheduler-master.yaml | 2 +-
.../configmap-dolphinscheduler-worker.yaml | 7 +-
.../deployment-dolphinscheduler-alert.yaml | 68 +----
.../templates/deployment-dolphinscheduler-api.yaml | 48 +---
.../deployment-dolphinscheduler-frontend.yaml | 119 --------
.../dolphinscheduler/templates/ingress.yaml | 2 +-
.../templates/pvc-dolphinscheduler-alert.yaml | 2 +-
.../templates/pvc-dolphinscheduler-api.yaml | 2 +-
...r-frontend.yaml => secret-external-fs-s3a.yaml} | 20 +-
.../statefulset-dolphinscheduler-master.yaml | 96 +------
.../statefulset-dolphinscheduler-worker.yaml | 184 +++++-------
.../svc-dolphinscheduler-worker-headless.yaml | 4 +-
docker/kubernetes/dolphinscheduler/values.yaml | 310 +++++++++------------
.../apache/dolphinscheduler/common/Constants.java | 8 +
.../dolphinscheduler/common/utils/NetUtils.java | 26 +-
.../common/utils/NetUtilsTest.java | 9 +
.../dolphinscheduler/common/utils/OSUtilsTest.java | 6 -
.../builder/TaskExecutionContextBuilder.java | 1 -
.../master/consumer/TaskPriorityQueueConsumer.java | 14 -
.../server/master/registry/MasterRegistry.java | 2 +-
.../master/runner/ConditionsTaskExecThread.java | 2 +-
.../master/runner/DependentTaskExecThread.java | 2 +-
.../master/runner/MasterSchedulerService.java | 4 +-
.../worker/processor/TaskExecuteProcessor.java | 3 +-
.../server/worker/registry/WorkerRegistry.java | 2 +-
.../executor/NettyExecutorManagerTest.java | 4 +-
.../server/registry/ZookeeperNodeManagerTest.java | 4 +-
.../server/utils/ExecutionContextTestUtils.java | 2 +-
.../server/worker/registry/WorkerRegistryTest.java | 2 +-
dolphinscheduler-ui/install-dolphinscheduler-ui.sh | 0
.../src/js/conf/home/pages/dag/_source/udp/udp.vue | 6 +-
.../home/pages/monitor/pages/servers/master.vue | 22 +-
.../home/pages/monitor/pages/servers/worker.vue | 2 +-
.../projects/pages/taskInstance/_source/list.vue | 2 +-
.../security/pages/users/_source/createUser.vue | 4 +-
e2e/src/test/resources/config/config.properties | 2 +-
pom.xml | 1 +
script/create-dolphinscheduler.sh | 0
script/dolphinscheduler-daemon.sh | 6 +
script/env/dolphinscheduler_env.sh | 0
script/monitor-server.sh | 0
script/scp-hosts.sh | 0
script/start-all.sh | 0
script/status-all.sh | 0
script/stop-all.sh | 0
script/upgrade-dolphinscheduler.sh | 0
sql/dolphinscheduler-postgre.sql | 7 +-
sql/dolphinscheduler_mysql.sql | 4 +-
.../1.3.5_schema/mysql/dolphinscheduler_ddl.sql | 58 ++++
.../1.3.5_schema/mysql/dolphinscheduler_dml.sql | 16 ++
.../postgresql/dolphinscheduler_ddl.sql | 52 ++++
.../postgresql/dolphinscheduler_dml.sql | 16 ++
80 files changed, 662 insertions(+), 1141 deletions(-)
diff --cc dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/Constants.java
index 994b811,45af3b2..85e0d9f
--- a/dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/Constants.java
+++ b/dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/Constants.java
@@@ -1044,7 -1045,9 +1045,14 @@@ public final class Constants
public static final String PSTREE = "pstree";
/**
+ * snow flake, data center id, this id must be greater than 0 and less than 32
+ */
+ public static final String SNOW_FLAKE_DATA_CENTER_ID = "data.center.id";
++
++ /**
+ * docker & kubernetes
+ */
+ public static final boolean DOCKER_MODE = StringUtils.isNotEmpty(System.getenv("DOCKER"));
+ public static final boolean KUBERNETES_MODE = StringUtils.isNotEmpty(System.getenv("KUBERNETES_SERVICE_HOST")) && StringUtils.isNotEmpty(System.getenv("KUBERNETES_SERVICE_PORT"));
+
}