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/25 10:10:03 UTC
[incubator-dolphinscheduler] 01/02: merge from dev
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 ccc5aa91d8287fc79c499652662f7e6fbe34a989
Merge: 2272966 a9e1d31
Author: lenboo <ba...@gmail.com>
AuthorDate: Thu Feb 25 18:09:32 2021 +0800
merge from dev
.github/workflows/ci_ut.yml | 2 +-
dolphinscheduler-alert/pom.xml | 22 --
.../apache/dolphinscheduler/alert/AlertServer.java | 4 +-
.../alert/plugin/AlertPluginManager.java | 15 +-
.../src/main/resources/alert.properties | 2 +-
.../dolphinscheduler/alert/AlertServerTest.java | 4 +-
.../alert/plugin/AlertPluginManagerTest.java | 14 +-
.../alert/plugin/DolphinPluginLoaderTest.java | 23 +-
.../alert/plugin/EmailAlertPluginTest.java | 12 +-
.../dolphinscheduler/api/service/BaseService.java | 9 +
.../api/service/impl/BaseServiceImpl.java | 40 ++
.../api/service/impl/DataAnalysisServiceImpl.java | 16 +-
.../api/service/impl/ExecutorServiceImpl.java | 33 +-
.../service/impl/ProcessInstanceServiceImpl.java | 17 +-
.../api/service/impl/TaskInstanceServiceImpl.java | 32 +-
.../api/service/ExecutorService2Test.java | 11 +-
.../api/service/ProcessInstanceServiceTest.java | 19 +-
.../api/service/TaskInstanceServiceTest.java | 10 +-
dolphinscheduler-common/pom.xml | 21 +
.../plugin/AbstractDolphinPluginManager.java | 6 +-
.../common}/plugin/DolphinPluginClassLoader.java | 11 +-
.../common}/plugin/DolphinPluginDiscovery.java | 11 +-
.../common}/plugin/DolphinPluginLoader.java | 12 +-
.../common}/plugin/DolphinPluginManagerConfig.java | 22 +-
.../dolphinscheduler/common/utils/HadoopUtils.java | 3 +-
.../plugin/DolphinSchedulerPluginLoaderTest.java | 32 +-
.../common/plugin/PluginManagerTest.java | 16 +-
dolphinscheduler-dist/release-docs/LICENSE | 29 +-
dolphinscheduler-dist/release-docs/NOTICE | 18 +
.../LICENSE-aether-connector-asynchttpclient.txt | 86 ++++
.../licenses/LICENSE-aether-connector-file.txt | 86 ++++
.../release-docs/licenses/LICENSE-aether-impl.txt | 86 ++++
.../release-docs/licenses/LICENSE-aether-spi.txt | 86 ++++
.../release-docs/licenses/LICENSE-aether-util.txt | 86 ++++
.../licenses/LICENSE-async-http-client.txt | 13 +
.../licenses/LICENSE-maven-aether-provider.txt | 202 ++++++++++
.../licenses/LICENSE-maven-artifact.txt | 202 ++++++++++
.../release-docs/licenses/LICENSE-maven-compat.txt | 202 ++++++++++
.../release-docs/licenses/LICENSE-maven-core.txt | 202 ++++++++++
.../licenses/LICENSE-maven-embedder.txt | 202 ++++++++++
.../licenses/LICENSE-maven-model-builder.txt | 202 ++++++++++
.../release-docs/licenses/LICENSE-maven-model.txt | 202 ++++++++++
.../licenses/LICENSE-maven-plugin-api.txt | 202 ++++++++++
.../licenses/LICENSE-maven-repository-metadata.txt | 202 ++++++++++
.../licenses/LICENSE-maven-settings-builder.txt | 202 ++++++++++
.../licenses/LICENSE-maven-settings.txt | 202 ++++++++++
.../licenses/LICENSE-plexus-cipher.txt | 202 ++++++++++
.../licenses/LICENSE-plexus-classworlds.txt | 202 ++++++++++
.../LICENSE-plexus-component-annotations.txt | 202 ++++++++++
.../licenses/LICENSE-plexus-container-default.txt | 202 ++++++++++
.../licenses/LICENSE-plexus-interpolation.txt | 202 ++++++++++
.../licenses/LICENSE-plexus-sec-dispatcher.txt | 202 ++++++++++
.../release-docs/licenses/LICENSE-plexus-utils.txt | 202 ++++++++++
.../licenses/LICENSE-wagon-provider-api.txt | 202 ++++++++++
.../licenses/LICENSE-xbean-reflect.txt | 202 ++++++++++
.../src/main/assembly/dolphinscheduler-binary.xml | 438 ++++++++++-----------
.../service/process/ProcessService.java | 48 ++-
dolphinscheduler-spi/pom.xml | 1 +
pom.xml | 8 +-
.../mysql/dolphinscheduler_ddl.sql | 1 +
.../postgresql/dolphinscheduler_ddl.sql | 1 +
sql/dolphinscheduler_mysql.sql | 24 +-
...er-postgre.sql => dolphinscheduler_postgre.sql} | 62 ++-
sql/soft_version | 2 +-
.../1.3.0_schema/mysql/dolphinscheduler_ddl.sql | 21 -
.../postgresql/dolphinscheduler_ddl.sql | 23 --
.../1.3.2_schema/mysql/dolphinscheduler_ddl.sql | 2 +-
.../postgresql/dolphinscheduler_ddl.sql | 2 +-
.../1.3.3_schema/mysql/dolphinscheduler_ddl.sql | 115 ------
.../1.3.3_schema/mysql/dolphinscheduler_dml.sql | 2 +-
.../postgresql/dolphinscheduler_ddl.sql | 117 +-----
.../postgresql/dolphinscheduler_dml.sql | 2 +-
.../1.4.0_schema/mysql/dolphinscheduler_ddl.sql | 198 ++++++++--
.../1.4.0_schema/mysql/dolphinscheduler_dml.sql | 4 +-
.../postgresql/dolphinscheduler_ddl.sql | 186 ++++++++-
.../postgresql/dolphinscheduler_dml.sql | 2 +-
tools/dependencies/known-dependencies.txt | 29 ++
77 files changed, 5432 insertions(+), 805 deletions(-)
diff --cc dolphinscheduler-service/src/main/java/org/apache/dolphinscheduler/service/process/ProcessService.java
index abc0037,a759c24..08f3245
--- a/dolphinscheduler-service/src/main/java/org/apache/dolphinscheduler/service/process/ProcessService.java
+++ b/dolphinscheduler-service/src/main/java/org/apache/dolphinscheduler/service/process/ProcessService.java
@@@ -627,6 -563,28 +627,26 @@@ public class ProcessService
processInstance.setLocations(processDefinition.getLocations());
processInstance.setConnects(processDefinition.getConnects());
+ // reset global params while there are start parameters
+ setGlobalParamIfCommanded(processDefinition,cmdParam);
+
+ // curing global params
+ processInstance.setGlobalParams(ParameterUtils.curingGlobalParams(
+ processDefinition.getGlobalParamMap(),
+ processDefinition.getGlobalParamList(),
+ getCommandTypeIfComplement(processInstance, command),
+ processInstance.getScheduleTime()));
+
- //copy process define json to process instance
- processInstance.setProcessInstanceJson(processDefinition.getProcessDefinitionJson());
+ // set process instance priority
+ processInstance.setProcessInstancePriority(command.getProcessInstancePriority());
+ String workerGroup = StringUtils.isBlank(command.getWorkerGroup()) ? Constants.DEFAULT_WORKER_GROUP : command.getWorkerGroup();
+ processInstance.setWorkerGroup(workerGroup);
+ processInstance.setTimeout(processDefinition.getTimeout());
+ processInstance.setTenantId(processDefinition.getTenantId());
+ return processInstance;
+ }
+
+ private void setGlobalParamIfCommanded(ProcessDefinition processDefinition, Map<String, String> cmdParam) {
// get start params from command param
Map<String, String> startParamMap = null;
if (cmdParam != null && cmdParam.containsKey(Constants.CMD_PARAM_START_PARAMS)) {