This is an automated email from the ASF dual-hosted git repository.
kezhenxu94 pushed a change to branch cve
in repository https://gitbox.apache.org/repos/asf/dolphinscheduler.git
from 6464355e23 Merge branch 'dev' into cve
add 4283cfd7a1 [fix][API]fix task types sequence (#11775)
add 8988492c43 [Feat][python] Add parameter environment to task (#11763)
add 38ee91fb1e [DSIP-11][python] create workflows from YAML configuration
(#11611)
add 45ebd528d6 [Bug-11650][worker] #11650 fix SQL type task, stop task
cause NPE (#11668)
add 0e534dd61f [python] Fix permission error when create related objects
(#11783)
add 6f3b0b2432 [k8s] Delete unnecessary configurations. (#11808)
add 2eb8b9f7f0 [Feature][Registry] Support etcd as registry (#10981)
add 7c0c1f4b78 Update dolphinscheduler_ddl.sql fix alert t_ds_user add
time_zone is not correct (#11795)
add f0db90f71d [Doc] Remove re-upload file function in the 3.0.0's doc
(#11804)
add 6d460a3ca2 [DSIP-13][python] New mechanism file plugins to Python API
(#11360)
add 130943af73 Merge branch 'dev' into cve
No new revisions were added by this update.
Summary of changes:
.../dolphinscheduler/templates/_helpers.tpl | 13 -
.../configmap-dolphinscheduler-common.yaml | 2 +-
.../templates/deployment-dolphinscheduler-api.yaml | 1 -
.../job-dolphinscheduler-schema-initializer.yaml | 1 -
.../templates/secret-external-fs-s3a.yaml | 28 --
.../statefulset-dolphinscheduler-master.yaml | 1 -
.../statefulset-dolphinscheduler-worker.yaml | 1 -
deploy/kubernetes/dolphinscheduler/values.yaml | 19 +-
docs/docs/en/guide/resource/file-manage.md | 6 -
docs/docs/zh/guide/resource/file-manage.md | 8 -
docs/img/reupload_file_en.png | Bin 168894 -> 0 bytes
.../api/configuration/TaskTypeConfiguration.java | 41 +-
.../dolphinscheduler/api/dto/FavTaskDto.java | 7 +-
.../dolphinscheduler/api/python/PythonGateway.java | 28 +-
.../api/service/impl/FavTaskServiceImpl.java | 6 +-
dolphinscheduler-bom/pom.xml | 24 ++
.../dolphinscheduler/dao/mapper/FavTaskMapper.xml | 4 +-
.../3.0.0_schema/mysql/dolphinscheduler_ddl.sql | 4 +-
dolphinscheduler-dist/release-docs/LICENSE | 17 +
dolphinscheduler-dist/release-docs/NOTICE | 128 ++++++
...bc.txt => LICENSE-auto-service-annotations.txt} | 2 +-
...commons-httpclient.txt => LICENSE-failsafe.txt} | 1 +
...{LICENSE-apacheds-i18n.txt => LICENSE-grpc.txt} | 0
...LICENSE-apacheds-i18n.txt => LICENSE-jetcd.txt} | 0
....txt => LICENSE-proto-google-common-protos.txt} | 0
...buf-java.txt => LICENSE-protobuf-java-util.txt} | 0
...java-sdk-core.txt => LISCENSE-perfmark-api.txt} | 0
.../pydolphinscheduler/docs/source/index.rst | 1 +
.../docs/source/resources_plugin/develop.rst | 46 ++
.../{tasks/sql.rst => resources_plugin/index.rst} | 13 +-
.../shell.rst => resources_plugin/local.rst} | 15 +-
.../source/resources_plugin/resource-plugin.rst | 75 ++++
.../docs/source/tasks/condition.rst | 7 +
.../pydolphinscheduler/docs/source/tasks/datax.rst | 13 +
.../docs/source/tasks/dependent.rst | 14 +
.../pydolphinscheduler/docs/source/tasks/flink.rst | 7 +
.../docs/source/tasks/func_wrap.rst | 2 +-
.../pydolphinscheduler/docs/source/tasks/http.rst | 8 +
.../docs/source/tasks/map_reduce.rst | 8 +
.../docs/source/tasks/procedure.rst | 8 +
.../docs/source/tasks/python.rst | 8 +
.../pydolphinscheduler/docs/source/tasks/shell.rst | 8 +
.../pydolphinscheduler/docs/source/tasks/spark.rst | 8 +
.../pydolphinscheduler/docs/source/tasks/sql.rst | 14 +
.../docs/source/tasks/sub_process.rst | 17 +
.../docs/source/tasks/switch.rst | 9 +
.../pydolphinscheduler/docs/source/tutorial.rst | 96 +++++
.../examples/yaml_define/Condition.yaml | 43 ++
.../yaml_define/DataX.yaml} | 17 +-
.../examples/yaml_define/Dependent.yaml | 76 ++++
.../yaml_define/Dependent_External.yaml} | 12 +-
.../yaml_define/Flink.yaml} | 15 +-
.../yaml_define/Http.yaml} | 35 +-
.../yaml_define/MapReduce.yaml} | 25 +-
.../yaml_define/MoreConfiguration.yaml} | 38 +-
.../yaml_define/Procedure.yaml} | 13 +-
.../yaml_define/Python.yaml} | 16 +-
.../yaml_define/Shell.yaml} | 32 +-
.../yaml_define/Spark.yaml} | 16 +-
.../yaml_define/Sql.yaml} | 53 +--
.../yaml_define/SubProcess.yaml} | 11 +-
.../yaml_define/Switch.yaml} | 31 +-
.../examples/yaml_define/example_datax.json | 62 +++
.../examples/yaml_define/example_sql.sql | 6 +-
.../yaml_define/example_sub_workflow.yaml} | 20 +-
.../yaml_define/tutorial.yaml} | 38 +-
.../src/pydolphinscheduler/cli/commands.py | 14 +
.../pydolphinscheduler/core/process_definition.py | 3 +
.../sagemaker.py => core/resource_plugin.py} | 39 +-
.../src/pydolphinscheduler/core/task.py | 58 ++-
.../pydolphinscheduler/core/yaml_process_define.py | 466 +++++++++++++++++++++
.../{tutorial.py => tutorial_resource_plugin.py} | 46 +-
.../src/pydolphinscheduler/exceptions.py | 4 +
.../src/pydolphinscheduler/java_gateway.py | 4 +
.../{cli => resources_plugin}/__init__.py | 7 +-
.../pydolphinscheduler/resources_plugin/local.py | 57 +++
.../src/pydolphinscheduler/tasks/__init__.py | 1 +
.../src/pydolphinscheduler/tasks/shell.py | 5 +-
.../pydolphinscheduler/tests/core/test_engine.py | 1 +
.../pydolphinscheduler/tests/core/test_task.py | 117 +++++-
.../tests/core/test_yaml_process_define.py | 191 +++++++++
.../tests/example/test_example.py | 6 +-
.../tests/{cli => resources_plugin}/__init__.py | 2 +-
.../tests/resources_plugin/test_local.py | 108 +++++
.../tests/tasks/test_condition.py | 1 +
.../pydolphinscheduler/tests/tasks/test_datax.py | 2 +
.../tests/tasks/test_dependent.py | 1 +
.../pydolphinscheduler/tests/tasks/test_flink.py | 1 +
.../pydolphinscheduler/tests/tasks/test_http.py | 1 +
.../tests/tasks/test_map_reduce.py | 1 +
.../tests/tasks/test_procedure.py | 1 +
.../pydolphinscheduler/tests/tasks/test_python.py | 1 +
.../tests/tasks/test_sagemaker.py | 1 +
.../pydolphinscheduler/tests/tasks/test_shell.py | 46 +-
.../pydolphinscheduler/tests/tasks/test_spark.py | 1 +
.../pydolphinscheduler/tests/tasks/test_sql.py | 1 +
.../tests/tasks/test_sub_process.py | 1 +
.../pydolphinscheduler/tests/tasks/test_switch.py | 1 +
.../pydolphinscheduler/tests/testing/path.py | 1 +
dolphinscheduler-registry/README.md | 33 ++
.../dolphinscheduler-registry-all/pom.xml | 5 +
.../registry/api/ConnectionListener.java | 4 +
.../registry/api/ConnectionState.java | 3 +
.../dolphinscheduler/registry/api/Event.java | 4 +
.../dolphinscheduler/registry/api/Registry.java | 42 +-
.../dolphinscheduler-registry-etcd/README.md | 27 ++
.../dolphinscheduler-registry-etcd}/pom.xml | 49 ++-
.../registry/etcd/EtcdConnectionStateListener.java | 115 +++++
.../plugin/registry/etcd/EtcdRegistry.java | 344 +++++++++++++++
.../registry/etcd/EtcdRegistryProperties.java} | 36 +-
.../plugin/registry/etcd/EtcdRegistryTest.java} | 76 ++--
.../plugin/registry/mysql/MysqlRegistry.java | 1 +
.../dolphinscheduler-registry-zookeeper/README.md | 27 ++
.../registry/zookeeper/ZookeeperRegistryTest.java | 5 +-
.../dolphinscheduler-registry-plugins/pom.xml | 1 +
.../server/worker/processor/TaskKillProcessor.java | 39 +-
tools/dependencies/known-dependencies.txt | 17 +
117 files changed, 2904 insertions(+), 392 deletions(-)
delete mode 100644
deploy/kubernetes/dolphinscheduler/templates/secret-external-fs-s3a.yaml
delete mode 100644 docs/img/reupload_file_en.png
copy dolphinscheduler-dist/release-docs/licenses/{LICENSE-clickhouse-jdbc.txt
=> LICENSE-auto-service-annotations.txt} (89%)
copy
dolphinscheduler-dist/release-docs/licenses/{LICENSE-commons-httpclient.txt =>
LICENSE-failsafe.txt} (99%)
copy dolphinscheduler-dist/release-docs/licenses/{LICENSE-apacheds-i18n.txt =>
LICENSE-grpc.txt} (100%)
copy dolphinscheduler-dist/release-docs/licenses/{LICENSE-apacheds-i18n.txt =>
LICENSE-jetcd.txt} (100%)
copy
dolphinscheduler-dist/release-docs/licenses/{LICENSE-aws-java-sdk-core.txt =>
LICENSE-proto-google-common-protos.txt} (100%)
copy dolphinscheduler-dist/release-docs/licenses/{LICENSE-protobuf-java.txt =>
LICENSE-protobuf-java-util.txt} (100%)
copy
dolphinscheduler-dist/release-docs/licenses/{LICENSE-aws-java-sdk-core.txt =>
LISCENSE-perfmark-api.txt} (100%)
create mode 100644
dolphinscheduler-python/pydolphinscheduler/docs/source/resources_plugin/develop.rst
copy dolphinscheduler-python/pydolphinscheduler/docs/source/{tasks/sql.rst =>
resources_plugin/index.rst} (87%)
copy dolphinscheduler-python/pydolphinscheduler/docs/source/{tasks/shell.rst
=> resources_plugin/local.rst} (67%)
create mode 100644
dolphinscheduler-python/pydolphinscheduler/docs/source/resources_plugin/resource-plugin.rst
create mode 100644
dolphinscheduler-python/pydolphinscheduler/examples/yaml_define/Condition.yaml
copy
dolphinscheduler-python/pydolphinscheduler/{src/pydolphinscheduler/__init__.py
=> examples/yaml_define/DataX.yaml} (70%)
create mode 100644
dolphinscheduler-python/pydolphinscheduler/examples/yaml_define/Dependent.yaml
copy
dolphinscheduler-python/pydolphinscheduler/{src/pydolphinscheduler/__init__.py
=> examples/yaml_define/Dependent_External.yaml} (70%)
copy
dolphinscheduler-python/pydolphinscheduler/{src/pydolphinscheduler/__init__.py
=> examples/yaml_define/Flink.yaml} (73%)
copy dolphinscheduler-python/pydolphinscheduler/{.coveragerc =>
examples/yaml_define/Http.yaml} (59%)
copy dolphinscheduler-python/pydolphinscheduler/{tests/testing/decorator.py =>
examples/yaml_define/MapReduce.yaml} (73%)
copy dolphinscheduler-python/pydolphinscheduler/{.coveragerc =>
examples/yaml_define/MoreConfiguration.yaml} (60%)
copy
dolphinscheduler-python/pydolphinscheduler/{src/pydolphinscheduler/__init__.py
=> examples/yaml_define/Procedure.yaml} (80%)
copy
dolphinscheduler-python/pydolphinscheduler/{src/pydolphinscheduler/__init__.py
=> examples/yaml_define/Python.yaml} (78%)
copy dolphinscheduler-python/pydolphinscheduler/{tests/testing/decorator.py =>
examples/yaml_define/Shell.yaml} (63%)
copy
dolphinscheduler-python/pydolphinscheduler/{src/pydolphinscheduler/__init__.py
=> examples/yaml_define/Spark.yaml} (73%)
copy
dolphinscheduler-python/pydolphinscheduler/{src/pydolphinscheduler/exceptions.py
=> examples/yaml_define/Sql.yaml} (50%)
copy
dolphinscheduler-python/pydolphinscheduler/{src/pydolphinscheduler/__init__.py
=> examples/yaml_define/SubProcess.yaml} (73%)
copy dolphinscheduler-python/pydolphinscheduler/{tests/testing/decorator.py =>
examples/yaml_define/Switch.yaml} (65%)
create mode 100644
dolphinscheduler-python/pydolphinscheduler/examples/yaml_define/example_datax.json
copy
dolphinscheduler-dao/src/main/resources/sql/upgrade/1.0.2_schema/mysql/dolphinscheduler_dml.sql
=>
dolphinscheduler-python/pydolphinscheduler/examples/yaml_define/example_sql.sql
(82%)
copy
dolphinscheduler-python/pydolphinscheduler/{src/pydolphinscheduler/core/__init__.py
=> examples/yaml_define/example_sub_workflow.yaml} (67%)
copy
dolphinscheduler-python/pydolphinscheduler/{src/pydolphinscheduler/models/queue.py
=> examples/yaml_define/tutorial.yaml} (56%)
copy
dolphinscheduler-python/pydolphinscheduler/src/pydolphinscheduler/{tasks/sagemaker.py
=> core/resource_plugin.py} (50%)
create mode 100644
dolphinscheduler-python/pydolphinscheduler/src/pydolphinscheduler/core/yaml_process_define.py
copy
dolphinscheduler-python/pydolphinscheduler/src/pydolphinscheduler/examples/{tutorial.py
=> tutorial_resource_plugin.py} (59%)
copy dolphinscheduler-python/pydolphinscheduler/src/pydolphinscheduler/{cli =>
resources_plugin}/__init__.py (86%)
create mode 100644
dolphinscheduler-python/pydolphinscheduler/src/pydolphinscheduler/resources_plugin/local.py
create mode 100644
dolphinscheduler-python/pydolphinscheduler/tests/core/test_yaml_process_define.py
copy dolphinscheduler-python/pydolphinscheduler/tests/{cli =>
resources_plugin}/__init__.py (94%)
create mode 100644
dolphinscheduler-python/pydolphinscheduler/tests/resources_plugin/test_local.py
create mode 100644 dolphinscheduler-registry/README.md
create mode 100644
dolphinscheduler-registry/dolphinscheduler-registry-plugins/dolphinscheduler-registry-etcd/README.md
copy {dolphinscheduler-datasource-plugin/dolphinscheduler-datasource-sqlserver
=>
dolphinscheduler-registry/dolphinscheduler-registry-plugins/dolphinscheduler-registry-etcd}/pom.xml
(61%)
create mode 100644
dolphinscheduler-registry/dolphinscheduler-registry-plugins/dolphinscheduler-registry-etcd/src/main/java/org/apache/dolphinscheduler/plugin/registry/etcd/EtcdConnectionStateListener.java
create mode 100644
dolphinscheduler-registry/dolphinscheduler-registry-plugins/dolphinscheduler-registry-etcd/src/main/java/org/apache/dolphinscheduler/plugin/registry/etcd/EtcdRegistry.java
copy
dolphinscheduler-registry/dolphinscheduler-registry-plugins/{dolphinscheduler-registry-mysql/src/main/java/org/apache/dolphinscheduler/plugin/registry/mysql/MysqlRegistryProperties.java
=>
dolphinscheduler-registry-etcd/src/main/java/org/apache/dolphinscheduler/plugin/registry/etcd/EtcdRegistryProperties.java}
(65%)
copy
dolphinscheduler-registry/dolphinscheduler-registry-plugins/{dolphinscheduler-registry-zookeeper/src/test/java/org/apache/dolphinscheduler/plugin/registry/zookeeper/ZookeeperRegistryTest.java
=>
dolphinscheduler-registry-etcd/src/test/java/org/apache/dolphinscheduler/plugin/registry/etcd/EtcdRegistryTest.java}
(67%)
create mode 100644
dolphinscheduler-registry/dolphinscheduler-registry-plugins/dolphinscheduler-registry-zookeeper/README.md