status
stringclasses
1 value
repo_name
stringclasses
31 values
repo_url
stringclasses
31 values
issue_id
int64
1
104k
title
stringlengths
4
233
body
stringlengths
0
186k
issue_url
stringlengths
38
56
pull_url
stringlengths
37
54
before_fix_sha
stringlengths
40
40
after_fix_sha
stringlengths
40
40
report_datetime
timestamp[us, tz=UTC]
language
stringclasses
5 values
commit_datetime
timestamp[us, tz=UTC]
updated_file
stringlengths
7
188
chunk_content
stringlengths
1
1.03M
closed
apache/dolphinscheduler
https://github.com/apache/dolphinscheduler
9,811
[Bug] [ProcessInstance] Replace default global params value failed at "COMPLEMENT_DATA" mode
### Search before asking - [X] I had searched in the [issues](https://github.com/apache/dolphinscheduler/issues?q=is%3Aissue) and found no similar issues. ### What happened <img width="822" alt="process_definition" src="https://user-images.githubusercontent.com/7680235/165489435-14b3f989-9c93-4ac6-be39-bc3561fc6622.png"> The process have several global params default blank. When I run the process at "START_PROCESS" mode, the global_params could be replaced correctly, but if I run the process at "COMPLEMENT_DATA" mode, the replace string all loss. In database, table t_ds_process_instance: Both two modes have the correct command_param, but only "START_PROCESS" have the correct replaced global_params, "COMPLEMENT_DATA" only have the same as process defined. "START_PROCESS": ![correct](https://user-images.githubusercontent.com/7680235/165491987-2757d3df-4635-42ce-9f94-4a302c4c6fdc.jpg) "COMPLEMENT_DATA": ![wrong](https://user-images.githubusercontent.com/7680235/165492073-bb7b581d-026e-4137-aa15-f6277a69079d.jpg) ### What you expected to happen Global params can be replaced correctly at "COMPLEMENT_DATA" mode. ### How to reproduce Create a new process, set some global params default blank. try run at START_PROCESS and COMPLEMENT_DATA mode, see different in t_ds_process_instance. ### Anything else _No response_ ### Version 2.0.3 ### Are you willing to submit PR? - [ ] Yes I am willing to submit a PR! ### Code of Conduct - [X] I agree to follow this project's [Code of Conduct](https://www.apache.org/foundation/policies/conduct)
https://github.com/apache/dolphinscheduler/issues/9811
https://github.com/apache/dolphinscheduler/pull/9952
bc1c15b142ea02cdbd9533e890f8f0af897d1cec
d4aeee16e5f3f67e37a31fa606acf0b313189655
2022-04-27T09:55:39Z
java
2022-05-11T10:37:03Z
dolphinscheduler-master/src/main/java/org/apache/dolphinscheduler/server/master/runner/WorkflowExecuteThread.java
mport org.apache.dolphnscheduler.common.utls.ParameterUtls; mport org.apache.dolphnscheduler.dao.entty.Command; mport org.apache.dolphnscheduler.dao.entty.Envronment; mport org.apache.dolphnscheduler.dao.entty.ProcessDefnton; mport org.apache.dolphnscheduler.dao.entty.ProcessInstance; mport org.apache.dolphnscheduler.dao.entty.ProcessTaskRelaton; mport org.apache.dolphnscheduler.dao.entty.ProjectUser; mport org.apache.dolphnscheduler.dao.entty.Schedule; mport org.apache.dolphnscheduler.dao.entty.TaskDefntonLog; mport org.apache.dolphnscheduler.dao.entty.TaskGroupQueue; mport org.apache.dolphnscheduler.dao.entty.TaskInstance; mport org.apache.dolphnscheduler.dao.utls.DagHelper; mport org.apache.dolphnscheduler.plugn.task.ap.enums.DependResult; mport org.apache.dolphnscheduler.plugn.task.ap.enums.Drect; mport org.apache.dolphnscheduler.plugn.task.ap.enums.ExecutonStatus; mport org.apache.dolphnscheduler.plugn.task.ap.enums.TaskTmeoutStrategy; mport org.apache.dolphnscheduler.plugn.task.ap.model.Property; mport org.apache.dolphnscheduler.plugn.task.ap.parameters.BlockngParameters; mport org.apache.dolphnscheduler.remote.command.HostUpdateCommand; mport org.apache.dolphnscheduler.remote.utls.Host; mport org.apache.dolphnscheduler.server.master.confg.MasterConfg; mport org.apache.dolphnscheduler.server.master.dspatch.executor.NettyExecutorManager; mport org.apache.dolphnscheduler.server.master.runner.task.ITaskProcessor; mport org.apache.dolphnscheduler.server.master.runner.task.TaskActon; mport org.apache.dolphnscheduler.server.master.runner.task.TaskProcessorFactory; mport org.apache.dolphnscheduler.servce.alert.ProcessAlertManager; mport org.apache.dolphnscheduler.servce.process.ProcessServce; mport org.apache.dolphnscheduler.servce.quartz.cron.CronUtls; mport org.apache.dolphnscheduler.servce.queue.PeerTaskInstancePrortyQueue; mport org.apache.commons.collectons.CollectonUtls;
closed
apache/dolphinscheduler
https://github.com/apache/dolphinscheduler
9,811
[Bug] [ProcessInstance] Replace default global params value failed at "COMPLEMENT_DATA" mode
### Search before asking - [X] I had searched in the [issues](https://github.com/apache/dolphinscheduler/issues?q=is%3Aissue) and found no similar issues. ### What happened <img width="822" alt="process_definition" src="https://user-images.githubusercontent.com/7680235/165489435-14b3f989-9c93-4ac6-be39-bc3561fc6622.png"> The process have several global params default blank. When I run the process at "START_PROCESS" mode, the global_params could be replaced correctly, but if I run the process at "COMPLEMENT_DATA" mode, the replace string all loss. In database, table t_ds_process_instance: Both two modes have the correct command_param, but only "START_PROCESS" have the correct replaced global_params, "COMPLEMENT_DATA" only have the same as process defined. "START_PROCESS": ![correct](https://user-images.githubusercontent.com/7680235/165491987-2757d3df-4635-42ce-9f94-4a302c4c6fdc.jpg) "COMPLEMENT_DATA": ![wrong](https://user-images.githubusercontent.com/7680235/165492073-bb7b581d-026e-4137-aa15-f6277a69079d.jpg) ### What you expected to happen Global params can be replaced correctly at "COMPLEMENT_DATA" mode. ### How to reproduce Create a new process, set some global params default blank. try run at START_PROCESS and COMPLEMENT_DATA mode, see different in t_ds_process_instance. ### Anything else _No response_ ### Version 2.0.3 ### Are you willing to submit PR? - [ ] Yes I am willing to submit a PR! ### Code of Conduct - [X] I agree to follow this project's [Code of Conduct](https://www.apache.org/foundation/policies/conduct)
https://github.com/apache/dolphinscheduler/issues/9811
https://github.com/apache/dolphinscheduler/pull/9952
bc1c15b142ea02cdbd9533e890f8f0af897d1cec
d4aeee16e5f3f67e37a31fa606acf0b313189655
2022-04-27T09:55:39Z
java
2022-05-11T10:37:03Z
dolphinscheduler-master/src/main/java/org/apache/dolphinscheduler/server/master/runner/WorkflowExecuteThread.java
mport org.apache.commons.lang.StrngUtls; mport org.apache.commons.lang.math.NumberUtls; mport java.utl.ArrayLst; mport java.utl.Arrays; mport java.utl.Collecton; mport java.utl.Date; mport java.utl.HashMap; mport java.utl.Iterator; mport java.utl.Lst; mport java.utl.Map; mport java.utl.Objects; mport java.utl.Set; mport java.utl.concurrent.ConcurrentHashMap; mport java.utl.concurrent.ConcurrentLnkedQueue; mport java.utl.concurrent.atomc.AtomcBoolean; mport java.utl.stream.Collectors; mport org.slf4j.Logger; mport org.slf4j.LoggerFactory; mport com.google.common.collect.Lsts; /** * master exec thread,splt dag */ publc class WorkflowExecuteThread { /** * logger of WorkflowExecuteThread */ prvate statc fnal Logger logger = LoggerFactory.getLogger(WorkflowExecuteThread.class); /** * master confg */
closed
apache/dolphinscheduler
https://github.com/apache/dolphinscheduler
9,811
[Bug] [ProcessInstance] Replace default global params value failed at "COMPLEMENT_DATA" mode
### Search before asking - [X] I had searched in the [issues](https://github.com/apache/dolphinscheduler/issues?q=is%3Aissue) and found no similar issues. ### What happened <img width="822" alt="process_definition" src="https://user-images.githubusercontent.com/7680235/165489435-14b3f989-9c93-4ac6-be39-bc3561fc6622.png"> The process have several global params default blank. When I run the process at "START_PROCESS" mode, the global_params could be replaced correctly, but if I run the process at "COMPLEMENT_DATA" mode, the replace string all loss. In database, table t_ds_process_instance: Both two modes have the correct command_param, but only "START_PROCESS" have the correct replaced global_params, "COMPLEMENT_DATA" only have the same as process defined. "START_PROCESS": ![correct](https://user-images.githubusercontent.com/7680235/165491987-2757d3df-4635-42ce-9f94-4a302c4c6fdc.jpg) "COMPLEMENT_DATA": ![wrong](https://user-images.githubusercontent.com/7680235/165492073-bb7b581d-026e-4137-aa15-f6277a69079d.jpg) ### What you expected to happen Global params can be replaced correctly at "COMPLEMENT_DATA" mode. ### How to reproduce Create a new process, set some global params default blank. try run at START_PROCESS and COMPLEMENT_DATA mode, see different in t_ds_process_instance. ### Anything else _No response_ ### Version 2.0.3 ### Are you willing to submit PR? - [ ] Yes I am willing to submit a PR! ### Code of Conduct - [X] I agree to follow this project's [Code of Conduct](https://www.apache.org/foundation/policies/conduct)
https://github.com/apache/dolphinscheduler/issues/9811
https://github.com/apache/dolphinscheduler/pull/9952
bc1c15b142ea02cdbd9533e890f8f0af897d1cec
d4aeee16e5f3f67e37a31fa606acf0b313189655
2022-04-27T09:55:39Z
java
2022-05-11T10:37:03Z
dolphinscheduler-master/src/main/java/org/apache/dolphinscheduler/server/master/runner/WorkflowExecuteThread.java
prvate MasterConfg masterConfg; /** * process servce */ prvate ProcessServce processServce; /** * alert manager */ prvate ProcessAlertManager processAlertManager; /** * netty executor manager */ prvate NettyExecutorManager nettyExecutorManager; /** * process nstance */ prvate ProcessInstance processInstance; /** * process defnton */ prvate ProcessDefnton processDefnton; /** * the object of DAG */ prvate DAG<Strng, TaskNode, TaskNodeRelaton> dag; /** * key of workflow */ prvate Strng key; /**
closed
apache/dolphinscheduler
https://github.com/apache/dolphinscheduler
9,811
[Bug] [ProcessInstance] Replace default global params value failed at "COMPLEMENT_DATA" mode
### Search before asking - [X] I had searched in the [issues](https://github.com/apache/dolphinscheduler/issues?q=is%3Aissue) and found no similar issues. ### What happened <img width="822" alt="process_definition" src="https://user-images.githubusercontent.com/7680235/165489435-14b3f989-9c93-4ac6-be39-bc3561fc6622.png"> The process have several global params default blank. When I run the process at "START_PROCESS" mode, the global_params could be replaced correctly, but if I run the process at "COMPLEMENT_DATA" mode, the replace string all loss. In database, table t_ds_process_instance: Both two modes have the correct command_param, but only "START_PROCESS" have the correct replaced global_params, "COMPLEMENT_DATA" only have the same as process defined. "START_PROCESS": ![correct](https://user-images.githubusercontent.com/7680235/165491987-2757d3df-4635-42ce-9f94-4a302c4c6fdc.jpg) "COMPLEMENT_DATA": ![wrong](https://user-images.githubusercontent.com/7680235/165492073-bb7b581d-026e-4137-aa15-f6277a69079d.jpg) ### What you expected to happen Global params can be replaced correctly at "COMPLEMENT_DATA" mode. ### How to reproduce Create a new process, set some global params default blank. try run at START_PROCESS and COMPLEMENT_DATA mode, see different in t_ds_process_instance. ### Anything else _No response_ ### Version 2.0.3 ### Are you willing to submit PR? - [ ] Yes I am willing to submit a PR! ### Code of Conduct - [X] I agree to follow this project's [Code of Conduct](https://www.apache.org/foundation/policies/conduct)
https://github.com/apache/dolphinscheduler/issues/9811
https://github.com/apache/dolphinscheduler/pull/9952
bc1c15b142ea02cdbd9533e890f8f0af897d1cec
d4aeee16e5f3f67e37a31fa606acf0b313189655
2022-04-27T09:55:39Z
java
2022-05-11T10:37:03Z
dolphinscheduler-master/src/main/java/org/apache/dolphinscheduler/server/master/runner/WorkflowExecuteThread.java
* start flag, true: start nodes submt completely */ prvate boolean sStart = false; /** * submt falure nodes */ prvate boolean taskFaledSubmt = false; /** * task nstance hash map, taskId as key */ prvate Map<Integer, TaskInstance> taskInstanceMap = new ConcurrentHashMap<>(); /** * runnng taskProcessor, taskCode as key, taskProcessor as value * only on taskProcessor per taskCode */ prvate fnal Map<Long, ITaskProcessor> actveTaskProcessorMaps = new ConcurrentHashMap<>(); /** * vald task map, taskCode as key, taskId as value * n a DAG, only one taskInstance per taskCode s vald */ prvate Map<Long, Integer> valdTaskMap = new ConcurrentHashMap<>(); /** * error task map, taskCode as key, taskInstanceId as value * n a DAG, only one taskInstance per taskCode s vald */ prvate Map<Long, Integer> errorTaskMap = new ConcurrentHashMap<>(); /** * complete task map, taskCode as key, taskInstanceId as value * n a DAG, only one taskInstance per taskCode s vald */
closed
apache/dolphinscheduler
https://github.com/apache/dolphinscheduler
9,811
[Bug] [ProcessInstance] Replace default global params value failed at "COMPLEMENT_DATA" mode
### Search before asking - [X] I had searched in the [issues](https://github.com/apache/dolphinscheduler/issues?q=is%3Aissue) and found no similar issues. ### What happened <img width="822" alt="process_definition" src="https://user-images.githubusercontent.com/7680235/165489435-14b3f989-9c93-4ac6-be39-bc3561fc6622.png"> The process have several global params default blank. When I run the process at "START_PROCESS" mode, the global_params could be replaced correctly, but if I run the process at "COMPLEMENT_DATA" mode, the replace string all loss. In database, table t_ds_process_instance: Both two modes have the correct command_param, but only "START_PROCESS" have the correct replaced global_params, "COMPLEMENT_DATA" only have the same as process defined. "START_PROCESS": ![correct](https://user-images.githubusercontent.com/7680235/165491987-2757d3df-4635-42ce-9f94-4a302c4c6fdc.jpg) "COMPLEMENT_DATA": ![wrong](https://user-images.githubusercontent.com/7680235/165492073-bb7b581d-026e-4137-aa15-f6277a69079d.jpg) ### What you expected to happen Global params can be replaced correctly at "COMPLEMENT_DATA" mode. ### How to reproduce Create a new process, set some global params default blank. try run at START_PROCESS and COMPLEMENT_DATA mode, see different in t_ds_process_instance. ### Anything else _No response_ ### Version 2.0.3 ### Are you willing to submit PR? - [ ] Yes I am willing to submit a PR! ### Code of Conduct - [X] I agree to follow this project's [Code of Conduct](https://www.apache.org/foundation/policies/conduct)
https://github.com/apache/dolphinscheduler/issues/9811
https://github.com/apache/dolphinscheduler/pull/9952
bc1c15b142ea02cdbd9533e890f8f0af897d1cec
d4aeee16e5f3f67e37a31fa606acf0b313189655
2022-04-27T09:55:39Z
java
2022-05-11T10:37:03Z
dolphinscheduler-master/src/main/java/org/apache/dolphinscheduler/server/master/runner/WorkflowExecuteThread.java
prvate Map<Long, Integer> completeTaskMap = new ConcurrentHashMap<>(); /** * depend faled task map, taskCode as key, taskId as value */ prvate Map<Long, Integer> dependFaledTaskMap = new ConcurrentHashMap<>(); /** * forbdden task map, code as key */ prvate Map<Long, TaskNode> forbddenTaskMap = new ConcurrentHashMap<>(); /** * skp task map, code as key */ prvate Map<Strng, TaskNode> skpTaskNodeMap = new ConcurrentHashMap<>(); /** * complement date lst */ prvate Lst<Date> complementLstDate = Lsts.newLnkedLst(); /** * state event queue */ prvate ConcurrentLnkedQueue<StateEvent> stateEvents = new ConcurrentLnkedQueue<>(); /** * ready to submt task queue */ prvate PeerTaskInstancePrortyQueue readyToSubmtTaskQueue = new PeerTaskInstancePrortyQueue(); /** * wat to retry taskInstance map, taskCode as key, taskInstance as value * before retry, the taskInstance d s 0 */ prvate Map<Long, TaskInstance> watToRetryTaskInstanceMap = new ConcurrentHashMap<>();
closed
apache/dolphinscheduler
https://github.com/apache/dolphinscheduler
9,811
[Bug] [ProcessInstance] Replace default global params value failed at "COMPLEMENT_DATA" mode
### Search before asking - [X] I had searched in the [issues](https://github.com/apache/dolphinscheduler/issues?q=is%3Aissue) and found no similar issues. ### What happened <img width="822" alt="process_definition" src="https://user-images.githubusercontent.com/7680235/165489435-14b3f989-9c93-4ac6-be39-bc3561fc6622.png"> The process have several global params default blank. When I run the process at "START_PROCESS" mode, the global_params could be replaced correctly, but if I run the process at "COMPLEMENT_DATA" mode, the replace string all loss. In database, table t_ds_process_instance: Both two modes have the correct command_param, but only "START_PROCESS" have the correct replaced global_params, "COMPLEMENT_DATA" only have the same as process defined. "START_PROCESS": ![correct](https://user-images.githubusercontent.com/7680235/165491987-2757d3df-4635-42ce-9f94-4a302c4c6fdc.jpg) "COMPLEMENT_DATA": ![wrong](https://user-images.githubusercontent.com/7680235/165492073-bb7b581d-026e-4137-aa15-f6277a69079d.jpg) ### What you expected to happen Global params can be replaced correctly at "COMPLEMENT_DATA" mode. ### How to reproduce Create a new process, set some global params default blank. try run at START_PROCESS and COMPLEMENT_DATA mode, see different in t_ds_process_instance. ### Anything else _No response_ ### Version 2.0.3 ### Are you willing to submit PR? - [ ] Yes I am willing to submit a PR! ### Code of Conduct - [X] I agree to follow this project's [Code of Conduct](https://www.apache.org/foundation/policies/conduct)
https://github.com/apache/dolphinscheduler/issues/9811
https://github.com/apache/dolphinscheduler/pull/9952
bc1c15b142ea02cdbd9533e890f8f0af897d1cec
d4aeee16e5f3f67e37a31fa606acf0b313189655
2022-04-27T09:55:39Z
java
2022-05-11T10:37:03Z
dolphinscheduler-master/src/main/java/org/apache/dolphinscheduler/server/master/runner/WorkflowExecuteThread.java
/** * state wheel execute thread */ prvate StateWheelExecuteThread stateWheelExecuteThread; /** * constructor of WorkflowExecuteThread * * @param processInstance processInstance * @param processServce processServce * @param nettyExecutorManager nettyExecutorManager * @param processAlertManager processAlertManager * @param masterConfg masterConfg * @param stateWheelExecuteThread stateWheelExecuteThread */ publc WorkflowExecuteThread(ProcessInstance processInstance , ProcessServce processServce , NettyExecutorManager nettyExecutorManager , ProcessAlertManager processAlertManager , MasterConfg masterConfg , StateWheelExecuteThread stateWheelExecuteThread) { ths.processServce = processServce; ths.processInstance = processInstance; ths.masterConfg = masterConfg; ths.nettyExecutorManager = nettyExecutorManager; ths.processAlertManager = processAlertManager; ths.stateWheelExecuteThread = stateWheelExecuteThread; } /** * the process start nodes are submtted completely. */
closed
apache/dolphinscheduler
https://github.com/apache/dolphinscheduler
9,811
[Bug] [ProcessInstance] Replace default global params value failed at "COMPLEMENT_DATA" mode
### Search before asking - [X] I had searched in the [issues](https://github.com/apache/dolphinscheduler/issues?q=is%3Aissue) and found no similar issues. ### What happened <img width="822" alt="process_definition" src="https://user-images.githubusercontent.com/7680235/165489435-14b3f989-9c93-4ac6-be39-bc3561fc6622.png"> The process have several global params default blank. When I run the process at "START_PROCESS" mode, the global_params could be replaced correctly, but if I run the process at "COMPLEMENT_DATA" mode, the replace string all loss. In database, table t_ds_process_instance: Both two modes have the correct command_param, but only "START_PROCESS" have the correct replaced global_params, "COMPLEMENT_DATA" only have the same as process defined. "START_PROCESS": ![correct](https://user-images.githubusercontent.com/7680235/165491987-2757d3df-4635-42ce-9f94-4a302c4c6fdc.jpg) "COMPLEMENT_DATA": ![wrong](https://user-images.githubusercontent.com/7680235/165492073-bb7b581d-026e-4137-aa15-f6277a69079d.jpg) ### What you expected to happen Global params can be replaced correctly at "COMPLEMENT_DATA" mode. ### How to reproduce Create a new process, set some global params default blank. try run at START_PROCESS and COMPLEMENT_DATA mode, see different in t_ds_process_instance. ### Anything else _No response_ ### Version 2.0.3 ### Are you willing to submit PR? - [ ] Yes I am willing to submit a PR! ### Code of Conduct - [X] I agree to follow this project's [Code of Conduct](https://www.apache.org/foundation/policies/conduct)
https://github.com/apache/dolphinscheduler/issues/9811
https://github.com/apache/dolphinscheduler/pull/9952
bc1c15b142ea02cdbd9533e890f8f0af897d1cec
d4aeee16e5f3f67e37a31fa606acf0b313189655
2022-04-27T09:55:39Z
java
2022-05-11T10:37:03Z
dolphinscheduler-master/src/main/java/org/apache/dolphinscheduler/server/master/runner/WorkflowExecuteThread.java
publc boolean sStart() { return ths.sStart; } /** * handle event */ publc vod handleEvents() { f (!sStart) { return; } whle (!ths.stateEvents.sEmpty()) { try { StateEvent stateEvent = ths.stateEvents.peek(); f (stateEventHandler(stateEvent)) { ths.stateEvents.remove(stateEvent); } } catch (Excepton e) { logger.error("state handle error:", e); } } } publc Strng getKey() { f (StrngUtls.sNotEmpty(key) || ths.processDefnton == null) { return key; } key = Strng.format("%d_%d_%d", ths.processDefnton.getCode(), ths.processDefnton.getVerson(), ths.processInstance.getId());
closed
apache/dolphinscheduler
https://github.com/apache/dolphinscheduler
9,811
[Bug] [ProcessInstance] Replace default global params value failed at "COMPLEMENT_DATA" mode
### Search before asking - [X] I had searched in the [issues](https://github.com/apache/dolphinscheduler/issues?q=is%3Aissue) and found no similar issues. ### What happened <img width="822" alt="process_definition" src="https://user-images.githubusercontent.com/7680235/165489435-14b3f989-9c93-4ac6-be39-bc3561fc6622.png"> The process have several global params default blank. When I run the process at "START_PROCESS" mode, the global_params could be replaced correctly, but if I run the process at "COMPLEMENT_DATA" mode, the replace string all loss. In database, table t_ds_process_instance: Both two modes have the correct command_param, but only "START_PROCESS" have the correct replaced global_params, "COMPLEMENT_DATA" only have the same as process defined. "START_PROCESS": ![correct](https://user-images.githubusercontent.com/7680235/165491987-2757d3df-4635-42ce-9f94-4a302c4c6fdc.jpg) "COMPLEMENT_DATA": ![wrong](https://user-images.githubusercontent.com/7680235/165492073-bb7b581d-026e-4137-aa15-f6277a69079d.jpg) ### What you expected to happen Global params can be replaced correctly at "COMPLEMENT_DATA" mode. ### How to reproduce Create a new process, set some global params default blank. try run at START_PROCESS and COMPLEMENT_DATA mode, see different in t_ds_process_instance. ### Anything else _No response_ ### Version 2.0.3 ### Are you willing to submit PR? - [ ] Yes I am willing to submit a PR! ### Code of Conduct - [X] I agree to follow this project's [Code of Conduct](https://www.apache.org/foundation/policies/conduct)
https://github.com/apache/dolphinscheduler/issues/9811
https://github.com/apache/dolphinscheduler/pull/9952
bc1c15b142ea02cdbd9533e890f8f0af897d1cec
d4aeee16e5f3f67e37a31fa606acf0b313189655
2022-04-27T09:55:39Z
java
2022-05-11T10:37:03Z
dolphinscheduler-master/src/main/java/org/apache/dolphinscheduler/server/master/runner/WorkflowExecuteThread.java
return key; } publc boolean addStateEvent(StateEvent stateEvent) { f (processInstance.getId() != stateEvent.getProcessInstanceId()) { logger.nfo("state event would be abounded :{}", stateEvent.toStrng()); return false; } ths.stateEvents.add(stateEvent); return true; } publc nt eventSze() { return ths.stateEvents.sze(); } publc ProcessInstance getProcessInstance() { return ths.processInstance; } prvate boolean stateEventHandler(StateEvent stateEvent) { logger.nfo("process event: {}", stateEvent.toStrng()); f (!checkProcessInstance(stateEvent)) { return false; } boolean result = false; swtch (stateEvent.getType()) { case PROCESS_STATE_CHANGE: result = pr break; case TASK_STATE_CHANGE: result = taskStateChangeHandler(stateEvent); break; case PROCESS_TIMEOUT:
closed
apache/dolphinscheduler
https://github.com/apache/dolphinscheduler
9,811
[Bug] [ProcessInstance] Replace default global params value failed at "COMPLEMENT_DATA" mode
### Search before asking - [X] I had searched in the [issues](https://github.com/apache/dolphinscheduler/issues?q=is%3Aissue) and found no similar issues. ### What happened <img width="822" alt="process_definition" src="https://user-images.githubusercontent.com/7680235/165489435-14b3f989-9c93-4ac6-be39-bc3561fc6622.png"> The process have several global params default blank. When I run the process at "START_PROCESS" mode, the global_params could be replaced correctly, but if I run the process at "COMPLEMENT_DATA" mode, the replace string all loss. In database, table t_ds_process_instance: Both two modes have the correct command_param, but only "START_PROCESS" have the correct replaced global_params, "COMPLEMENT_DATA" only have the same as process defined. "START_PROCESS": ![correct](https://user-images.githubusercontent.com/7680235/165491987-2757d3df-4635-42ce-9f94-4a302c4c6fdc.jpg) "COMPLEMENT_DATA": ![wrong](https://user-images.githubusercontent.com/7680235/165492073-bb7b581d-026e-4137-aa15-f6277a69079d.jpg) ### What you expected to happen Global params can be replaced correctly at "COMPLEMENT_DATA" mode. ### How to reproduce Create a new process, set some global params default blank. try run at START_PROCESS and COMPLEMENT_DATA mode, see different in t_ds_process_instance. ### Anything else _No response_ ### Version 2.0.3 ### Are you willing to submit PR? - [ ] Yes I am willing to submit a PR! ### Code of Conduct - [X] I agree to follow this project's [Code of Conduct](https://www.apache.org/foundation/policies/conduct)
https://github.com/apache/dolphinscheduler/issues/9811
https://github.com/apache/dolphinscheduler/pull/9952
bc1c15b142ea02cdbd9533e890f8f0af897d1cec
d4aeee16e5f3f67e37a31fa606acf0b313189655
2022-04-27T09:55:39Z
java
2022-05-11T10:37:03Z
dolphinscheduler-master/src/main/java/org/apache/dolphinscheduler/server/master/runner/WorkflowExecuteThread.java
result = processTmeout(); break; case TASK_TIMEOUT: result = taskTmeout(stateEvent); break; case WAIT_TASK_GROUP: result = checkForceStartAndWakeUp(stateEvent); break; case TASK_RETRY: result = taskRetryEventHandler(stateEvent); break; case PROCESS_BLOCKED: result = processBlockHandler(stateEvent); break; default: break; } f (result) { ths.stateEvents.remove(stateEvent); } return result; } prvate boolean checkForceStartAndWakeUp(StateEvent stateEvent) { TaskGroupQueue taskGroupQueue = ths.processServce.loadTaskGroupQueue(stateEvent.getTaskInstanceId()); f (taskGroupQueue.getForceStart() == Flag.YES.getCode()) { TaskInstance taskInstance = ths.processServce.fndTaskInstanceById(stateEvent.getTaskInstanceId()); ITaskProcessor taskProcessor = actveTaskProcessorMaps.get(taskInstance.getTaskCode()); taskProcessor.acton(TaskActon.DISPATCH); ths.processServce.updateTaskGroupQueueStatus(taskGroupQueue.getTaskId(), TaskGroupQueueStatus.ACQUIRE_SUCCESS.getCode()); return true;
closed
apache/dolphinscheduler
https://github.com/apache/dolphinscheduler
9,811
[Bug] [ProcessInstance] Replace default global params value failed at "COMPLEMENT_DATA" mode
### Search before asking - [X] I had searched in the [issues](https://github.com/apache/dolphinscheduler/issues?q=is%3Aissue) and found no similar issues. ### What happened <img width="822" alt="process_definition" src="https://user-images.githubusercontent.com/7680235/165489435-14b3f989-9c93-4ac6-be39-bc3561fc6622.png"> The process have several global params default blank. When I run the process at "START_PROCESS" mode, the global_params could be replaced correctly, but if I run the process at "COMPLEMENT_DATA" mode, the replace string all loss. In database, table t_ds_process_instance: Both two modes have the correct command_param, but only "START_PROCESS" have the correct replaced global_params, "COMPLEMENT_DATA" only have the same as process defined. "START_PROCESS": ![correct](https://user-images.githubusercontent.com/7680235/165491987-2757d3df-4635-42ce-9f94-4a302c4c6fdc.jpg) "COMPLEMENT_DATA": ![wrong](https://user-images.githubusercontent.com/7680235/165492073-bb7b581d-026e-4137-aa15-f6277a69079d.jpg) ### What you expected to happen Global params can be replaced correctly at "COMPLEMENT_DATA" mode. ### How to reproduce Create a new process, set some global params default blank. try run at START_PROCESS and COMPLEMENT_DATA mode, see different in t_ds_process_instance. ### Anything else _No response_ ### Version 2.0.3 ### Are you willing to submit PR? - [ ] Yes I am willing to submit a PR! ### Code of Conduct - [X] I agree to follow this project's [Code of Conduct](https://www.apache.org/foundation/policies/conduct)
https://github.com/apache/dolphinscheduler/issues/9811
https://github.com/apache/dolphinscheduler/pull/9952
bc1c15b142ea02cdbd9533e890f8f0af897d1cec
d4aeee16e5f3f67e37a31fa606acf0b313189655
2022-04-27T09:55:39Z
java
2022-05-11T10:37:03Z
dolphinscheduler-master/src/main/java/org/apache/dolphinscheduler/server/master/runner/WorkflowExecuteThread.java
} f (taskGroupQueue.getInQueue() == Flag.YES.getCode()) { boolean acqureTaskGroup = processServce.acqureTaskGroupAgan(taskGroupQueue); f (acqureTaskGroup) { TaskInstance taskInstance = ths.processServce.fndTaskInstanceById(stateEvent.getTaskInstanceId()); ITaskProcessor taskProcessor = actveTaskProcessorMaps.get(taskInstance.getTaskCode()); taskProcessor.acton(TaskActon.DISPATCH); return true; } } return false; } prvate boolean taskTmeout(StateEvent stateEvent) { f (!checkTaskInstanceByStateEvent(stateEvent)) { return true; } TaskInstance taskInstance = taskInstanceMap.get(stateEvent.getTaskInstanceId()); f (TmeoutFlag.CLOSE == taskInstance.getTaskDefne().getTmeoutFlag()) { return true; } TaskTmeoutStrategy taskTmeoutStrategy = taskInstance.getTaskDefne().getTmeoutNotfyStrategy(); f (TaskTmeoutStrategy.FAILED == taskTmeoutStrategy || TaskTmeoutStrategy.WARNFAILED == taskTmeoutStrategy) { ITaskProcessor taskProcessor = actveTaskProcessorMaps.get(taskInstance.getTaskCode()); taskProcessor.acton(TaskActon.TIMEOUT); } f (TaskTmeoutStrategy.WARN == taskTmeoutStrategy || TaskTmeoutStrategy.WARNFAILED == taskTmeoutStrategy) { ProjectUser projectUser = processServce.queryProjectWthUserByProcessInstanceId(processInstance.getId()); processAlertManager.sendTaskTmeoutAlert(processInstance, taskInstance, projectUser); } return true;
closed
apache/dolphinscheduler
https://github.com/apache/dolphinscheduler
9,811
[Bug] [ProcessInstance] Replace default global params value failed at "COMPLEMENT_DATA" mode
### Search before asking - [X] I had searched in the [issues](https://github.com/apache/dolphinscheduler/issues?q=is%3Aissue) and found no similar issues. ### What happened <img width="822" alt="process_definition" src="https://user-images.githubusercontent.com/7680235/165489435-14b3f989-9c93-4ac6-be39-bc3561fc6622.png"> The process have several global params default blank. When I run the process at "START_PROCESS" mode, the global_params could be replaced correctly, but if I run the process at "COMPLEMENT_DATA" mode, the replace string all loss. In database, table t_ds_process_instance: Both two modes have the correct command_param, but only "START_PROCESS" have the correct replaced global_params, "COMPLEMENT_DATA" only have the same as process defined. "START_PROCESS": ![correct](https://user-images.githubusercontent.com/7680235/165491987-2757d3df-4635-42ce-9f94-4a302c4c6fdc.jpg) "COMPLEMENT_DATA": ![wrong](https://user-images.githubusercontent.com/7680235/165492073-bb7b581d-026e-4137-aa15-f6277a69079d.jpg) ### What you expected to happen Global params can be replaced correctly at "COMPLEMENT_DATA" mode. ### How to reproduce Create a new process, set some global params default blank. try run at START_PROCESS and COMPLEMENT_DATA mode, see different in t_ds_process_instance. ### Anything else _No response_ ### Version 2.0.3 ### Are you willing to submit PR? - [ ] Yes I am willing to submit a PR! ### Code of Conduct - [X] I agree to follow this project's [Code of Conduct](https://www.apache.org/foundation/policies/conduct)
https://github.com/apache/dolphinscheduler/issues/9811
https://github.com/apache/dolphinscheduler/pull/9952
bc1c15b142ea02cdbd9533e890f8f0af897d1cec
d4aeee16e5f3f67e37a31fa606acf0b313189655
2022-04-27T09:55:39Z
java
2022-05-11T10:37:03Z
dolphinscheduler-master/src/main/java/org/apache/dolphinscheduler/server/master/runner/WorkflowExecuteThread.java
} prvate boolean processTmeout() { ProjectUser projectUser = processServce.queryProjectWthUserByProcessInstanceId(processInstance.getId()); ths.processAlertManager.sendProcessTmeoutAlert(ths.processInstance, projectUser); return true; } prvate boolean taskStateChangeHandler(StateEvent stateEvent) { f (!checkTaskInstanceByStateEvent(stateEvent)) { return true; } TaskInstance task = getTaskInstance(stateEvent.getTaskInstanceId()); f (task.getState() == null) { logger.error("task state s null, state handler error: {}", stateEvent); return true; } f (task.getState().typeIsFnshed()) { f (completeTaskMap.contansKey(task.getTaskCode()) && completeTaskMap.get(task.getTaskCode()) == task.getId()) { return true; } taskFnshed(task); f (task.getTaskGroupId() > 0) { releaseTaskGroup(task); } return true; } f (actveTaskProcessorMaps.contansKey(task.getTaskCode())) { ITaskProcessor TaskProcessor = actveTaskProcessorMaps.get(task.getTaskCode()); TaskProcessor.acton(TaskActon.RUN); f (TaskProcessor.taskInstance().getState().typeIsFnshed()) { f (TaskProcessor.taskInstance().getState() != task.getState()) {
closed
apache/dolphinscheduler
https://github.com/apache/dolphinscheduler
9,811
[Bug] [ProcessInstance] Replace default global params value failed at "COMPLEMENT_DATA" mode
### Search before asking - [X] I had searched in the [issues](https://github.com/apache/dolphinscheduler/issues?q=is%3Aissue) and found no similar issues. ### What happened <img width="822" alt="process_definition" src="https://user-images.githubusercontent.com/7680235/165489435-14b3f989-9c93-4ac6-be39-bc3561fc6622.png"> The process have several global params default blank. When I run the process at "START_PROCESS" mode, the global_params could be replaced correctly, but if I run the process at "COMPLEMENT_DATA" mode, the replace string all loss. In database, table t_ds_process_instance: Both two modes have the correct command_param, but only "START_PROCESS" have the correct replaced global_params, "COMPLEMENT_DATA" only have the same as process defined. "START_PROCESS": ![correct](https://user-images.githubusercontent.com/7680235/165491987-2757d3df-4635-42ce-9f94-4a302c4c6fdc.jpg) "COMPLEMENT_DATA": ![wrong](https://user-images.githubusercontent.com/7680235/165492073-bb7b581d-026e-4137-aa15-f6277a69079d.jpg) ### What you expected to happen Global params can be replaced correctly at "COMPLEMENT_DATA" mode. ### How to reproduce Create a new process, set some global params default blank. try run at START_PROCESS and COMPLEMENT_DATA mode, see different in t_ds_process_instance. ### Anything else _No response_ ### Version 2.0.3 ### Are you willing to submit PR? - [ ] Yes I am willing to submit a PR! ### Code of Conduct - [X] I agree to follow this project's [Code of Conduct](https://www.apache.org/foundation/policies/conduct)
https://github.com/apache/dolphinscheduler/issues/9811
https://github.com/apache/dolphinscheduler/pull/9952
bc1c15b142ea02cdbd9533e890f8f0af897d1cec
d4aeee16e5f3f67e37a31fa606acf0b313189655
2022-04-27T09:55:39Z
java
2022-05-11T10:37:03Z
dolphinscheduler-master/src/main/java/org/apache/dolphinscheduler/server/master/runner/WorkflowExecuteThread.java
task.setState(TaskProcessor.taskInstance().getState()); } taskFnshed(task); } return true; } logger.error("state handler error: {}", stateEvent); return true; } prvate vod taskFnshed(TaskInstance taskInstance) { logger.nfo("work flow {} task d:{} code:{} state:{} ", processInstance.getId(), taskInstance.getId(), taskInstance.getTaskCode(), taskInstance.getState()); actveTaskProcessorMaps.remove(taskInstance.getTaskCode()); stateWheelExecuteThread.removeTask4TmeoutCheck(processInstance, taskInstance); stateWheelExecuteThread.removeTask4RetryCheck(processInstance, taskInstance); stateWheelExecuteThread.removeTask4StateCheck(processInstance, taskInstance); f (taskInstance.getState().typeIsSuccess()) { completeTaskMap.put(taskInstance.getTaskCode(), taskInstance.getId()); processInstance.setVarPool(taskInstance.getVarPool()); processServce.saveProcessInstance(processInstance); f (!processInstance.sBlocked()) { submtPostNode(Long.toStrng(taskInstance.getTaskCode())); } } else f (taskInstance.taskCanRetry() && processInstance.getState() != ExecutonStatus.READY_STOP) { retryTaskInstance(taskInstance); } else f (taskInstance.getState().typeIsFalure()) {
closed
apache/dolphinscheduler
https://github.com/apache/dolphinscheduler
9,811
[Bug] [ProcessInstance] Replace default global params value failed at "COMPLEMENT_DATA" mode
### Search before asking - [X] I had searched in the [issues](https://github.com/apache/dolphinscheduler/issues?q=is%3Aissue) and found no similar issues. ### What happened <img width="822" alt="process_definition" src="https://user-images.githubusercontent.com/7680235/165489435-14b3f989-9c93-4ac6-be39-bc3561fc6622.png"> The process have several global params default blank. When I run the process at "START_PROCESS" mode, the global_params could be replaced correctly, but if I run the process at "COMPLEMENT_DATA" mode, the replace string all loss. In database, table t_ds_process_instance: Both two modes have the correct command_param, but only "START_PROCESS" have the correct replaced global_params, "COMPLEMENT_DATA" only have the same as process defined. "START_PROCESS": ![correct](https://user-images.githubusercontent.com/7680235/165491987-2757d3df-4635-42ce-9f94-4a302c4c6fdc.jpg) "COMPLEMENT_DATA": ![wrong](https://user-images.githubusercontent.com/7680235/165492073-bb7b581d-026e-4137-aa15-f6277a69079d.jpg) ### What you expected to happen Global params can be replaced correctly at "COMPLEMENT_DATA" mode. ### How to reproduce Create a new process, set some global params default blank. try run at START_PROCESS and COMPLEMENT_DATA mode, see different in t_ds_process_instance. ### Anything else _No response_ ### Version 2.0.3 ### Are you willing to submit PR? - [ ] Yes I am willing to submit a PR! ### Code of Conduct - [X] I agree to follow this project's [Code of Conduct](https://www.apache.org/foundation/policies/conduct)
https://github.com/apache/dolphinscheduler/issues/9811
https://github.com/apache/dolphinscheduler/pull/9952
bc1c15b142ea02cdbd9533e890f8f0af897d1cec
d4aeee16e5f3f67e37a31fa606acf0b313189655
2022-04-27T09:55:39Z
java
2022-05-11T10:37:03Z
dolphinscheduler-master/src/main/java/org/apache/dolphinscheduler/server/master/runner/WorkflowExecuteThread.java
completeTaskMap.put(taskInstance.getTaskCode(), taskInstance.getId()); f (DagHelper.haveAllNodeAfterNode(Long.toStrng(taskInstance.getTaskCode()), dag) && processInstance.getFalureStrategy() == FalureStrategy.CONTINUE) { submtPostNode(Long.toStrng(taskInstance.getTaskCode())); } else { errorTaskMap.put(taskInstance.getTaskCode(), taskInstance.getId()); f (processInstance.getFalureStrategy() == FalureStrategy.END) { kllAllTasks(); } } } else f (taskInstance.getState().typeIsFnshed()) { completeTaskMap.put(taskInstance.getTaskCode(), taskInstance.getId()); } ths.updateProcessInstanceState(); } /** * release task group * * @param taskInstance */ prvate vod releaseTaskGroup(TaskInstance taskInstance) { f (taskInstance.getTaskGroupId() > 0) { TaskInstance nextTaskInstance = ths.processServce.releaseTaskGroup(taskInstance); f (nextTaskInstance != null) { f (nextTaskInstance.getProcessInstanceId() == taskInstance.getProcessInstanceId()) { StateEvent nextEvent = new StateEvent(); nextEvent.setProcessInstanceId(ths.processInstance.getId()); nextEvent.setTaskInstanceId(nextTaskInstance.getId()); nextEvent.setType(StateEventType.WAIT_TASK_GROUP);
closed
apache/dolphinscheduler
https://github.com/apache/dolphinscheduler
9,811
[Bug] [ProcessInstance] Replace default global params value failed at "COMPLEMENT_DATA" mode
### Search before asking - [X] I had searched in the [issues](https://github.com/apache/dolphinscheduler/issues?q=is%3Aissue) and found no similar issues. ### What happened <img width="822" alt="process_definition" src="https://user-images.githubusercontent.com/7680235/165489435-14b3f989-9c93-4ac6-be39-bc3561fc6622.png"> The process have several global params default blank. When I run the process at "START_PROCESS" mode, the global_params could be replaced correctly, but if I run the process at "COMPLEMENT_DATA" mode, the replace string all loss. In database, table t_ds_process_instance: Both two modes have the correct command_param, but only "START_PROCESS" have the correct replaced global_params, "COMPLEMENT_DATA" only have the same as process defined. "START_PROCESS": ![correct](https://user-images.githubusercontent.com/7680235/165491987-2757d3df-4635-42ce-9f94-4a302c4c6fdc.jpg) "COMPLEMENT_DATA": ![wrong](https://user-images.githubusercontent.com/7680235/165492073-bb7b581d-026e-4137-aa15-f6277a69079d.jpg) ### What you expected to happen Global params can be replaced correctly at "COMPLEMENT_DATA" mode. ### How to reproduce Create a new process, set some global params default blank. try run at START_PROCESS and COMPLEMENT_DATA mode, see different in t_ds_process_instance. ### Anything else _No response_ ### Version 2.0.3 ### Are you willing to submit PR? - [ ] Yes I am willing to submit a PR! ### Code of Conduct - [X] I agree to follow this project's [Code of Conduct](https://www.apache.org/foundation/policies/conduct)
https://github.com/apache/dolphinscheduler/issues/9811
https://github.com/apache/dolphinscheduler/pull/9952
bc1c15b142ea02cdbd9533e890f8f0af897d1cec
d4aeee16e5f3f67e37a31fa606acf0b313189655
2022-04-27T09:55:39Z
java
2022-05-11T10:37:03Z
dolphinscheduler-master/src/main/java/org/apache/dolphinscheduler/server/master/runner/WorkflowExecuteThread.java
ths.stateEvents.add(nextEvent); } else { ProcessInstance processInstance = ths.processServce.fndProcessInstanceById(nextTaskInstance.getProcessInstanceId()); ths.processServce.sendStartTask2Master(processInstance, nextTaskInstance.getId(), org.apache.dolphnscheduler.remote.command.CommandType.TASK_WAKEUP_EVENT_REQUEST); } } } } /** * crate new task nstance to retry, dfferent objects from the orgnal * * @param taskInstance */ prvate vod retryTaskInstance(TaskInstance taskInstance) { f (!taskInstance.taskCanRetry()) { return; } TaskInstance newTaskInstance = cloneRetryTaskInstance(taskInstance); f (newTaskInstance == null) { logger.error("retry fal, new taskInstancce s null, task code:{}, task d:{}", taskInstance.getTaskCode(), taskInstance.getId()); return; } watToRetryTaskInstanceMap.put(newTaskInstance.getTaskCode(), newTaskInstance); f (!taskInstance.retryTaskIntervalOverTme()) { logger.nfo("falure task wll be submtted: process d: {}, task nstance code: {} state:{} retry tmes:{} / {}, nterval:{}", processInstance.getId(), newTaskInstance.getTaskCode(), newTaskInstance.getState(), newTaskInstance.getRetryTmes(),
closed
apache/dolphinscheduler
https://github.com/apache/dolphinscheduler
9,811
[Bug] [ProcessInstance] Replace default global params value failed at "COMPLEMENT_DATA" mode
### Search before asking - [X] I had searched in the [issues](https://github.com/apache/dolphinscheduler/issues?q=is%3Aissue) and found no similar issues. ### What happened <img width="822" alt="process_definition" src="https://user-images.githubusercontent.com/7680235/165489435-14b3f989-9c93-4ac6-be39-bc3561fc6622.png"> The process have several global params default blank. When I run the process at "START_PROCESS" mode, the global_params could be replaced correctly, but if I run the process at "COMPLEMENT_DATA" mode, the replace string all loss. In database, table t_ds_process_instance: Both two modes have the correct command_param, but only "START_PROCESS" have the correct replaced global_params, "COMPLEMENT_DATA" only have the same as process defined. "START_PROCESS": ![correct](https://user-images.githubusercontent.com/7680235/165491987-2757d3df-4635-42ce-9f94-4a302c4c6fdc.jpg) "COMPLEMENT_DATA": ![wrong](https://user-images.githubusercontent.com/7680235/165492073-bb7b581d-026e-4137-aa15-f6277a69079d.jpg) ### What you expected to happen Global params can be replaced correctly at "COMPLEMENT_DATA" mode. ### How to reproduce Create a new process, set some global params default blank. try run at START_PROCESS and COMPLEMENT_DATA mode, see different in t_ds_process_instance. ### Anything else _No response_ ### Version 2.0.3 ### Are you willing to submit PR? - [ ] Yes I am willing to submit a PR! ### Code of Conduct - [X] I agree to follow this project's [Code of Conduct](https://www.apache.org/foundation/policies/conduct)
https://github.com/apache/dolphinscheduler/issues/9811
https://github.com/apache/dolphinscheduler/pull/9952
bc1c15b142ea02cdbd9533e890f8f0af897d1cec
d4aeee16e5f3f67e37a31fa606acf0b313189655
2022-04-27T09:55:39Z
java
2022-05-11T10:37:03Z
dolphinscheduler-master/src/main/java/org/apache/dolphinscheduler/server/master/runner/WorkflowExecuteThread.java
newTaskInstance.getMaxRetryTmes(), newTaskInstance.getRetryInterval()); stateWheelExecuteThread.addTask4TmeoutCheck(processInstance, newTaskInstance); stateWheelExecuteThread.addTask4RetryCheck(processInstance, newTaskInstance); } else { addTaskToStandByLst(newTaskInstance); submtStandByTask(); watToRetryTaskInstanceMap.remove(newTaskInstance.getTaskCode()); } } /** * handle task retry event * * @param stateEvent * @return */ prvate boolean taskRetryEventHandler(StateEvent stateEvent) { TaskInstance taskInstance = watToRetryTaskInstanceMap.get(stateEvent.getTaskCode()); addTaskToStandByLst(taskInstance); submtStandByTask(); watToRetryTaskInstanceMap.remove(stateEvent.getTaskCode()); return true; } /** * update process nstance */ publc vod refreshProcessInstance(nt processInstanceId) { logger.nfo("process nstance update: {}", processInstanceId); processInstance = processServce.fndProcessInstanceById(processInstanceId); processDefnton = processServce.fndProcessDefnton(processInstance.getProcessDefntonCode(),
closed
apache/dolphinscheduler
https://github.com/apache/dolphinscheduler
9,811
[Bug] [ProcessInstance] Replace default global params value failed at "COMPLEMENT_DATA" mode
### Search before asking - [X] I had searched in the [issues](https://github.com/apache/dolphinscheduler/issues?q=is%3Aissue) and found no similar issues. ### What happened <img width="822" alt="process_definition" src="https://user-images.githubusercontent.com/7680235/165489435-14b3f989-9c93-4ac6-be39-bc3561fc6622.png"> The process have several global params default blank. When I run the process at "START_PROCESS" mode, the global_params could be replaced correctly, but if I run the process at "COMPLEMENT_DATA" mode, the replace string all loss. In database, table t_ds_process_instance: Both two modes have the correct command_param, but only "START_PROCESS" have the correct replaced global_params, "COMPLEMENT_DATA" only have the same as process defined. "START_PROCESS": ![correct](https://user-images.githubusercontent.com/7680235/165491987-2757d3df-4635-42ce-9f94-4a302c4c6fdc.jpg) "COMPLEMENT_DATA": ![wrong](https://user-images.githubusercontent.com/7680235/165492073-bb7b581d-026e-4137-aa15-f6277a69079d.jpg) ### What you expected to happen Global params can be replaced correctly at "COMPLEMENT_DATA" mode. ### How to reproduce Create a new process, set some global params default blank. try run at START_PROCESS and COMPLEMENT_DATA mode, see different in t_ds_process_instance. ### Anything else _No response_ ### Version 2.0.3 ### Are you willing to submit PR? - [ ] Yes I am willing to submit a PR! ### Code of Conduct - [X] I agree to follow this project's [Code of Conduct](https://www.apache.org/foundation/policies/conduct)
https://github.com/apache/dolphinscheduler/issues/9811
https://github.com/apache/dolphinscheduler/pull/9952
bc1c15b142ea02cdbd9533e890f8f0af897d1cec
d4aeee16e5f3f67e37a31fa606acf0b313189655
2022-04-27T09:55:39Z
java
2022-05-11T10:37:03Z
dolphinscheduler-master/src/main/java/org/apache/dolphinscheduler/server/master/runner/WorkflowExecuteThread.java
processInstance.getProcessDefntonVerson()); processInstance.setProcessDefnton(processDefnton); } /** * update task nstance */ publc vod refreshTaskInstance(nt taskInstanceId) { logger.nfo("task nstance update: {} ", taskInstanceId); TaskInstance taskInstance = processServce.fndTaskInstanceById(taskInstanceId); f (taskInstance == null) { logger.error("can not fnd task nstance, d:{}", taskInstanceId); return; } processServce.packageTaskInstance(taskInstance, processInstance); taskInstanceMap.put(taskInstance.getId(), taskInstance); valdTaskMap.remove(taskInstance.getTaskCode()); f (Flag.YES == taskInstance.getFlag()) { valdTaskMap.put(taskInstance.getTaskCode(), taskInstance.getId()); } } /** * check process nstance by state event */ publc boolean checkProcessInstance(StateEvent stateEvent) { f (ths.processInstance.getId() != stateEvent.getProcessInstanceId()) { logger.error("msmatch process nstance d: {}, state event:{}", ths.processInstance.getId(), stateEvent); return false; }
closed
apache/dolphinscheduler
https://github.com/apache/dolphinscheduler
9,811
[Bug] [ProcessInstance] Replace default global params value failed at "COMPLEMENT_DATA" mode
### Search before asking - [X] I had searched in the [issues](https://github.com/apache/dolphinscheduler/issues?q=is%3Aissue) and found no similar issues. ### What happened <img width="822" alt="process_definition" src="https://user-images.githubusercontent.com/7680235/165489435-14b3f989-9c93-4ac6-be39-bc3561fc6622.png"> The process have several global params default blank. When I run the process at "START_PROCESS" mode, the global_params could be replaced correctly, but if I run the process at "COMPLEMENT_DATA" mode, the replace string all loss. In database, table t_ds_process_instance: Both two modes have the correct command_param, but only "START_PROCESS" have the correct replaced global_params, "COMPLEMENT_DATA" only have the same as process defined. "START_PROCESS": ![correct](https://user-images.githubusercontent.com/7680235/165491987-2757d3df-4635-42ce-9f94-4a302c4c6fdc.jpg) "COMPLEMENT_DATA": ![wrong](https://user-images.githubusercontent.com/7680235/165492073-bb7b581d-026e-4137-aa15-f6277a69079d.jpg) ### What you expected to happen Global params can be replaced correctly at "COMPLEMENT_DATA" mode. ### How to reproduce Create a new process, set some global params default blank. try run at START_PROCESS and COMPLEMENT_DATA mode, see different in t_ds_process_instance. ### Anything else _No response_ ### Version 2.0.3 ### Are you willing to submit PR? - [ ] Yes I am willing to submit a PR! ### Code of Conduct - [X] I agree to follow this project's [Code of Conduct](https://www.apache.org/foundation/policies/conduct)
https://github.com/apache/dolphinscheduler/issues/9811
https://github.com/apache/dolphinscheduler/pull/9952
bc1c15b142ea02cdbd9533e890f8f0af897d1cec
d4aeee16e5f3f67e37a31fa606acf0b313189655
2022-04-27T09:55:39Z
java
2022-05-11T10:37:03Z
dolphinscheduler-master/src/main/java/org/apache/dolphinscheduler/server/master/runner/WorkflowExecuteThread.java
return true; } /** * check f task nstance exst by state event */ publc boolean checkTaskInstanceByStateEvent(StateEvent stateEvent) { f (stateEvent.getTaskInstanceId() == 0) { logger.error("task nstance d null, state event:{}", stateEvent); return false; } f (!taskInstanceMap.contansKey(stateEvent.getTaskInstanceId())) { logger.error("msmatch task nstance d, event:{}", stateEvent); return false; } return true; } /** * check f task nstance exst by task code */ publc boolean checkTaskInstanceByCode(long taskCode) { f (taskInstanceMap == null || taskInstanceMap.sze() == 0) { return false; } for (TaskInstance taskInstance : taskInstanceMap.values()) { f (taskInstance.getTaskCode() == taskCode) { return true; } } return false; }
closed
apache/dolphinscheduler
https://github.com/apache/dolphinscheduler
9,811
[Bug] [ProcessInstance] Replace default global params value failed at "COMPLEMENT_DATA" mode
### Search before asking - [X] I had searched in the [issues](https://github.com/apache/dolphinscheduler/issues?q=is%3Aissue) and found no similar issues. ### What happened <img width="822" alt="process_definition" src="https://user-images.githubusercontent.com/7680235/165489435-14b3f989-9c93-4ac6-be39-bc3561fc6622.png"> The process have several global params default blank. When I run the process at "START_PROCESS" mode, the global_params could be replaced correctly, but if I run the process at "COMPLEMENT_DATA" mode, the replace string all loss. In database, table t_ds_process_instance: Both two modes have the correct command_param, but only "START_PROCESS" have the correct replaced global_params, "COMPLEMENT_DATA" only have the same as process defined. "START_PROCESS": ![correct](https://user-images.githubusercontent.com/7680235/165491987-2757d3df-4635-42ce-9f94-4a302c4c6fdc.jpg) "COMPLEMENT_DATA": ![wrong](https://user-images.githubusercontent.com/7680235/165492073-bb7b581d-026e-4137-aa15-f6277a69079d.jpg) ### What you expected to happen Global params can be replaced correctly at "COMPLEMENT_DATA" mode. ### How to reproduce Create a new process, set some global params default blank. try run at START_PROCESS and COMPLEMENT_DATA mode, see different in t_ds_process_instance. ### Anything else _No response_ ### Version 2.0.3 ### Are you willing to submit PR? - [ ] Yes I am willing to submit a PR! ### Code of Conduct - [X] I agree to follow this project's [Code of Conduct](https://www.apache.org/foundation/policies/conduct)
https://github.com/apache/dolphinscheduler/issues/9811
https://github.com/apache/dolphinscheduler/pull/9952
bc1c15b142ea02cdbd9533e890f8f0af897d1cec
d4aeee16e5f3f67e37a31fa606acf0b313189655
2022-04-27T09:55:39Z
java
2022-05-11T10:37:03Z
dolphinscheduler-master/src/main/java/org/apache/dolphinscheduler/server/master/runner/WorkflowExecuteThread.java
/** * check f task nstance exst by d */ publc boolean checkTaskInstanceById(nt taskInstanceId) { f (taskInstanceMap == null || taskInstanceMap.sze() == 0) { return false; } return taskInstanceMap.contansKey(taskInstanceId); } /** * get task nstance from memory */ publc TaskInstance getTaskInstance(nt taskInstanceId) { f (taskInstanceMap.contansKey(taskInstanceId)) { return taskInstanceMap.get(taskInstanceId); } return null; } publc TaskInstance getTaskInstance(long taskCode) { f (taskInstanceMap == null || taskInstanceMap.sze() == 0) { return null; } for (TaskInstance taskInstance : taskInstanceMap.values()) { f (taskInstance.getTaskCode() == taskCode) { return taskInstance; } } return null; } publc TaskInstance getActveTaskInstanceByTaskCode(long taskCode) {
closed
apache/dolphinscheduler
https://github.com/apache/dolphinscheduler
9,811
[Bug] [ProcessInstance] Replace default global params value failed at "COMPLEMENT_DATA" mode
### Search before asking - [X] I had searched in the [issues](https://github.com/apache/dolphinscheduler/issues?q=is%3Aissue) and found no similar issues. ### What happened <img width="822" alt="process_definition" src="https://user-images.githubusercontent.com/7680235/165489435-14b3f989-9c93-4ac6-be39-bc3561fc6622.png"> The process have several global params default blank. When I run the process at "START_PROCESS" mode, the global_params could be replaced correctly, but if I run the process at "COMPLEMENT_DATA" mode, the replace string all loss. In database, table t_ds_process_instance: Both two modes have the correct command_param, but only "START_PROCESS" have the correct replaced global_params, "COMPLEMENT_DATA" only have the same as process defined. "START_PROCESS": ![correct](https://user-images.githubusercontent.com/7680235/165491987-2757d3df-4635-42ce-9f94-4a302c4c6fdc.jpg) "COMPLEMENT_DATA": ![wrong](https://user-images.githubusercontent.com/7680235/165492073-bb7b581d-026e-4137-aa15-f6277a69079d.jpg) ### What you expected to happen Global params can be replaced correctly at "COMPLEMENT_DATA" mode. ### How to reproduce Create a new process, set some global params default blank. try run at START_PROCESS and COMPLEMENT_DATA mode, see different in t_ds_process_instance. ### Anything else _No response_ ### Version 2.0.3 ### Are you willing to submit PR? - [ ] Yes I am willing to submit a PR! ### Code of Conduct - [X] I agree to follow this project's [Code of Conduct](https://www.apache.org/foundation/policies/conduct)
https://github.com/apache/dolphinscheduler/issues/9811
https://github.com/apache/dolphinscheduler/pull/9952
bc1c15b142ea02cdbd9533e890f8f0af897d1cec
d4aeee16e5f3f67e37a31fa606acf0b313189655
2022-04-27T09:55:39Z
java
2022-05-11T10:37:03Z
dolphinscheduler-master/src/main/java/org/apache/dolphinscheduler/server/master/runner/WorkflowExecuteThread.java
f (actveTaskProcessorMaps.contansKey(taskCode)) { return actveTaskProcessorMaps.get(taskCode).taskInstance(); } return null; } publc TaskInstance getRetryTaskInstanceByTaskCode(long taskCode) { f (watToRetryTaskInstanceMap.contansKey(taskCode)) { return watToRetryTaskInstanceMap.get(taskCode); } return null; } prvate boolean processStateChangeHandler(StateEvent stateEvent) { try { logger.nfo("process:{} state {} change to {}", processInstance.getId(), processInstance.getState(), stateEvent.getExecutonStatus()); f (stateEvent.getExecutonStatus() == ExecutonStatus.STOP) { f (processDefnton.getExecutonType().typeIsSeralWat()){ endProcess(); return true; } ths.updateProcessInstanceState(stateEvent); return true; } f (processComplementData()) { return true; } f (stateEvent.getExecutonStatus().typeIsFnshed()) { endProcess(); } f (processInstance.getState() == ExecutonStatus.READY_STOP) {
closed
apache/dolphinscheduler
https://github.com/apache/dolphinscheduler
9,811
[Bug] [ProcessInstance] Replace default global params value failed at "COMPLEMENT_DATA" mode
### Search before asking - [X] I had searched in the [issues](https://github.com/apache/dolphinscheduler/issues?q=is%3Aissue) and found no similar issues. ### What happened <img width="822" alt="process_definition" src="https://user-images.githubusercontent.com/7680235/165489435-14b3f989-9c93-4ac6-be39-bc3561fc6622.png"> The process have several global params default blank. When I run the process at "START_PROCESS" mode, the global_params could be replaced correctly, but if I run the process at "COMPLEMENT_DATA" mode, the replace string all loss. In database, table t_ds_process_instance: Both two modes have the correct command_param, but only "START_PROCESS" have the correct replaced global_params, "COMPLEMENT_DATA" only have the same as process defined. "START_PROCESS": ![correct](https://user-images.githubusercontent.com/7680235/165491987-2757d3df-4635-42ce-9f94-4a302c4c6fdc.jpg) "COMPLEMENT_DATA": ![wrong](https://user-images.githubusercontent.com/7680235/165492073-bb7b581d-026e-4137-aa15-f6277a69079d.jpg) ### What you expected to happen Global params can be replaced correctly at "COMPLEMENT_DATA" mode. ### How to reproduce Create a new process, set some global params default blank. try run at START_PROCESS and COMPLEMENT_DATA mode, see different in t_ds_process_instance. ### Anything else _No response_ ### Version 2.0.3 ### Are you willing to submit PR? - [ ] Yes I am willing to submit a PR! ### Code of Conduct - [X] I agree to follow this project's [Code of Conduct](https://www.apache.org/foundation/policies/conduct)
https://github.com/apache/dolphinscheduler/issues/9811
https://github.com/apache/dolphinscheduler/pull/9952
bc1c15b142ea02cdbd9533e890f8f0af897d1cec
d4aeee16e5f3f67e37a31fa606acf0b313189655
2022-04-27T09:55:39Z
java
2022-05-11T10:37:03Z
dolphinscheduler-master/src/main/java/org/apache/dolphinscheduler/server/master/runner/WorkflowExecuteThread.java
kllAllTasks(); } return true; } catch (Excepton e) { logger.error("process state change error:", e); } return true; } prvate boolean processBlockHandler(StateEvent stateEvent) { try { TaskInstance task = getTaskInstance(stateEvent.getTaskInstanceId()); f (!checkTaskInstanceByStateEvent(stateEvent)) { logger.error("task {} s not a blockng task", task.getTaskCode()); return false; } BlockngParameters parameters = JSONUtls.parseObject(task.getTaskParams(), BlockngParameters.class); f (parameters.sAlertWhenBlockng()) { ProjectUser projectUser = processServce.queryProjectWthUserByProcessInstanceId(processInstance.getId()); processAlertManager.sendProcessBlockngAlert(processInstance, projectUser); logger.nfo("processInstance {} block alert send successful!", processInstance.getId()); } } catch (Excepton e) { logger.error("sendng blockng message error:", e); } return true; } prvate boolean processComplementData() throws Excepton { f (!needComplementProcess()) { return false; }
closed
apache/dolphinscheduler
https://github.com/apache/dolphinscheduler
9,811
[Bug] [ProcessInstance] Replace default global params value failed at "COMPLEMENT_DATA" mode
### Search before asking - [X] I had searched in the [issues](https://github.com/apache/dolphinscheduler/issues?q=is%3Aissue) and found no similar issues. ### What happened <img width="822" alt="process_definition" src="https://user-images.githubusercontent.com/7680235/165489435-14b3f989-9c93-4ac6-be39-bc3561fc6622.png"> The process have several global params default blank. When I run the process at "START_PROCESS" mode, the global_params could be replaced correctly, but if I run the process at "COMPLEMENT_DATA" mode, the replace string all loss. In database, table t_ds_process_instance: Both two modes have the correct command_param, but only "START_PROCESS" have the correct replaced global_params, "COMPLEMENT_DATA" only have the same as process defined. "START_PROCESS": ![correct](https://user-images.githubusercontent.com/7680235/165491987-2757d3df-4635-42ce-9f94-4a302c4c6fdc.jpg) "COMPLEMENT_DATA": ![wrong](https://user-images.githubusercontent.com/7680235/165492073-bb7b581d-026e-4137-aa15-f6277a69079d.jpg) ### What you expected to happen Global params can be replaced correctly at "COMPLEMENT_DATA" mode. ### How to reproduce Create a new process, set some global params default blank. try run at START_PROCESS and COMPLEMENT_DATA mode, see different in t_ds_process_instance. ### Anything else _No response_ ### Version 2.0.3 ### Are you willing to submit PR? - [ ] Yes I am willing to submit a PR! ### Code of Conduct - [X] I agree to follow this project's [Code of Conduct](https://www.apache.org/foundation/policies/conduct)
https://github.com/apache/dolphinscheduler/issues/9811
https://github.com/apache/dolphinscheduler/pull/9952
bc1c15b142ea02cdbd9533e890f8f0af897d1cec
d4aeee16e5f3f67e37a31fa606acf0b313189655
2022-04-27T09:55:39Z
java
2022-05-11T10:37:03Z
dolphinscheduler-master/src/main/java/org/apache/dolphinscheduler/server/master/runner/WorkflowExecuteThread.java
f (processInstance.getState() == ExecutonStatus.READY_STOP) { return false; } Date scheduleDate = processInstance.getScheduleTme(); f (scheduleDate == null) { scheduleDate = complementLstDate.get(0); } else f (processInstance.getState().typeIsFnshed()) { endProcess(); f (complementLstDate.sze() <= 0) { logger.nfo("process complement end. process d:{}", processInstance.getId()); return true; } nt ndex = complementLstDate.ndexOf(scheduleDate); f (ndex >= complementLstDate.sze() - 1 || !processInstance.getState().typeIsSuccess()) { logger.nfo("process complement end. process d:{}", processInstance.getId()); return true; } logger.nfo("process complement contnue. process d:{}, schedule tme:{} complementLstDate:{}", processInstance.getId(), processInstance.getScheduleTme(), complementLstDate.toStrng()); scheduleDate = complementLstDate.get(ndex + 1); } nt create = ths.createComplementDataCommand(scheduleDate); f (create > 0) { logger.nfo("create complement data command successfully."); } return true;
closed
apache/dolphinscheduler
https://github.com/apache/dolphinscheduler
9,811
[Bug] [ProcessInstance] Replace default global params value failed at "COMPLEMENT_DATA" mode
### Search before asking - [X] I had searched in the [issues](https://github.com/apache/dolphinscheduler/issues?q=is%3Aissue) and found no similar issues. ### What happened <img width="822" alt="process_definition" src="https://user-images.githubusercontent.com/7680235/165489435-14b3f989-9c93-4ac6-be39-bc3561fc6622.png"> The process have several global params default blank. When I run the process at "START_PROCESS" mode, the global_params could be replaced correctly, but if I run the process at "COMPLEMENT_DATA" mode, the replace string all loss. In database, table t_ds_process_instance: Both two modes have the correct command_param, but only "START_PROCESS" have the correct replaced global_params, "COMPLEMENT_DATA" only have the same as process defined. "START_PROCESS": ![correct](https://user-images.githubusercontent.com/7680235/165491987-2757d3df-4635-42ce-9f94-4a302c4c6fdc.jpg) "COMPLEMENT_DATA": ![wrong](https://user-images.githubusercontent.com/7680235/165492073-bb7b581d-026e-4137-aa15-f6277a69079d.jpg) ### What you expected to happen Global params can be replaced correctly at "COMPLEMENT_DATA" mode. ### How to reproduce Create a new process, set some global params default blank. try run at START_PROCESS and COMPLEMENT_DATA mode, see different in t_ds_process_instance. ### Anything else _No response_ ### Version 2.0.3 ### Are you willing to submit PR? - [ ] Yes I am willing to submit a PR! ### Code of Conduct - [X] I agree to follow this project's [Code of Conduct](https://www.apache.org/foundation/policies/conduct)
https://github.com/apache/dolphinscheduler/issues/9811
https://github.com/apache/dolphinscheduler/pull/9952
bc1c15b142ea02cdbd9533e890f8f0af897d1cec
d4aeee16e5f3f67e37a31fa606acf0b313189655
2022-04-27T09:55:39Z
java
2022-05-11T10:37:03Z
dolphinscheduler-master/src/main/java/org/apache/dolphinscheduler/server/master/runner/WorkflowExecuteThread.java
} prvate nt createComplementDataCommand(Date scheduleDate) { Command command = new Command(); command.setScheduleTme(scheduleDate); command.setCommandType(CommandType.COMPLEMENT_DATA); command.setProcessDefntonCode(processInstance.getProcessDefntonCode()); Map<Strng, Strng> cmdParam = JSONUtls.toMap(processInstance.getCommandParam()); f (cmdParam.contansKey(Constants.CMD_PARAM_RECOVERY_START_NODE_STRING)) { cmdParam.remove(Constants.CMD_PARAM_RECOVERY_START_NODE_STRING); } cmdParam.replace(CMDPARAM_COMPLEMENT_DATA_START_DATE, DateUtls.format(scheduleDate, "yyyy-MM-dd HH:mm:ss", null)); command.setCommandParam(JSONUtls.toJsonStrng(cmdParam)); command.setTaskDependType(processInstance.getTaskDependType()); command.setFalureStrategy(processInstance.getFalureStrategy()); command.setWarnngType(processInstance.getWarnngType()); command.setWarnngGroupId(processInstance.getWarnngGroupId()); command.setStartTme(new Date()); command.setExecutorId(processInstance.getExecutorId()); command.setUpdateTme(new Date()); command.setProcessInstanceProrty(processInstance.getProcessInstanceProrty()); command.setWorkerGroup(processInstance.getWorkerGroup()); command.setEnvronmentCode(processInstance.getEnvronmentCode()); command.setDryRun(processInstance.getDryRun()); command.setProcessInstanceId(0); command.setProcessDefntonVerson(processInstance.getProcessDefntonVerson()); return processServce.createCommand(command); } prvate boolean needComplementProcess() { f (processInstance.sComplementData() && Flag.NO == processInstance.getIsSubProcess()) {
closed
apache/dolphinscheduler
https://github.com/apache/dolphinscheduler
9,811
[Bug] [ProcessInstance] Replace default global params value failed at "COMPLEMENT_DATA" mode
### Search before asking - [X] I had searched in the [issues](https://github.com/apache/dolphinscheduler/issues?q=is%3Aissue) and found no similar issues. ### What happened <img width="822" alt="process_definition" src="https://user-images.githubusercontent.com/7680235/165489435-14b3f989-9c93-4ac6-be39-bc3561fc6622.png"> The process have several global params default blank. When I run the process at "START_PROCESS" mode, the global_params could be replaced correctly, but if I run the process at "COMPLEMENT_DATA" mode, the replace string all loss. In database, table t_ds_process_instance: Both two modes have the correct command_param, but only "START_PROCESS" have the correct replaced global_params, "COMPLEMENT_DATA" only have the same as process defined. "START_PROCESS": ![correct](https://user-images.githubusercontent.com/7680235/165491987-2757d3df-4635-42ce-9f94-4a302c4c6fdc.jpg) "COMPLEMENT_DATA": ![wrong](https://user-images.githubusercontent.com/7680235/165492073-bb7b581d-026e-4137-aa15-f6277a69079d.jpg) ### What you expected to happen Global params can be replaced correctly at "COMPLEMENT_DATA" mode. ### How to reproduce Create a new process, set some global params default blank. try run at START_PROCESS and COMPLEMENT_DATA mode, see different in t_ds_process_instance. ### Anything else _No response_ ### Version 2.0.3 ### Are you willing to submit PR? - [ ] Yes I am willing to submit a PR! ### Code of Conduct - [X] I agree to follow this project's [Code of Conduct](https://www.apache.org/foundation/policies/conduct)
https://github.com/apache/dolphinscheduler/issues/9811
https://github.com/apache/dolphinscheduler/pull/9952
bc1c15b142ea02cdbd9533e890f8f0af897d1cec
d4aeee16e5f3f67e37a31fa606acf0b313189655
2022-04-27T09:55:39Z
java
2022-05-11T10:37:03Z
dolphinscheduler-master/src/main/java/org/apache/dolphinscheduler/server/master/runner/WorkflowExecuteThread.java
return true; } return false; } /** * process start handle */ publc vod startProcess() { f (ths.taskInstanceMap.sze() > 0) { return; } try { sStart = false; buldFlowDag(); ntTaskQueue(); submtPostNode(null); sStart = true; } catch (Excepton e) { logger.error("start process error, process nstance d:{}", processInstance.getId(), e); } } /** * process end handle */ publc vod endProcess() { ths.stateEvents.clear(); f (processDefnton.getExecutonType().typeIsSeralWat()) { checkSeralProcess(processDefnton); } f (processInstance.getState().typeIsWatngThread()) {
closed
apache/dolphinscheduler
https://github.com/apache/dolphinscheduler
9,811
[Bug] [ProcessInstance] Replace default global params value failed at "COMPLEMENT_DATA" mode
### Search before asking - [X] I had searched in the [issues](https://github.com/apache/dolphinscheduler/issues?q=is%3Aissue) and found no similar issues. ### What happened <img width="822" alt="process_definition" src="https://user-images.githubusercontent.com/7680235/165489435-14b3f989-9c93-4ac6-be39-bc3561fc6622.png"> The process have several global params default blank. When I run the process at "START_PROCESS" mode, the global_params could be replaced correctly, but if I run the process at "COMPLEMENT_DATA" mode, the replace string all loss. In database, table t_ds_process_instance: Both two modes have the correct command_param, but only "START_PROCESS" have the correct replaced global_params, "COMPLEMENT_DATA" only have the same as process defined. "START_PROCESS": ![correct](https://user-images.githubusercontent.com/7680235/165491987-2757d3df-4635-42ce-9f94-4a302c4c6fdc.jpg) "COMPLEMENT_DATA": ![wrong](https://user-images.githubusercontent.com/7680235/165492073-bb7b581d-026e-4137-aa15-f6277a69079d.jpg) ### What you expected to happen Global params can be replaced correctly at "COMPLEMENT_DATA" mode. ### How to reproduce Create a new process, set some global params default blank. try run at START_PROCESS and COMPLEMENT_DATA mode, see different in t_ds_process_instance. ### Anything else _No response_ ### Version 2.0.3 ### Are you willing to submit PR? - [ ] Yes I am willing to submit a PR! ### Code of Conduct - [X] I agree to follow this project's [Code of Conduct](https://www.apache.org/foundation/policies/conduct)
https://github.com/apache/dolphinscheduler/issues/9811
https://github.com/apache/dolphinscheduler/pull/9952
bc1c15b142ea02cdbd9533e890f8f0af897d1cec
d4aeee16e5f3f67e37a31fa606acf0b313189655
2022-04-27T09:55:39Z
java
2022-05-11T10:37:03Z
dolphinscheduler-master/src/main/java/org/apache/dolphinscheduler/server/master/runner/WorkflowExecuteThread.java
processServce.createRecoveryWatngThreadCommand(null, processInstance); } f (processAlertManager.sNeedToSendWarnng(processInstance)) { ProjectUser projectUser = processServce.queryProjectWthUserByProcessInstanceId(processInstance.getId()); processAlertManager.sendAlertProcessInstance(processInstance, getValdTaskLst(), projectUser); } f (checkTaskQueue()) { processServce.releaseAllTaskGroup(processInstance.getId()); } } publc vod checkSeralProcess(ProcessDefnton processDefnton) { nt nextInstanceId = processInstance.getNextProcessInstanceId(); f (nextInstanceId == 0) { ProcessInstance nextProcessInstance = ths.processServce.loadNextProcess4Seral(processInstance.getProcessDefnton().getCode(), ExecutonStatus.SERIAL_WAIT.getCode(), processInstance.getId()); f (nextProcessInstance == null) { return; } nextInstanceId = nextProcessInstance.getId(); } ProcessInstance nextProcessInstance = ths.processServce.fndProcessInstanceById(nextInstanceId); f (nextProcessInstance.getState().typeIsFnshed() || nextProcessInstance.getState().typeIsRunnng()) { return; } Map<Strng, Object> cmdParam = new HashMap<>(); cmdParam.put(CMD_PARAM_RECOVER_PROCESS_ID_STRING, nextInstanceId); Command command = new Command(); command.setCommandType(CommandType.RECOVER_SERIAL_WAIT); command.setProcessInstanceId(nextProcessInstance.getId()); command.setProcessDefntonCode(processDefnton.getCode());
closed
apache/dolphinscheduler
https://github.com/apache/dolphinscheduler
9,811
[Bug] [ProcessInstance] Replace default global params value failed at "COMPLEMENT_DATA" mode
### Search before asking - [X] I had searched in the [issues](https://github.com/apache/dolphinscheduler/issues?q=is%3Aissue) and found no similar issues. ### What happened <img width="822" alt="process_definition" src="https://user-images.githubusercontent.com/7680235/165489435-14b3f989-9c93-4ac6-be39-bc3561fc6622.png"> The process have several global params default blank. When I run the process at "START_PROCESS" mode, the global_params could be replaced correctly, but if I run the process at "COMPLEMENT_DATA" mode, the replace string all loss. In database, table t_ds_process_instance: Both two modes have the correct command_param, but only "START_PROCESS" have the correct replaced global_params, "COMPLEMENT_DATA" only have the same as process defined. "START_PROCESS": ![correct](https://user-images.githubusercontent.com/7680235/165491987-2757d3df-4635-42ce-9f94-4a302c4c6fdc.jpg) "COMPLEMENT_DATA": ![wrong](https://user-images.githubusercontent.com/7680235/165492073-bb7b581d-026e-4137-aa15-f6277a69079d.jpg) ### What you expected to happen Global params can be replaced correctly at "COMPLEMENT_DATA" mode. ### How to reproduce Create a new process, set some global params default blank. try run at START_PROCESS and COMPLEMENT_DATA mode, see different in t_ds_process_instance. ### Anything else _No response_ ### Version 2.0.3 ### Are you willing to submit PR? - [ ] Yes I am willing to submit a PR! ### Code of Conduct - [X] I agree to follow this project's [Code of Conduct](https://www.apache.org/foundation/policies/conduct)
https://github.com/apache/dolphinscheduler/issues/9811
https://github.com/apache/dolphinscheduler/pull/9952
bc1c15b142ea02cdbd9533e890f8f0af897d1cec
d4aeee16e5f3f67e37a31fa606acf0b313189655
2022-04-27T09:55:39Z
java
2022-05-11T10:37:03Z
dolphinscheduler-master/src/main/java/org/apache/dolphinscheduler/server/master/runner/WorkflowExecuteThread.java
command.setProcessDefntonVerson(processDefnton.getVerson()); command.setCommandParam(JSONUtls.toJsonStrng(cmdParam)); processServce.createCommand(command); } /** * generate process dag * * @throws Excepton excepton */ prvate vod buldFlowDag() throws Excepton { f (ths.dag != null) { return; } processDefnton = processServce.fndProcessDefnton(processInstance.getProcessDefntonCode(), processInstance.getProcessDefntonVerson()); processInstance.setProcessDefnton(processDefnton); Lst<TaskInstance> recoverNodeLst = getStartTaskInstanceLst(processInstance.getCommandParam()); Lst<ProcessTaskRelaton> processTaskRelatons = processServce.fndRelatonByCode(processDefnton.getCode(), processDefnton.getVerson()); Lst<TaskDefntonLog> taskDefntonLogs = processServce.getTaskDefneLogLstByRelaton(processTaskRelatons); Lst<TaskNode> taskNodeLst = processServce.transformTask(processTaskRelatons, taskDefntonLogs); forbddenTaskMap.clear(); taskNodeLst.forEach(taskNode -> { f (taskNode.sForbdden()) { forbddenTaskMap.put(taskNode.getCode(), taskNode); } }); Lst<Strng> recoveryNodeCodeLst = getRecoveryNodeCodeLst(recoverNodeLst); Lst<Strng> startNodeNameLst = parseStartNodeName(processInstance.getCommandParam()); ProcessDag processDag = generateFlowDag(taskNodeLst,
closed
apache/dolphinscheduler
https://github.com/apache/dolphinscheduler
9,811
[Bug] [ProcessInstance] Replace default global params value failed at "COMPLEMENT_DATA" mode
### Search before asking - [X] I had searched in the [issues](https://github.com/apache/dolphinscheduler/issues?q=is%3Aissue) and found no similar issues. ### What happened <img width="822" alt="process_definition" src="https://user-images.githubusercontent.com/7680235/165489435-14b3f989-9c93-4ac6-be39-bc3561fc6622.png"> The process have several global params default blank. When I run the process at "START_PROCESS" mode, the global_params could be replaced correctly, but if I run the process at "COMPLEMENT_DATA" mode, the replace string all loss. In database, table t_ds_process_instance: Both two modes have the correct command_param, but only "START_PROCESS" have the correct replaced global_params, "COMPLEMENT_DATA" only have the same as process defined. "START_PROCESS": ![correct](https://user-images.githubusercontent.com/7680235/165491987-2757d3df-4635-42ce-9f94-4a302c4c6fdc.jpg) "COMPLEMENT_DATA": ![wrong](https://user-images.githubusercontent.com/7680235/165492073-bb7b581d-026e-4137-aa15-f6277a69079d.jpg) ### What you expected to happen Global params can be replaced correctly at "COMPLEMENT_DATA" mode. ### How to reproduce Create a new process, set some global params default blank. try run at START_PROCESS and COMPLEMENT_DATA mode, see different in t_ds_process_instance. ### Anything else _No response_ ### Version 2.0.3 ### Are you willing to submit PR? - [ ] Yes I am willing to submit a PR! ### Code of Conduct - [X] I agree to follow this project's [Code of Conduct](https://www.apache.org/foundation/policies/conduct)
https://github.com/apache/dolphinscheduler/issues/9811
https://github.com/apache/dolphinscheduler/pull/9952
bc1c15b142ea02cdbd9533e890f8f0af897d1cec
d4aeee16e5f3f67e37a31fa606acf0b313189655
2022-04-27T09:55:39Z
java
2022-05-11T10:37:03Z
dolphinscheduler-master/src/main/java/org/apache/dolphinscheduler/server/master/runner/WorkflowExecuteThread.java
startNodeNameLst, recoveryNodeCodeLst, processInstance.getTaskDependType()); f (processDag == null) { logger.error("processDag s null"); return; } dag = DagHelper.buldDagGraph(processDag); } /** * nt task queue */ prvate vod ntTaskQueue() { taskFaledSubmt = false; actveTaskProcessorMaps.clear(); dependFaledTaskMap.clear(); completeTaskMap.clear(); errorTaskMap.clear(); f (!sNewProcessInstance()) { Lst<TaskInstance> valdTaskInstanceLst = processServce.fndValdTaskLstByProcessId(processInstance.getId()); for (TaskInstance task : valdTaskInstanceLst) { f (valdTaskMap.contansKey(task.getTaskCode())) { nt oldTaskInstanceId = valdTaskMap.get(task.getTaskCode()); TaskInstance oldTaskInstance = taskInstanceMap.get(oldTaskInstanceId); f (!oldTaskInstance.getState().typeIsFnshed() && task.getState().typeIsFnshed()) { task.setFlag(Flag.NO); processServce.updateTaskInstance(task); contnue; } logger.warn("have same taskCode taskInstance when nt task queue, taskCode:{}", task.getTaskCode()); }
closed
apache/dolphinscheduler
https://github.com/apache/dolphinscheduler
9,811
[Bug] [ProcessInstance] Replace default global params value failed at "COMPLEMENT_DATA" mode
### Search before asking - [X] I had searched in the [issues](https://github.com/apache/dolphinscheduler/issues?q=is%3Aissue) and found no similar issues. ### What happened <img width="822" alt="process_definition" src="https://user-images.githubusercontent.com/7680235/165489435-14b3f989-9c93-4ac6-be39-bc3561fc6622.png"> The process have several global params default blank. When I run the process at "START_PROCESS" mode, the global_params could be replaced correctly, but if I run the process at "COMPLEMENT_DATA" mode, the replace string all loss. In database, table t_ds_process_instance: Both two modes have the correct command_param, but only "START_PROCESS" have the correct replaced global_params, "COMPLEMENT_DATA" only have the same as process defined. "START_PROCESS": ![correct](https://user-images.githubusercontent.com/7680235/165491987-2757d3df-4635-42ce-9f94-4a302c4c6fdc.jpg) "COMPLEMENT_DATA": ![wrong](https://user-images.githubusercontent.com/7680235/165492073-bb7b581d-026e-4137-aa15-f6277a69079d.jpg) ### What you expected to happen Global params can be replaced correctly at "COMPLEMENT_DATA" mode. ### How to reproduce Create a new process, set some global params default blank. try run at START_PROCESS and COMPLEMENT_DATA mode, see different in t_ds_process_instance. ### Anything else _No response_ ### Version 2.0.3 ### Are you willing to submit PR? - [ ] Yes I am willing to submit a PR! ### Code of Conduct - [X] I agree to follow this project's [Code of Conduct](https://www.apache.org/foundation/policies/conduct)
https://github.com/apache/dolphinscheduler/issues/9811
https://github.com/apache/dolphinscheduler/pull/9952
bc1c15b142ea02cdbd9533e890f8f0af897d1cec
d4aeee16e5f3f67e37a31fa606acf0b313189655
2022-04-27T09:55:39Z
java
2022-05-11T10:37:03Z
dolphinscheduler-master/src/main/java/org/apache/dolphinscheduler/server/master/runner/WorkflowExecuteThread.java
valdTaskMap.put(task.getTaskCode(), task.getId()); taskInstanceMap.put(task.getId(), task); f (task.sTaskComplete()) { completeTaskMap.put(task.getTaskCode(), task.getId()); contnue; } f (task.sCondtonsTask() || DagHelper.haveCondtonsAfterNode(Long.toStrng(task.getTaskCode()), dag)) { contnue; } f (task.taskCanRetry()) { f (task.getState() == ExecutonStatus.NEED_FAULT_TOLERANCE) { TaskInstance tolerantTaskInstance = cloneTolerantTaskInstance(task); addTaskToStandByLst(tolerantTaskInstance); } else { retryTaskInstance(task); } contnue; } f (task.getState().typeIsFalure()) { errorTaskMap.put(task.getTaskCode(), task.getId()); } } } f (processInstance.sComplementData() && complementLstDate.sze() == 0) { Map<Strng, Strng> cmdParam = JSONUtls.toMap(processInstance.getCommandParam()); f (cmdParam != null && cmdParam.contansKey(CMDPARAM_COMPLEMENT_DATA_START_DATE)) { Date start = DateUtls.strngToDate(cmdParam.get(CMDPARAM_COMPLEMENT_DATA_START_DATE)); Date end = DateUtls.strngToDate(cmdParam.get(CMDPARAM_COMPLEMENT_DATA_END_DATE)); Lst<Schedule> schedules = processServce.queryReleaseSchedulerLstByProcessDefntonCode(processInstance.getProcessDefntonCode());
closed
apache/dolphinscheduler
https://github.com/apache/dolphinscheduler
9,811
[Bug] [ProcessInstance] Replace default global params value failed at "COMPLEMENT_DATA" mode
### Search before asking - [X] I had searched in the [issues](https://github.com/apache/dolphinscheduler/issues?q=is%3Aissue) and found no similar issues. ### What happened <img width="822" alt="process_definition" src="https://user-images.githubusercontent.com/7680235/165489435-14b3f989-9c93-4ac6-be39-bc3561fc6622.png"> The process have several global params default blank. When I run the process at "START_PROCESS" mode, the global_params could be replaced correctly, but if I run the process at "COMPLEMENT_DATA" mode, the replace string all loss. In database, table t_ds_process_instance: Both two modes have the correct command_param, but only "START_PROCESS" have the correct replaced global_params, "COMPLEMENT_DATA" only have the same as process defined. "START_PROCESS": ![correct](https://user-images.githubusercontent.com/7680235/165491987-2757d3df-4635-42ce-9f94-4a302c4c6fdc.jpg) "COMPLEMENT_DATA": ![wrong](https://user-images.githubusercontent.com/7680235/165492073-bb7b581d-026e-4137-aa15-f6277a69079d.jpg) ### What you expected to happen Global params can be replaced correctly at "COMPLEMENT_DATA" mode. ### How to reproduce Create a new process, set some global params default blank. try run at START_PROCESS and COMPLEMENT_DATA mode, see different in t_ds_process_instance. ### Anything else _No response_ ### Version 2.0.3 ### Are you willing to submit PR? - [ ] Yes I am willing to submit a PR! ### Code of Conduct - [X] I agree to follow this project's [Code of Conduct](https://www.apache.org/foundation/policies/conduct)
https://github.com/apache/dolphinscheduler/issues/9811
https://github.com/apache/dolphinscheduler/pull/9952
bc1c15b142ea02cdbd9533e890f8f0af897d1cec
d4aeee16e5f3f67e37a31fa606acf0b313189655
2022-04-27T09:55:39Z
java
2022-05-11T10:37:03Z
dolphinscheduler-master/src/main/java/org/apache/dolphinscheduler/server/master/runner/WorkflowExecuteThread.java
f (complementLstDate.sze() == 0 && needComplementProcess()) { complementLstDate = CronUtls.getSelfFreDateLst(start, end, schedules); logger.nfo(" process defnton code:{} complement data: {}", processInstance.getProcessDefntonCode(), complementLstDate.toStrng()); f (complementLstDate.sze() > 0 && Flag.NO == processInstance.getIsSubProcess()) { processInstance.setScheduleTme(complementLstDate.get(0)); processInstance.setGlobalParams(ParameterUtls.curngGlobalParams( processDefnton.getGlobalParamMap(), processDefnton.getGlobalParamLst(), CommandType.COMPLEMENT_DATA, processInstance.getScheduleTme(), cmdParam.get(Constants.SCHEDULE_TIMEZONE))); processServce.updateProcessInstance(processInstance); } } } } } /** * submt task to execute * * @param taskInstance task nstance * @return TaskInstance */ prvate TaskInstance submtTaskExec(TaskInstance taskInstance) { try { processServce.packageTaskInstance(taskInstance, processInstance); ITaskProcessor taskProcessor = TaskProcessorFactory.getTaskProcessor(taskInstance.getTaskType()); taskProcessor.nt(taskInstance, processInstance); f (taskInstance.getState() == ExecutonStatus.RUNNING_EXECUTION && taskProcessor.getType().equalsIgnoreCase(Constants.COMMON_TASK_TYPE)) {
closed
apache/dolphinscheduler
https://github.com/apache/dolphinscheduler
9,811
[Bug] [ProcessInstance] Replace default global params value failed at "COMPLEMENT_DATA" mode
### Search before asking - [X] I had searched in the [issues](https://github.com/apache/dolphinscheduler/issues?q=is%3Aissue) and found no similar issues. ### What happened <img width="822" alt="process_definition" src="https://user-images.githubusercontent.com/7680235/165489435-14b3f989-9c93-4ac6-be39-bc3561fc6622.png"> The process have several global params default blank. When I run the process at "START_PROCESS" mode, the global_params could be replaced correctly, but if I run the process at "COMPLEMENT_DATA" mode, the replace string all loss. In database, table t_ds_process_instance: Both two modes have the correct command_param, but only "START_PROCESS" have the correct replaced global_params, "COMPLEMENT_DATA" only have the same as process defined. "START_PROCESS": ![correct](https://user-images.githubusercontent.com/7680235/165491987-2757d3df-4635-42ce-9f94-4a302c4c6fdc.jpg) "COMPLEMENT_DATA": ![wrong](https://user-images.githubusercontent.com/7680235/165492073-bb7b581d-026e-4137-aa15-f6277a69079d.jpg) ### What you expected to happen Global params can be replaced correctly at "COMPLEMENT_DATA" mode. ### How to reproduce Create a new process, set some global params default blank. try run at START_PROCESS and COMPLEMENT_DATA mode, see different in t_ds_process_instance. ### Anything else _No response_ ### Version 2.0.3 ### Are you willing to submit PR? - [ ] Yes I am willing to submit a PR! ### Code of Conduct - [X] I agree to follow this project's [Code of Conduct](https://www.apache.org/foundation/policies/conduct)
https://github.com/apache/dolphinscheduler/issues/9811
https://github.com/apache/dolphinscheduler/pull/9952
bc1c15b142ea02cdbd9533e890f8f0af897d1cec
d4aeee16e5f3f67e37a31fa606acf0b313189655
2022-04-27T09:55:39Z
java
2022-05-11T10:37:03Z
dolphinscheduler-master/src/main/java/org/apache/dolphinscheduler/server/master/runner/WorkflowExecuteThread.java
notfyProcessHostUpdate(taskInstance); } boolean submt = taskProcessor.acton(TaskActon.SUBMIT); f (!submt) { logger.error("process d:{} name:{} submt standby task d:{} name:{} faled!", processInstance.getId(), processInstance.getName(), taskInstance.getId(), taskInstance.getName()); return null; } f (valdTaskMap.contansKey(taskInstance.getTaskCode())) { nt oldTaskInstanceId = valdTaskMap.get(taskInstance.getTaskCode()); f (taskInstance.getId() != oldTaskInstanceId) { TaskInstance oldTaskInstance = taskInstanceMap.get(oldTaskInstanceId); oldTaskInstance.setFlag(Flag.NO); processServce.updateTaskInstance(oldTaskInstance); valdTaskMap.remove(taskInstance.getTaskCode()); actveTaskProcessorMaps.remove(taskInstance.getTaskCode()); } } valdTaskMap.put(taskInstance.getTaskCode(), taskInstance.getId()); taskInstanceMap.put(taskInstance.getId(), taskInstance); actveTaskProcessorMaps.put(taskInstance.getTaskCode(), taskProcessor); taskProcessor.acton(TaskActon.RUN); stateWheelExecuteThread.addTask4TmeoutCheck(processInstance, taskInstance); stateWheelExecuteThread.addTask4StateCheck(processInstance, taskInstance); f (taskProcessor.taskInstance().getState().typeIsFnshed()) { f (processInstance.sBlocked()) { StateEvent processBlockEvent = new StateEvent(); processBlockEvent.setProcessInstanceId(ths.processInstance.getId());
closed
apache/dolphinscheduler
https://github.com/apache/dolphinscheduler
9,811
[Bug] [ProcessInstance] Replace default global params value failed at "COMPLEMENT_DATA" mode
### Search before asking - [X] I had searched in the [issues](https://github.com/apache/dolphinscheduler/issues?q=is%3Aissue) and found no similar issues. ### What happened <img width="822" alt="process_definition" src="https://user-images.githubusercontent.com/7680235/165489435-14b3f989-9c93-4ac6-be39-bc3561fc6622.png"> The process have several global params default blank. When I run the process at "START_PROCESS" mode, the global_params could be replaced correctly, but if I run the process at "COMPLEMENT_DATA" mode, the replace string all loss. In database, table t_ds_process_instance: Both two modes have the correct command_param, but only "START_PROCESS" have the correct replaced global_params, "COMPLEMENT_DATA" only have the same as process defined. "START_PROCESS": ![correct](https://user-images.githubusercontent.com/7680235/165491987-2757d3df-4635-42ce-9f94-4a302c4c6fdc.jpg) "COMPLEMENT_DATA": ![wrong](https://user-images.githubusercontent.com/7680235/165492073-bb7b581d-026e-4137-aa15-f6277a69079d.jpg) ### What you expected to happen Global params can be replaced correctly at "COMPLEMENT_DATA" mode. ### How to reproduce Create a new process, set some global params default blank. try run at START_PROCESS and COMPLEMENT_DATA mode, see different in t_ds_process_instance. ### Anything else _No response_ ### Version 2.0.3 ### Are you willing to submit PR? - [ ] Yes I am willing to submit a PR! ### Code of Conduct - [X] I agree to follow this project's [Code of Conduct](https://www.apache.org/foundation/policies/conduct)
https://github.com/apache/dolphinscheduler/issues/9811
https://github.com/apache/dolphinscheduler/pull/9952
bc1c15b142ea02cdbd9533e890f8f0af897d1cec
d4aeee16e5f3f67e37a31fa606acf0b313189655
2022-04-27T09:55:39Z
java
2022-05-11T10:37:03Z
dolphinscheduler-master/src/main/java/org/apache/dolphinscheduler/server/master/runner/WorkflowExecuteThread.java
processBlockEvent.setTaskInstanceId(taskInstance.getId()); processBlockEvent.setExecutonStatus(taskProcessor.taskInstance().getState()); processBlockEvent.setType(StateEventType.PROCESS_BLOCKED); ths.stateEvents.add(processBlockEvent); } StateEvent taskStateChangeEvent = new StateEvent(); taskStateChangeEvent.setProcessInstanceId(ths.processInstance.getId()); taskStateChangeEvent.setTaskInstanceId(taskInstance.getId()); taskStateChangeEvent.setExecutonStatus(taskProcessor.taskInstance().getState()); taskStateChangeEvent.setType(StateEventType.TASK_STATE_CHANGE); ths.stateEvents.add(taskStateChangeEvent); } return taskInstance; } catch (Excepton e) { logger.error("submt standby task error", e); return null; } } prvate vod notfyProcessHostUpdate(TaskInstance taskInstance) { f (StrngUtls.sEmpty(taskInstance.getHost())) { return; } try { HostUpdateCommand hostUpdateCommand = new HostUpdateCommand(); hostUpdateCommand.setProcessHost(NetUtls.getAddr(masterConfg.getLstenPort())); hostUpdateCommand.setTaskInstanceId(taskInstance.getId()); Host host = new Host(taskInstance.getHost()); nettyExecutorManager.doExecute(host, hostUpdateCommand.convert2Command()); } catch (Excepton e) { logger.error("notfy process host update", e);
closed
apache/dolphinscheduler
https://github.com/apache/dolphinscheduler
9,811
[Bug] [ProcessInstance] Replace default global params value failed at "COMPLEMENT_DATA" mode
### Search before asking - [X] I had searched in the [issues](https://github.com/apache/dolphinscheduler/issues?q=is%3Aissue) and found no similar issues. ### What happened <img width="822" alt="process_definition" src="https://user-images.githubusercontent.com/7680235/165489435-14b3f989-9c93-4ac6-be39-bc3561fc6622.png"> The process have several global params default blank. When I run the process at "START_PROCESS" mode, the global_params could be replaced correctly, but if I run the process at "COMPLEMENT_DATA" mode, the replace string all loss. In database, table t_ds_process_instance: Both two modes have the correct command_param, but only "START_PROCESS" have the correct replaced global_params, "COMPLEMENT_DATA" only have the same as process defined. "START_PROCESS": ![correct](https://user-images.githubusercontent.com/7680235/165491987-2757d3df-4635-42ce-9f94-4a302c4c6fdc.jpg) "COMPLEMENT_DATA": ![wrong](https://user-images.githubusercontent.com/7680235/165492073-bb7b581d-026e-4137-aa15-f6277a69079d.jpg) ### What you expected to happen Global params can be replaced correctly at "COMPLEMENT_DATA" mode. ### How to reproduce Create a new process, set some global params default blank. try run at START_PROCESS and COMPLEMENT_DATA mode, see different in t_ds_process_instance. ### Anything else _No response_ ### Version 2.0.3 ### Are you willing to submit PR? - [ ] Yes I am willing to submit a PR! ### Code of Conduct - [X] I agree to follow this project's [Code of Conduct](https://www.apache.org/foundation/policies/conduct)
https://github.com/apache/dolphinscheduler/issues/9811
https://github.com/apache/dolphinscheduler/pull/9952
bc1c15b142ea02cdbd9533e890f8f0af897d1cec
d4aeee16e5f3f67e37a31fa606acf0b313189655
2022-04-27T09:55:39Z
java
2022-05-11T10:37:03Z
dolphinscheduler-master/src/main/java/org/apache/dolphinscheduler/server/master/runner/WorkflowExecuteThread.java
} } /** * fnd task nstance n db. * n case submt more than one same name task n the same tme. * * @param taskCode task code * @param taskVerson task verson * @return TaskInstance */ prvate TaskInstance fndTaskIfExsts(Long taskCode, nt taskVerson) { Lst<TaskInstance> valdTaskInstanceLst = getValdTaskLst(); for (TaskInstance taskInstance : valdTaskInstanceLst) { f (taskInstance.getTaskCode() == taskCode && taskInstance.getTaskDefntonVerson() == taskVerson) { return taskInstance; } } return null; } /** * encapsulaton task * * @param processInstance process nstance * @param taskNode taskNode * @return TaskInstance */ prvate TaskInstance createTaskInstance(ProcessInstance processInstance, TaskNode taskNode) { TaskInstance taskInstance = fndTaskIfExsts(taskNode.getCode(), taskNode.getVerson()); f (taskInstance != null) { return taskInstance;
closed
apache/dolphinscheduler
https://github.com/apache/dolphinscheduler
9,811
[Bug] [ProcessInstance] Replace default global params value failed at "COMPLEMENT_DATA" mode
### Search before asking - [X] I had searched in the [issues](https://github.com/apache/dolphinscheduler/issues?q=is%3Aissue) and found no similar issues. ### What happened <img width="822" alt="process_definition" src="https://user-images.githubusercontent.com/7680235/165489435-14b3f989-9c93-4ac6-be39-bc3561fc6622.png"> The process have several global params default blank. When I run the process at "START_PROCESS" mode, the global_params could be replaced correctly, but if I run the process at "COMPLEMENT_DATA" mode, the replace string all loss. In database, table t_ds_process_instance: Both two modes have the correct command_param, but only "START_PROCESS" have the correct replaced global_params, "COMPLEMENT_DATA" only have the same as process defined. "START_PROCESS": ![correct](https://user-images.githubusercontent.com/7680235/165491987-2757d3df-4635-42ce-9f94-4a302c4c6fdc.jpg) "COMPLEMENT_DATA": ![wrong](https://user-images.githubusercontent.com/7680235/165492073-bb7b581d-026e-4137-aa15-f6277a69079d.jpg) ### What you expected to happen Global params can be replaced correctly at "COMPLEMENT_DATA" mode. ### How to reproduce Create a new process, set some global params default blank. try run at START_PROCESS and COMPLEMENT_DATA mode, see different in t_ds_process_instance. ### Anything else _No response_ ### Version 2.0.3 ### Are you willing to submit PR? - [ ] Yes I am willing to submit a PR! ### Code of Conduct - [X] I agree to follow this project's [Code of Conduct](https://www.apache.org/foundation/policies/conduct)
https://github.com/apache/dolphinscheduler/issues/9811
https://github.com/apache/dolphinscheduler/pull/9952
bc1c15b142ea02cdbd9533e890f8f0af897d1cec
d4aeee16e5f3f67e37a31fa606acf0b313189655
2022-04-27T09:55:39Z
java
2022-05-11T10:37:03Z
dolphinscheduler-master/src/main/java/org/apache/dolphinscheduler/server/master/runner/WorkflowExecuteThread.java
} return newTaskInstance(processInstance, taskNode); } /** * clone a new taskInstance for retry and reset some logc felds * * @return */ publc TaskInstance cloneRetryTaskInstance(TaskInstance taskInstance) { TaskNode taskNode = dag.getNode(Long.toStrng(taskInstance.getTaskCode())); f (taskNode == null) { logger.error("taskNode s null, code:{}", taskInstance.getTaskCode()); return null; } TaskInstance newTaskInstance = newTaskInstance(processInstance, taskNode); newTaskInstance.setTaskDefne(taskInstance.getTaskDefne()); newTaskInstance.setProcessDefne(taskInstance.getProcessDefne()); newTaskInstance.setProcessInstance(processInstance); newTaskInstance.setRetryTmes(taskInstance.getRetryTmes() + 1); newTaskInstance.setState(taskInstance.getState()); newTaskInstance.setEndTme(taskInstance.getEndTme()); return newTaskInstance; } /** * clone a new taskInstance for tolerant and reset some logc felds * * @return */ publc TaskInstance cloneTolerantTaskInstance(TaskInstance taskInstance) {
closed
apache/dolphinscheduler
https://github.com/apache/dolphinscheduler
9,811
[Bug] [ProcessInstance] Replace default global params value failed at "COMPLEMENT_DATA" mode
### Search before asking - [X] I had searched in the [issues](https://github.com/apache/dolphinscheduler/issues?q=is%3Aissue) and found no similar issues. ### What happened <img width="822" alt="process_definition" src="https://user-images.githubusercontent.com/7680235/165489435-14b3f989-9c93-4ac6-be39-bc3561fc6622.png"> The process have several global params default blank. When I run the process at "START_PROCESS" mode, the global_params could be replaced correctly, but if I run the process at "COMPLEMENT_DATA" mode, the replace string all loss. In database, table t_ds_process_instance: Both two modes have the correct command_param, but only "START_PROCESS" have the correct replaced global_params, "COMPLEMENT_DATA" only have the same as process defined. "START_PROCESS": ![correct](https://user-images.githubusercontent.com/7680235/165491987-2757d3df-4635-42ce-9f94-4a302c4c6fdc.jpg) "COMPLEMENT_DATA": ![wrong](https://user-images.githubusercontent.com/7680235/165492073-bb7b581d-026e-4137-aa15-f6277a69079d.jpg) ### What you expected to happen Global params can be replaced correctly at "COMPLEMENT_DATA" mode. ### How to reproduce Create a new process, set some global params default blank. try run at START_PROCESS and COMPLEMENT_DATA mode, see different in t_ds_process_instance. ### Anything else _No response_ ### Version 2.0.3 ### Are you willing to submit PR? - [ ] Yes I am willing to submit a PR! ### Code of Conduct - [X] I agree to follow this project's [Code of Conduct](https://www.apache.org/foundation/policies/conduct)
https://github.com/apache/dolphinscheduler/issues/9811
https://github.com/apache/dolphinscheduler/pull/9952
bc1c15b142ea02cdbd9533e890f8f0af897d1cec
d4aeee16e5f3f67e37a31fa606acf0b313189655
2022-04-27T09:55:39Z
java
2022-05-11T10:37:03Z
dolphinscheduler-master/src/main/java/org/apache/dolphinscheduler/server/master/runner/WorkflowExecuteThread.java
TaskNode taskNode = dag.getNode(Long.toStrng(taskInstance.getTaskCode())); f (taskNode == null) { logger.error("taskNode s null, code:{}", taskInstance.getTaskCode()); return null; } TaskInstance newTaskInstance = newTaskInstance(processInstance, taskNode); newTaskInstance.setTaskDefne(taskInstance.getTaskDefne()); newTaskInstance.setProcessDefne(taskInstance.getProcessDefne()); newTaskInstance.setProcessInstance(processInstance); newTaskInstance.setRetryTmes(taskInstance.getRetryTmes()); newTaskInstance.setState(taskInstance.getState()); return newTaskInstance; } /** * new a taskInstance * * @param processInstance * @param taskNode * @return */ publc TaskInstance newTaskInstance(ProcessInstance processInstance, TaskNode taskNode) { TaskInstance taskInstance = new TaskInstance(); taskInstance.setTaskCode(taskNode.getCode()); taskInstance.setTaskDefntonVerson(taskNode.getVerson()); taskInstance.setName(taskNode.getName()); taskInstance.setState(ExecutonStatus.SUBMITTED_SUCCESS); taskInstance.setProcessInstanceId(processInstance.getId());
closed
apache/dolphinscheduler
https://github.com/apache/dolphinscheduler
9,811
[Bug] [ProcessInstance] Replace default global params value failed at "COMPLEMENT_DATA" mode
### Search before asking - [X] I had searched in the [issues](https://github.com/apache/dolphinscheduler/issues?q=is%3Aissue) and found no similar issues. ### What happened <img width="822" alt="process_definition" src="https://user-images.githubusercontent.com/7680235/165489435-14b3f989-9c93-4ac6-be39-bc3561fc6622.png"> The process have several global params default blank. When I run the process at "START_PROCESS" mode, the global_params could be replaced correctly, but if I run the process at "COMPLEMENT_DATA" mode, the replace string all loss. In database, table t_ds_process_instance: Both two modes have the correct command_param, but only "START_PROCESS" have the correct replaced global_params, "COMPLEMENT_DATA" only have the same as process defined. "START_PROCESS": ![correct](https://user-images.githubusercontent.com/7680235/165491987-2757d3df-4635-42ce-9f94-4a302c4c6fdc.jpg) "COMPLEMENT_DATA": ![wrong](https://user-images.githubusercontent.com/7680235/165492073-bb7b581d-026e-4137-aa15-f6277a69079d.jpg) ### What you expected to happen Global params can be replaced correctly at "COMPLEMENT_DATA" mode. ### How to reproduce Create a new process, set some global params default blank. try run at START_PROCESS and COMPLEMENT_DATA mode, see different in t_ds_process_instance. ### Anything else _No response_ ### Version 2.0.3 ### Are you willing to submit PR? - [ ] Yes I am willing to submit a PR! ### Code of Conduct - [X] I agree to follow this project's [Code of Conduct](https://www.apache.org/foundation/policies/conduct)
https://github.com/apache/dolphinscheduler/issues/9811
https://github.com/apache/dolphinscheduler/pull/9952
bc1c15b142ea02cdbd9533e890f8f0af897d1cec
d4aeee16e5f3f67e37a31fa606acf0b313189655
2022-04-27T09:55:39Z
java
2022-05-11T10:37:03Z
dolphinscheduler-master/src/main/java/org/apache/dolphinscheduler/server/master/runner/WorkflowExecuteThread.java
taskInstance.setTaskType(taskNode.getType().toUpperCase()); taskInstance.setAlertFlag(Flag.NO); taskInstance.setStartTme(null); taskInstance.setFlag(Flag.YES); taskInstance.setDryRun(processInstance.getDryRun()); taskInstance.setRetryTmes(0); taskInstance.setMaxRetryTmes(taskNode.getMaxRetryTmes()); taskInstance.setRetryInterval(taskNode.getRetryInterval()); taskInstance.setTaskParams(taskNode.getTaskParams()); taskInstance.setTaskGroupId(taskNode.getTaskGroupId()); taskInstance.setTaskGroupProrty(taskNode.getTaskGroupProrty()); f (taskNode.getTaskInstanceProrty() == null) { taskInstance.setTaskInstanceProrty(Prorty.MEDIUM); } else { taskInstance.setTaskInstanceProrty(taskNode.getTaskInstanceProrty()); } Strng processWorkerGroup = processInstance.getWorkerGroup(); processWorkerGroup = StrngUtls.sBlank(processWorkerGroup) ? DEFAULT_WORKER_GROUP : processWorkerGroup; Strng taskWorkerGroup = StrngUtls.sBlank(taskNode.getWorkerGroup()) ? processWorkerGroup : taskNode.getWorkerGroup();
closed
apache/dolphinscheduler
https://github.com/apache/dolphinscheduler
9,811
[Bug] [ProcessInstance] Replace default global params value failed at "COMPLEMENT_DATA" mode
### Search before asking - [X] I had searched in the [issues](https://github.com/apache/dolphinscheduler/issues?q=is%3Aissue) and found no similar issues. ### What happened <img width="822" alt="process_definition" src="https://user-images.githubusercontent.com/7680235/165489435-14b3f989-9c93-4ac6-be39-bc3561fc6622.png"> The process have several global params default blank. When I run the process at "START_PROCESS" mode, the global_params could be replaced correctly, but if I run the process at "COMPLEMENT_DATA" mode, the replace string all loss. In database, table t_ds_process_instance: Both two modes have the correct command_param, but only "START_PROCESS" have the correct replaced global_params, "COMPLEMENT_DATA" only have the same as process defined. "START_PROCESS": ![correct](https://user-images.githubusercontent.com/7680235/165491987-2757d3df-4635-42ce-9f94-4a302c4c6fdc.jpg) "COMPLEMENT_DATA": ![wrong](https://user-images.githubusercontent.com/7680235/165492073-bb7b581d-026e-4137-aa15-f6277a69079d.jpg) ### What you expected to happen Global params can be replaced correctly at "COMPLEMENT_DATA" mode. ### How to reproduce Create a new process, set some global params default blank. try run at START_PROCESS and COMPLEMENT_DATA mode, see different in t_ds_process_instance. ### Anything else _No response_ ### Version 2.0.3 ### Are you willing to submit PR? - [ ] Yes I am willing to submit a PR! ### Code of Conduct - [X] I agree to follow this project's [Code of Conduct](https://www.apache.org/foundation/policies/conduct)
https://github.com/apache/dolphinscheduler/issues/9811
https://github.com/apache/dolphinscheduler/pull/9952
bc1c15b142ea02cdbd9533e890f8f0af897d1cec
d4aeee16e5f3f67e37a31fa606acf0b313189655
2022-04-27T09:55:39Z
java
2022-05-11T10:37:03Z
dolphinscheduler-master/src/main/java/org/apache/dolphinscheduler/server/master/runner/WorkflowExecuteThread.java
Long processEnvronmentCode = Objects.sNull(processInstance.getEnvronmentCode()) ? -1 : processInstance.getEnvronmentCode(); Long taskEnvronmentCode = Objects.sNull(taskNode.getEnvronmentCode()) ? processEnvronmentCode : taskNode.getEnvronmentCode(); f (!processWorkerGroup.equals(DEFAULT_WORKER_GROUP) && taskWorkerGroup.equals(DEFAULT_WORKER_GROUP)) { taskInstance.setWorkerGroup(processWorkerGroup); taskInstance.setEnvronmentCode(processEnvronmentCode); } else { taskInstance.setWorkerGroup(taskWorkerGroup); taskInstance.setEnvronmentCode(taskEnvronmentCode); } f (!taskInstance.getEnvronmentCode().equals(-1L)) { Envronment envronment = processServce.fndEnvronmentByCode(taskInstance.getEnvronmentCode()); f (Objects.nonNull(envronment) && StrngUtls.sNotEmpty(envronment.getConfg())) { taskInstance.setEnvronmentConfg(envronment.getConfg()); } } taskInstance.setDelayTme(taskNode.getDelayTme()); return taskInstance; } publc vod getPreVarPool(TaskInstance taskInstance, Set<Strng> preTask) { Map<Strng, Property> allProperty = new HashMap<>(); Map<Strng, TaskInstance> allTaskInstance = new HashMap<>(); f (CollectonUtls.sNotEmpty(preTask)) { for (Strng preTaskCode : preTask) { Integer taskId = completeTaskMap.get(Long.parseLong(preTaskCode)); f (taskId == null) { contnue; } TaskInstance preTaskInstance = taskInstanceMap.get(taskId); f (preTaskInstance == null) {
closed
apache/dolphinscheduler
https://github.com/apache/dolphinscheduler
9,811
[Bug] [ProcessInstance] Replace default global params value failed at "COMPLEMENT_DATA" mode
### Search before asking - [X] I had searched in the [issues](https://github.com/apache/dolphinscheduler/issues?q=is%3Aissue) and found no similar issues. ### What happened <img width="822" alt="process_definition" src="https://user-images.githubusercontent.com/7680235/165489435-14b3f989-9c93-4ac6-be39-bc3561fc6622.png"> The process have several global params default blank. When I run the process at "START_PROCESS" mode, the global_params could be replaced correctly, but if I run the process at "COMPLEMENT_DATA" mode, the replace string all loss. In database, table t_ds_process_instance: Both two modes have the correct command_param, but only "START_PROCESS" have the correct replaced global_params, "COMPLEMENT_DATA" only have the same as process defined. "START_PROCESS": ![correct](https://user-images.githubusercontent.com/7680235/165491987-2757d3df-4635-42ce-9f94-4a302c4c6fdc.jpg) "COMPLEMENT_DATA": ![wrong](https://user-images.githubusercontent.com/7680235/165492073-bb7b581d-026e-4137-aa15-f6277a69079d.jpg) ### What you expected to happen Global params can be replaced correctly at "COMPLEMENT_DATA" mode. ### How to reproduce Create a new process, set some global params default blank. try run at START_PROCESS and COMPLEMENT_DATA mode, see different in t_ds_process_instance. ### Anything else _No response_ ### Version 2.0.3 ### Are you willing to submit PR? - [ ] Yes I am willing to submit a PR! ### Code of Conduct - [X] I agree to follow this project's [Code of Conduct](https://www.apache.org/foundation/policies/conduct)
https://github.com/apache/dolphinscheduler/issues/9811
https://github.com/apache/dolphinscheduler/pull/9952
bc1c15b142ea02cdbd9533e890f8f0af897d1cec
d4aeee16e5f3f67e37a31fa606acf0b313189655
2022-04-27T09:55:39Z
java
2022-05-11T10:37:03Z
dolphinscheduler-master/src/main/java/org/apache/dolphinscheduler/server/master/runner/WorkflowExecuteThread.java
contnue; } Strng preVarPool = preTaskInstance.getVarPool(); f (StrngUtls.sNotEmpty(preVarPool)) { Lst<Property> propertes = JSONUtls.toLst(preVarPool, Property.class); for (Property nfo : propertes) { setVarPoolValue(allProperty, allTaskInstance, preTaskInstance, nfo); } } } f (allProperty.sze() > 0) { taskInstance.setVarPool(JSONUtls.toJsonStrng(allProperty.values())); } } else { f (StrngUtls.sNotEmpty(processInstance.getVarPool())) { taskInstance.setVarPool(processInstance.getVarPool()); } } } prvate vod setVarPoolValue(Map<Strng, Property> allProperty, Map<Strng, TaskInstance> allTaskInstance, TaskInstance preTaskInstance, Property thsProperty) { thsProperty.setDrect(Drect.IN); Strng proName = thsProperty.getProp(); f (allProperty.contansKey(proName)) { Property otherPro = allProperty.get(proName); f (StrngUtls.sEmpty(thsProperty.getValue())) {
closed
apache/dolphinscheduler
https://github.com/apache/dolphinscheduler
9,811
[Bug] [ProcessInstance] Replace default global params value failed at "COMPLEMENT_DATA" mode
### Search before asking - [X] I had searched in the [issues](https://github.com/apache/dolphinscheduler/issues?q=is%3Aissue) and found no similar issues. ### What happened <img width="822" alt="process_definition" src="https://user-images.githubusercontent.com/7680235/165489435-14b3f989-9c93-4ac6-be39-bc3561fc6622.png"> The process have several global params default blank. When I run the process at "START_PROCESS" mode, the global_params could be replaced correctly, but if I run the process at "COMPLEMENT_DATA" mode, the replace string all loss. In database, table t_ds_process_instance: Both two modes have the correct command_param, but only "START_PROCESS" have the correct replaced global_params, "COMPLEMENT_DATA" only have the same as process defined. "START_PROCESS": ![correct](https://user-images.githubusercontent.com/7680235/165491987-2757d3df-4635-42ce-9f94-4a302c4c6fdc.jpg) "COMPLEMENT_DATA": ![wrong](https://user-images.githubusercontent.com/7680235/165492073-bb7b581d-026e-4137-aa15-f6277a69079d.jpg) ### What you expected to happen Global params can be replaced correctly at "COMPLEMENT_DATA" mode. ### How to reproduce Create a new process, set some global params default blank. try run at START_PROCESS and COMPLEMENT_DATA mode, see different in t_ds_process_instance. ### Anything else _No response_ ### Version 2.0.3 ### Are you willing to submit PR? - [ ] Yes I am willing to submit a PR! ### Code of Conduct - [X] I agree to follow this project's [Code of Conduct](https://www.apache.org/foundation/policies/conduct)
https://github.com/apache/dolphinscheduler/issues/9811
https://github.com/apache/dolphinscheduler/pull/9952
bc1c15b142ea02cdbd9533e890f8f0af897d1cec
d4aeee16e5f3f67e37a31fa606acf0b313189655
2022-04-27T09:55:39Z
java
2022-05-11T10:37:03Z
dolphinscheduler-master/src/main/java/org/apache/dolphinscheduler/server/master/runner/WorkflowExecuteThread.java
allProperty.put(proName, otherPro); } else f (StrngUtls.sNotEmpty(otherPro.getValue())) { TaskInstance otherTask = allTaskInstance.get(proName); f (otherTask.getEndTme().getTme() > preTaskInstance.getEndTme().getTme()) { allProperty.put(proName, thsProperty); allTaskInstance.put(proName, preTaskInstance); } else { allProperty.put(proName, otherPro); } } else { allProperty.put(proName, thsProperty); allTaskInstance.put(proName, preTaskInstance); } } else { allProperty.put(proName, thsProperty); allTaskInstance.put(proName, preTaskInstance); } } /** * get complete task nstance map, taskCode as key */ prvate Map<Strng, TaskInstance> getCompleteTaskInstanceMap() { Map<Strng, TaskInstance> completeTaskInstanceMap = new HashMap<>(); for (Integer taskInstanceId : completeTaskMap.values()) { TaskInstance taskInstance = taskInstanceMap.get(taskInstanceId); completeTaskInstanceMap.put(Long.toStrng(taskInstance.getTaskCode()), taskInstance); } return completeTaskInstanceMap; }
closed
apache/dolphinscheduler
https://github.com/apache/dolphinscheduler
9,811
[Bug] [ProcessInstance] Replace default global params value failed at "COMPLEMENT_DATA" mode
### Search before asking - [X] I had searched in the [issues](https://github.com/apache/dolphinscheduler/issues?q=is%3Aissue) and found no similar issues. ### What happened <img width="822" alt="process_definition" src="https://user-images.githubusercontent.com/7680235/165489435-14b3f989-9c93-4ac6-be39-bc3561fc6622.png"> The process have several global params default blank. When I run the process at "START_PROCESS" mode, the global_params could be replaced correctly, but if I run the process at "COMPLEMENT_DATA" mode, the replace string all loss. In database, table t_ds_process_instance: Both two modes have the correct command_param, but only "START_PROCESS" have the correct replaced global_params, "COMPLEMENT_DATA" only have the same as process defined. "START_PROCESS": ![correct](https://user-images.githubusercontent.com/7680235/165491987-2757d3df-4635-42ce-9f94-4a302c4c6fdc.jpg) "COMPLEMENT_DATA": ![wrong](https://user-images.githubusercontent.com/7680235/165492073-bb7b581d-026e-4137-aa15-f6277a69079d.jpg) ### What you expected to happen Global params can be replaced correctly at "COMPLEMENT_DATA" mode. ### How to reproduce Create a new process, set some global params default blank. try run at START_PROCESS and COMPLEMENT_DATA mode, see different in t_ds_process_instance. ### Anything else _No response_ ### Version 2.0.3 ### Are you willing to submit PR? - [ ] Yes I am willing to submit a PR! ### Code of Conduct - [X] I agree to follow this project's [Code of Conduct](https://www.apache.org/foundation/policies/conduct)
https://github.com/apache/dolphinscheduler/issues/9811
https://github.com/apache/dolphinscheduler/pull/9952
bc1c15b142ea02cdbd9533e890f8f0af897d1cec
d4aeee16e5f3f67e37a31fa606acf0b313189655
2022-04-27T09:55:39Z
java
2022-05-11T10:37:03Z
dolphinscheduler-master/src/main/java/org/apache/dolphinscheduler/server/master/runner/WorkflowExecuteThread.java
/** * get vald task lst */ prvate Lst<TaskInstance> getValdTaskLst() { Lst<TaskInstance> valdTaskInstanceLst = new ArrayLst<>(); for (Integer taskInstanceId : valdTaskMap.values()) { valdTaskInstanceLst.add(taskInstanceMap.get(taskInstanceId)); } return valdTaskInstanceLst; } prvate vod submtPostNode(Strng parentNodeCode) { Set<Strng> submtTaskNodeLst = DagHelper.parsePostNodes(parentNodeCode, skpTaskNodeMap, dag, getCompleteTaskInstanceMap()); Lst<TaskInstance> taskInstances = new ArrayLst<>(); for (Strng taskNode : submtTaskNodeLst) { TaskNode taskNodeObject = dag.getNode(taskNode); TaskInstance exstTaskInstance = getTaskInstance(taskNodeObject.getCode()); f (exstTaskInstance != null) { taskInstances.add(exstTaskInstance); contnue; } TaskInstance task = createTaskInstance(processInstance, taskNodeObject); taskInstances.add(task); } f (StrngUtls.sNotEmpty(parentNodeCode) && dag.getEndNode().contans(parentNodeCode)) { TaskInstance endTaskInstance = taskInstanceMap.get(completeTaskMap.get(NumberUtls.toLong(parentNodeCode))); Strng taskInstanceVarPool = endTaskInstance.getVarPool(); f (StrngUtls.sNotEmpty(taskInstanceVarPool)) { Set<Property> taskPropertes = JSONUtls.toLst(taskInstanceVarPool, Property.class) .stream().collect(Collectors.toSet());
closed
apache/dolphinscheduler
https://github.com/apache/dolphinscheduler
9,811
[Bug] [ProcessInstance] Replace default global params value failed at "COMPLEMENT_DATA" mode
### Search before asking - [X] I had searched in the [issues](https://github.com/apache/dolphinscheduler/issues?q=is%3Aissue) and found no similar issues. ### What happened <img width="822" alt="process_definition" src="https://user-images.githubusercontent.com/7680235/165489435-14b3f989-9c93-4ac6-be39-bc3561fc6622.png"> The process have several global params default blank. When I run the process at "START_PROCESS" mode, the global_params could be replaced correctly, but if I run the process at "COMPLEMENT_DATA" mode, the replace string all loss. In database, table t_ds_process_instance: Both two modes have the correct command_param, but only "START_PROCESS" have the correct replaced global_params, "COMPLEMENT_DATA" only have the same as process defined. "START_PROCESS": ![correct](https://user-images.githubusercontent.com/7680235/165491987-2757d3df-4635-42ce-9f94-4a302c4c6fdc.jpg) "COMPLEMENT_DATA": ![wrong](https://user-images.githubusercontent.com/7680235/165492073-bb7b581d-026e-4137-aa15-f6277a69079d.jpg) ### What you expected to happen Global params can be replaced correctly at "COMPLEMENT_DATA" mode. ### How to reproduce Create a new process, set some global params default blank. try run at START_PROCESS and COMPLEMENT_DATA mode, see different in t_ds_process_instance. ### Anything else _No response_ ### Version 2.0.3 ### Are you willing to submit PR? - [ ] Yes I am willing to submit a PR! ### Code of Conduct - [X] I agree to follow this project's [Code of Conduct](https://www.apache.org/foundation/policies/conduct)
https://github.com/apache/dolphinscheduler/issues/9811
https://github.com/apache/dolphinscheduler/pull/9952
bc1c15b142ea02cdbd9533e890f8f0af897d1cec
d4aeee16e5f3f67e37a31fa606acf0b313189655
2022-04-27T09:55:39Z
java
2022-05-11T10:37:03Z
dolphinscheduler-master/src/main/java/org/apache/dolphinscheduler/server/master/runner/WorkflowExecuteThread.java
Strng processInstanceVarPool = processInstance.getVarPool(); f (StrngUtls.sNotEmpty(processInstanceVarPool)) { Set<Property> propertes = JSONUtls.toLst(processInstanceVarPool, Property.class) .stream().collect(Collectors.toSet()); propertes.addAll(taskPropertes); processInstance.setVarPool(JSONUtls.toJsonStrng(propertes)); } else { processInstance.setVarPool(JSONUtls.toJsonStrng(taskPropertes)); } } } for (TaskInstance task : taskInstances) { f (readyToSubmtTaskQueue.contans(task)) { contnue; } f (task.getId() > 0 && completeTaskMap.contansKey(task.getTaskCode())) { logger.nfo("task {} has already run success", task.getName()); contnue; } f (task.getState().typeIsPause() || task.getState().typeIsCancel()) { logger.nfo("task {} stopped, the state s {}", task.getName(), task.getState()); contnue; } addTaskToStandByLst(task); } submtStandByTask(); updateProcessInstanceState(); } /**
closed
apache/dolphinscheduler
https://github.com/apache/dolphinscheduler
9,811
[Bug] [ProcessInstance] Replace default global params value failed at "COMPLEMENT_DATA" mode
### Search before asking - [X] I had searched in the [issues](https://github.com/apache/dolphinscheduler/issues?q=is%3Aissue) and found no similar issues. ### What happened <img width="822" alt="process_definition" src="https://user-images.githubusercontent.com/7680235/165489435-14b3f989-9c93-4ac6-be39-bc3561fc6622.png"> The process have several global params default blank. When I run the process at "START_PROCESS" mode, the global_params could be replaced correctly, but if I run the process at "COMPLEMENT_DATA" mode, the replace string all loss. In database, table t_ds_process_instance: Both two modes have the correct command_param, but only "START_PROCESS" have the correct replaced global_params, "COMPLEMENT_DATA" only have the same as process defined. "START_PROCESS": ![correct](https://user-images.githubusercontent.com/7680235/165491987-2757d3df-4635-42ce-9f94-4a302c4c6fdc.jpg) "COMPLEMENT_DATA": ![wrong](https://user-images.githubusercontent.com/7680235/165492073-bb7b581d-026e-4137-aa15-f6277a69079d.jpg) ### What you expected to happen Global params can be replaced correctly at "COMPLEMENT_DATA" mode. ### How to reproduce Create a new process, set some global params default blank. try run at START_PROCESS and COMPLEMENT_DATA mode, see different in t_ds_process_instance. ### Anything else _No response_ ### Version 2.0.3 ### Are you willing to submit PR? - [ ] Yes I am willing to submit a PR! ### Code of Conduct - [X] I agree to follow this project's [Code of Conduct](https://www.apache.org/foundation/policies/conduct)
https://github.com/apache/dolphinscheduler/issues/9811
https://github.com/apache/dolphinscheduler/pull/9952
bc1c15b142ea02cdbd9533e890f8f0af897d1cec
d4aeee16e5f3f67e37a31fa606acf0b313189655
2022-04-27T09:55:39Z
java
2022-05-11T10:37:03Z
dolphinscheduler-master/src/main/java/org/apache/dolphinscheduler/server/master/runner/WorkflowExecuteThread.java
* determne whether the dependences of the task node are complete * * @return DependResult */ prvate DependResult sTaskDepsComplete(Strng taskCode) { Collecton<Strng> startNodes = dag.getBegnNode(); f (startNodes.contans(taskCode)) { return DependResult.SUCCESS; } TaskNode taskNode = dag.getNode(taskCode); Lst<Strng> ndrectDepCodeLst = new ArrayLst<>(); setIndrectDepLst(taskCode, ndrectDepCodeLst); for (Strng depsNode : ndrectDepCodeLst) { f (dag.contansNode(depsNode) && !skpTaskNodeMap.contansKey(depsNode)) { Long despNodeTaskCode = Long.parseLong(depsNode); f (!completeTaskMap.contansKey(despNodeTaskCode)) { return DependResult.WAITING; } Integer depsTaskId = completeTaskMap.get(despNodeTaskCode); ExecutonStatus depTaskState = taskInstanceMap.get(depsTaskId).getState(); f (depTaskState.typeIsPause() || depTaskState.typeIsCancel()) { return DependResult.NON_EXEC; } f (taskNode.sCondtonsTask() || taskNode.sBlockngTask()) { contnue; } f (!dependTaskSuccess(depsNode, taskCode)) {
closed
apache/dolphinscheduler
https://github.com/apache/dolphinscheduler
9,811
[Bug] [ProcessInstance] Replace default global params value failed at "COMPLEMENT_DATA" mode
### Search before asking - [X] I had searched in the [issues](https://github.com/apache/dolphinscheduler/issues?q=is%3Aissue) and found no similar issues. ### What happened <img width="822" alt="process_definition" src="https://user-images.githubusercontent.com/7680235/165489435-14b3f989-9c93-4ac6-be39-bc3561fc6622.png"> The process have several global params default blank. When I run the process at "START_PROCESS" mode, the global_params could be replaced correctly, but if I run the process at "COMPLEMENT_DATA" mode, the replace string all loss. In database, table t_ds_process_instance: Both two modes have the correct command_param, but only "START_PROCESS" have the correct replaced global_params, "COMPLEMENT_DATA" only have the same as process defined. "START_PROCESS": ![correct](https://user-images.githubusercontent.com/7680235/165491987-2757d3df-4635-42ce-9f94-4a302c4c6fdc.jpg) "COMPLEMENT_DATA": ![wrong](https://user-images.githubusercontent.com/7680235/165492073-bb7b581d-026e-4137-aa15-f6277a69079d.jpg) ### What you expected to happen Global params can be replaced correctly at "COMPLEMENT_DATA" mode. ### How to reproduce Create a new process, set some global params default blank. try run at START_PROCESS and COMPLEMENT_DATA mode, see different in t_ds_process_instance. ### Anything else _No response_ ### Version 2.0.3 ### Are you willing to submit PR? - [ ] Yes I am willing to submit a PR! ### Code of Conduct - [X] I agree to follow this project's [Code of Conduct](https://www.apache.org/foundation/policies/conduct)
https://github.com/apache/dolphinscheduler/issues/9811
https://github.com/apache/dolphinscheduler/pull/9952
bc1c15b142ea02cdbd9533e890f8f0af897d1cec
d4aeee16e5f3f67e37a31fa606acf0b313189655
2022-04-27T09:55:39Z
java
2022-05-11T10:37:03Z
dolphinscheduler-master/src/main/java/org/apache/dolphinscheduler/server/master/runner/WorkflowExecuteThread.java
return DependResult.FAILED; } } } logger.nfo("taskCode: {} completeDependTaskLst: {}", taskCode, Arrays.toStrng(completeTaskMap.keySet().toArray())); return DependResult.SUCCESS; } /** * Ths functon s specally used to handle the dependency stuaton where the parent node s a prohbted node. * When the parent node s a forbdden node, the dependency relatonshp should contnue to be traced * * @param taskCode taskCode * @param ndrectDepCodeLst All ndrectly dependent nodes */ prvate vod setIndrectDepLst(Strng taskCode, Lst<Strng> ndrectDepCodeLst) { TaskNode taskNode = dag.getNode(taskCode); Lst<Strng> depCodeLst = taskNode.getDepLst(); for (Strng depsNode : depCodeLst) { f (forbddenTaskMap.contansKey(Long.parseLong(depsNode))) { setIndrectDepLst(depsNode, ndrectDepCodeLst); } else { ndrectDepCodeLst.add(depsNode); } } } /** * depend node s completed, but here need check the condton task branch s the next node */ prvate boolean dependTaskSuccess(Strng dependNodeName, Strng nextNodeName) { f (dag.getNode(dependNodeName).sCondtonsTask()) {
closed
apache/dolphinscheduler
https://github.com/apache/dolphinscheduler
9,811
[Bug] [ProcessInstance] Replace default global params value failed at "COMPLEMENT_DATA" mode
### Search before asking - [X] I had searched in the [issues](https://github.com/apache/dolphinscheduler/issues?q=is%3Aissue) and found no similar issues. ### What happened <img width="822" alt="process_definition" src="https://user-images.githubusercontent.com/7680235/165489435-14b3f989-9c93-4ac6-be39-bc3561fc6622.png"> The process have several global params default blank. When I run the process at "START_PROCESS" mode, the global_params could be replaced correctly, but if I run the process at "COMPLEMENT_DATA" mode, the replace string all loss. In database, table t_ds_process_instance: Both two modes have the correct command_param, but only "START_PROCESS" have the correct replaced global_params, "COMPLEMENT_DATA" only have the same as process defined. "START_PROCESS": ![correct](https://user-images.githubusercontent.com/7680235/165491987-2757d3df-4635-42ce-9f94-4a302c4c6fdc.jpg) "COMPLEMENT_DATA": ![wrong](https://user-images.githubusercontent.com/7680235/165492073-bb7b581d-026e-4137-aa15-f6277a69079d.jpg) ### What you expected to happen Global params can be replaced correctly at "COMPLEMENT_DATA" mode. ### How to reproduce Create a new process, set some global params default blank. try run at START_PROCESS and COMPLEMENT_DATA mode, see different in t_ds_process_instance. ### Anything else _No response_ ### Version 2.0.3 ### Are you willing to submit PR? - [ ] Yes I am willing to submit a PR! ### Code of Conduct - [X] I agree to follow this project's [Code of Conduct](https://www.apache.org/foundation/policies/conduct)
https://github.com/apache/dolphinscheduler/issues/9811
https://github.com/apache/dolphinscheduler/pull/9952
bc1c15b142ea02cdbd9533e890f8f0af897d1cec
d4aeee16e5f3f67e37a31fa606acf0b313189655
2022-04-27T09:55:39Z
java
2022-05-11T10:37:03Z
dolphinscheduler-master/src/main/java/org/apache/dolphinscheduler/server/master/runner/WorkflowExecuteThread.java
Lst<Strng> nextTaskLst = DagHelper.parseCondtonTask(dependNodeName, skpTaskNodeMap, dag, getCompleteTaskInstanceMap()); f (!nextTaskLst.contans(nextNodeName)) { return false; } } else { long taskCode = Long.parseLong(dependNodeName); Integer taskInstanceId = completeTaskMap.get(taskCode); ExecutonStatus depTaskState = taskInstanceMap.get(taskInstanceId).getState(); f (depTaskState.typeIsFalure()) { return false; } } return true; } /** * query task nstance by complete state * * @param state state * @return task nstance lst */ prvate Lst<TaskInstance> getCompleteTaskByState(ExecutonStatus state) { Lst<TaskInstance> resultLst = new ArrayLst<>(); for (Integer taskInstanceId : completeTaskMap.values()) { TaskInstance taskInstance = taskInstanceMap.get(taskInstanceId); f (taskInstance != null && taskInstance.getState() == state) { resultLst.add(taskInstance); } } return resultLst;
closed
apache/dolphinscheduler
https://github.com/apache/dolphinscheduler
9,811
[Bug] [ProcessInstance] Replace default global params value failed at "COMPLEMENT_DATA" mode
### Search before asking - [X] I had searched in the [issues](https://github.com/apache/dolphinscheduler/issues?q=is%3Aissue) and found no similar issues. ### What happened <img width="822" alt="process_definition" src="https://user-images.githubusercontent.com/7680235/165489435-14b3f989-9c93-4ac6-be39-bc3561fc6622.png"> The process have several global params default blank. When I run the process at "START_PROCESS" mode, the global_params could be replaced correctly, but if I run the process at "COMPLEMENT_DATA" mode, the replace string all loss. In database, table t_ds_process_instance: Both two modes have the correct command_param, but only "START_PROCESS" have the correct replaced global_params, "COMPLEMENT_DATA" only have the same as process defined. "START_PROCESS": ![correct](https://user-images.githubusercontent.com/7680235/165491987-2757d3df-4635-42ce-9f94-4a302c4c6fdc.jpg) "COMPLEMENT_DATA": ![wrong](https://user-images.githubusercontent.com/7680235/165492073-bb7b581d-026e-4137-aa15-f6277a69079d.jpg) ### What you expected to happen Global params can be replaced correctly at "COMPLEMENT_DATA" mode. ### How to reproduce Create a new process, set some global params default blank. try run at START_PROCESS and COMPLEMENT_DATA mode, see different in t_ds_process_instance. ### Anything else _No response_ ### Version 2.0.3 ### Are you willing to submit PR? - [ ] Yes I am willing to submit a PR! ### Code of Conduct - [X] I agree to follow this project's [Code of Conduct](https://www.apache.org/foundation/policies/conduct)
https://github.com/apache/dolphinscheduler/issues/9811
https://github.com/apache/dolphinscheduler/pull/9952
bc1c15b142ea02cdbd9533e890f8f0af897d1cec
d4aeee16e5f3f67e37a31fa606acf0b313189655
2022-04-27T09:55:39Z
java
2022-05-11T10:37:03Z
dolphinscheduler-master/src/main/java/org/apache/dolphinscheduler/server/master/runner/WorkflowExecuteThread.java
} /** * where there are ongong tasks * * @param state state * @return ExecutonStatus */ prvate ExecutonStatus runnngState(ExecutonStatus state) { f (state == ExecutonStatus.READY_STOP || state == ExecutonStatus.READY_PAUSE || state == ExecutonStatus.WAITING_THREAD || state == ExecutonStatus.READY_BLOCK || state == ExecutonStatus.DELAY_EXECUTION) { return state; } else { return ExecutonStatus.RUNNING_EXECUTION; } } /** * exsts falure task,contans submt falure、dependency falure,execute falure(retry after) * * @return Boolean whether has faled task */ prvate boolean hasFaledTask() { f (ths.taskFaledSubmt) { return true; } f (ths.errorTaskMap.sze() > 0) { return true;
closed
apache/dolphinscheduler
https://github.com/apache/dolphinscheduler
9,811
[Bug] [ProcessInstance] Replace default global params value failed at "COMPLEMENT_DATA" mode
### Search before asking - [X] I had searched in the [issues](https://github.com/apache/dolphinscheduler/issues?q=is%3Aissue) and found no similar issues. ### What happened <img width="822" alt="process_definition" src="https://user-images.githubusercontent.com/7680235/165489435-14b3f989-9c93-4ac6-be39-bc3561fc6622.png"> The process have several global params default blank. When I run the process at "START_PROCESS" mode, the global_params could be replaced correctly, but if I run the process at "COMPLEMENT_DATA" mode, the replace string all loss. In database, table t_ds_process_instance: Both two modes have the correct command_param, but only "START_PROCESS" have the correct replaced global_params, "COMPLEMENT_DATA" only have the same as process defined. "START_PROCESS": ![correct](https://user-images.githubusercontent.com/7680235/165491987-2757d3df-4635-42ce-9f94-4a302c4c6fdc.jpg) "COMPLEMENT_DATA": ![wrong](https://user-images.githubusercontent.com/7680235/165492073-bb7b581d-026e-4137-aa15-f6277a69079d.jpg) ### What you expected to happen Global params can be replaced correctly at "COMPLEMENT_DATA" mode. ### How to reproduce Create a new process, set some global params default blank. try run at START_PROCESS and COMPLEMENT_DATA mode, see different in t_ds_process_instance. ### Anything else _No response_ ### Version 2.0.3 ### Are you willing to submit PR? - [ ] Yes I am willing to submit a PR! ### Code of Conduct - [X] I agree to follow this project's [Code of Conduct](https://www.apache.org/foundation/policies/conduct)
https://github.com/apache/dolphinscheduler/issues/9811
https://github.com/apache/dolphinscheduler/pull/9952
bc1c15b142ea02cdbd9533e890f8f0af897d1cec
d4aeee16e5f3f67e37a31fa606acf0b313189655
2022-04-27T09:55:39Z
java
2022-05-11T10:37:03Z
dolphinscheduler-master/src/main/java/org/apache/dolphinscheduler/server/master/runner/WorkflowExecuteThread.java
} return ths.dependFaledTaskMap.sze() > 0; } /** * process nstance falure * * @return Boolean whether process nstance faled */ prvate boolean processFaled() { f (hasFaledTask()) { f (processInstance.getFalureStrategy() == FalureStrategy.END) { return true; } f (processInstance.getFalureStrategy() == FalureStrategy.CONTINUE) { return readyToSubmtTaskQueue.sze() == 0 && actveTaskProcessorMaps.sze() == 0 && watToRetryTaskInstanceMap.sze() == 0; } } return false; } /** * whether task for watng thread * * @return Boolean whether has watng thread task */ prvate boolean hasWatngThreadTask() { Lst<TaskInstance> watngLst = getCompleteTaskByState(ExecutonStatus.WAITING_THREAD); return CollectonUtls.sNotEmpty(watngLst); }
closed
apache/dolphinscheduler
https://github.com/apache/dolphinscheduler
9,811
[Bug] [ProcessInstance] Replace default global params value failed at "COMPLEMENT_DATA" mode
### Search before asking - [X] I had searched in the [issues](https://github.com/apache/dolphinscheduler/issues?q=is%3Aissue) and found no similar issues. ### What happened <img width="822" alt="process_definition" src="https://user-images.githubusercontent.com/7680235/165489435-14b3f989-9c93-4ac6-be39-bc3561fc6622.png"> The process have several global params default blank. When I run the process at "START_PROCESS" mode, the global_params could be replaced correctly, but if I run the process at "COMPLEMENT_DATA" mode, the replace string all loss. In database, table t_ds_process_instance: Both two modes have the correct command_param, but only "START_PROCESS" have the correct replaced global_params, "COMPLEMENT_DATA" only have the same as process defined. "START_PROCESS": ![correct](https://user-images.githubusercontent.com/7680235/165491987-2757d3df-4635-42ce-9f94-4a302c4c6fdc.jpg) "COMPLEMENT_DATA": ![wrong](https://user-images.githubusercontent.com/7680235/165492073-bb7b581d-026e-4137-aa15-f6277a69079d.jpg) ### What you expected to happen Global params can be replaced correctly at "COMPLEMENT_DATA" mode. ### How to reproduce Create a new process, set some global params default blank. try run at START_PROCESS and COMPLEMENT_DATA mode, see different in t_ds_process_instance. ### Anything else _No response_ ### Version 2.0.3 ### Are you willing to submit PR? - [ ] Yes I am willing to submit a PR! ### Code of Conduct - [X] I agree to follow this project's [Code of Conduct](https://www.apache.org/foundation/policies/conduct)
https://github.com/apache/dolphinscheduler/issues/9811
https://github.com/apache/dolphinscheduler/pull/9952
bc1c15b142ea02cdbd9533e890f8f0af897d1cec
d4aeee16e5f3f67e37a31fa606acf0b313189655
2022-04-27T09:55:39Z
java
2022-05-11T10:37:03Z
dolphinscheduler-master/src/main/java/org/apache/dolphinscheduler/server/master/runner/WorkflowExecuteThread.java
/** * prepare for pause * 1,faled retry task n the preparaton queue , returns to falure drectly * 2,exsts pause task,complement not completed, pendng submsson of tasks, return to suspenson * 3,success * * @return ExecutonStatus */ prvate ExecutonStatus processReadyPause() { f (hasRetryTaskInStandBy()) { return ExecutonStatus.FAILURE; } Lst<TaskInstance> pauseLst = getCompleteTaskByState(ExecutonStatus.PAUSE); f (CollectonUtls.sNotEmpty(pauseLst) || processInstance.sBlocked() || !sComplementEnd() || readyToSubmtTaskQueue.sze() > 0) { return ExecutonStatus.PAUSE; } else { return ExecutonStatus.SUCCESS; } } /** * prepare for block * f process has tasks stll runnng, pause them * f readyToSubmtTaskQueue s not empty, kll them * else return block status drectly * * @return ExecutonStatus */
closed
apache/dolphinscheduler
https://github.com/apache/dolphinscheduler
9,811
[Bug] [ProcessInstance] Replace default global params value failed at "COMPLEMENT_DATA" mode
### Search before asking - [X] I had searched in the [issues](https://github.com/apache/dolphinscheduler/issues?q=is%3Aissue) and found no similar issues. ### What happened <img width="822" alt="process_definition" src="https://user-images.githubusercontent.com/7680235/165489435-14b3f989-9c93-4ac6-be39-bc3561fc6622.png"> The process have several global params default blank. When I run the process at "START_PROCESS" mode, the global_params could be replaced correctly, but if I run the process at "COMPLEMENT_DATA" mode, the replace string all loss. In database, table t_ds_process_instance: Both two modes have the correct command_param, but only "START_PROCESS" have the correct replaced global_params, "COMPLEMENT_DATA" only have the same as process defined. "START_PROCESS": ![correct](https://user-images.githubusercontent.com/7680235/165491987-2757d3df-4635-42ce-9f94-4a302c4c6fdc.jpg) "COMPLEMENT_DATA": ![wrong](https://user-images.githubusercontent.com/7680235/165492073-bb7b581d-026e-4137-aa15-f6277a69079d.jpg) ### What you expected to happen Global params can be replaced correctly at "COMPLEMENT_DATA" mode. ### How to reproduce Create a new process, set some global params default blank. try run at START_PROCESS and COMPLEMENT_DATA mode, see different in t_ds_process_instance. ### Anything else _No response_ ### Version 2.0.3 ### Are you willing to submit PR? - [ ] Yes I am willing to submit a PR! ### Code of Conduct - [X] I agree to follow this project's [Code of Conduct](https://www.apache.org/foundation/policies/conduct)
https://github.com/apache/dolphinscheduler/issues/9811
https://github.com/apache/dolphinscheduler/pull/9952
bc1c15b142ea02cdbd9533e890f8f0af897d1cec
d4aeee16e5f3f67e37a31fa606acf0b313189655
2022-04-27T09:55:39Z
java
2022-05-11T10:37:03Z
dolphinscheduler-master/src/main/java/org/apache/dolphinscheduler/server/master/runner/WorkflowExecuteThread.java
prvate ExecutonStatus processReadyBlock() { f (actveTaskProcessorMaps.sze() > 0) { for (ITaskProcessor taskProcessor : actveTaskProcessorMaps.values()) { f (!TASK_TYPE_BLOCKING.equals(taskProcessor.getType())) { taskProcessor.acton(TaskActon.PAUSE); } } } f (readyToSubmtTaskQueue.sze() > 0) { for (Iterator<TaskInstance> ter = readyToSubmtTaskQueue.terator(); ter.hasNext(); ) { ter.next().setState(ExecutonStatus.KILL); } } return ExecutonStatus.BLOCK; } /** * generate the latest process nstance status by the tasks state * * @return process nstance executon status */ prvate ExecutonStatus getProcessInstanceState(ProcessInstance nstance) { ExecutonStatus state = nstance.getState(); f (actveTaskProcessorMaps.sze() > 0 || hasRetryTaskInStandBy()) { // actve return runnngState(state); } // block f (state == ExecutonStatus.READY_BLOCK) { return processReadyBlock(); }
closed
apache/dolphinscheduler
https://github.com/apache/dolphinscheduler
9,811
[Bug] [ProcessInstance] Replace default global params value failed at "COMPLEMENT_DATA" mode
### Search before asking - [X] I had searched in the [issues](https://github.com/apache/dolphinscheduler/issues?q=is%3Aissue) and found no similar issues. ### What happened <img width="822" alt="process_definition" src="https://user-images.githubusercontent.com/7680235/165489435-14b3f989-9c93-4ac6-be39-bc3561fc6622.png"> The process have several global params default blank. When I run the process at "START_PROCESS" mode, the global_params could be replaced correctly, but if I run the process at "COMPLEMENT_DATA" mode, the replace string all loss. In database, table t_ds_process_instance: Both two modes have the correct command_param, but only "START_PROCESS" have the correct replaced global_params, "COMPLEMENT_DATA" only have the same as process defined. "START_PROCESS": ![correct](https://user-images.githubusercontent.com/7680235/165491987-2757d3df-4635-42ce-9f94-4a302c4c6fdc.jpg) "COMPLEMENT_DATA": ![wrong](https://user-images.githubusercontent.com/7680235/165492073-bb7b581d-026e-4137-aa15-f6277a69079d.jpg) ### What you expected to happen Global params can be replaced correctly at "COMPLEMENT_DATA" mode. ### How to reproduce Create a new process, set some global params default blank. try run at START_PROCESS and COMPLEMENT_DATA mode, see different in t_ds_process_instance. ### Anything else _No response_ ### Version 2.0.3 ### Are you willing to submit PR? - [ ] Yes I am willing to submit a PR! ### Code of Conduct - [X] I agree to follow this project's [Code of Conduct](https://www.apache.org/foundation/policies/conduct)
https://github.com/apache/dolphinscheduler/issues/9811
https://github.com/apache/dolphinscheduler/pull/9952
bc1c15b142ea02cdbd9533e890f8f0af897d1cec
d4aeee16e5f3f67e37a31fa606acf0b313189655
2022-04-27T09:55:39Z
java
2022-05-11T10:37:03Z
dolphinscheduler-master/src/main/java/org/apache/dolphinscheduler/server/master/runner/WorkflowExecuteThread.java
// watng thread f (hasWatngThreadTask()) { return ExecutonStatus.WAITING_THREAD; } // pause f (state == ExecutonStatus.READY_PAUSE) { return processReadyPause(); } // stop f (state == ExecutonStatus.READY_STOP) { Lst<TaskInstance> stopLst = getCompleteTaskByState(ExecutonStatus.STOP); Lst<TaskInstance> kllLst = getCompleteTaskByState(ExecutonStatus.KILL); Lst<TaskInstance> falLst = getCompleteTaskByState(ExecutonStatus.FAILURE); f (CollectonUtls.sNotEmpty(stopLst) || CollectonUtls.sNotEmpty(kllLst) || CollectonUtls.sNotEmpty(falLst) || !sComplementEnd()) { return ExecutonStatus.STOP; } else { return ExecutonStatus.SUCCESS; } } // process falure f (processFaled()) { return ExecutonStatus.FAILURE; } // success f (state == ExecutonStatus.RUNNING_EXECUTION) { Lst<TaskInstance> kllTasks = getCompleteTaskByState(ExecutonStatus.KILL); f (readyToSubmtTaskQueue.sze() > 0 || watToRetryTaskInstanceMap.sze() > 0) {
closed
apache/dolphinscheduler
https://github.com/apache/dolphinscheduler
9,811
[Bug] [ProcessInstance] Replace default global params value failed at "COMPLEMENT_DATA" mode
### Search before asking - [X] I had searched in the [issues](https://github.com/apache/dolphinscheduler/issues?q=is%3Aissue) and found no similar issues. ### What happened <img width="822" alt="process_definition" src="https://user-images.githubusercontent.com/7680235/165489435-14b3f989-9c93-4ac6-be39-bc3561fc6622.png"> The process have several global params default blank. When I run the process at "START_PROCESS" mode, the global_params could be replaced correctly, but if I run the process at "COMPLEMENT_DATA" mode, the replace string all loss. In database, table t_ds_process_instance: Both two modes have the correct command_param, but only "START_PROCESS" have the correct replaced global_params, "COMPLEMENT_DATA" only have the same as process defined. "START_PROCESS": ![correct](https://user-images.githubusercontent.com/7680235/165491987-2757d3df-4635-42ce-9f94-4a302c4c6fdc.jpg) "COMPLEMENT_DATA": ![wrong](https://user-images.githubusercontent.com/7680235/165492073-bb7b581d-026e-4137-aa15-f6277a69079d.jpg) ### What you expected to happen Global params can be replaced correctly at "COMPLEMENT_DATA" mode. ### How to reproduce Create a new process, set some global params default blank. try run at START_PROCESS and COMPLEMENT_DATA mode, see different in t_ds_process_instance. ### Anything else _No response_ ### Version 2.0.3 ### Are you willing to submit PR? - [ ] Yes I am willing to submit a PR! ### Code of Conduct - [X] I agree to follow this project's [Code of Conduct](https://www.apache.org/foundation/policies/conduct)
https://github.com/apache/dolphinscheduler/issues/9811
https://github.com/apache/dolphinscheduler/pull/9952
bc1c15b142ea02cdbd9533e890f8f0af897d1cec
d4aeee16e5f3f67e37a31fa606acf0b313189655
2022-04-27T09:55:39Z
java
2022-05-11T10:37:03Z
dolphinscheduler-master/src/main/java/org/apache/dolphinscheduler/server/master/runner/WorkflowExecuteThread.java
//tasks cu return ExecutonStatus.RUNNING_EXECUTION; } else f (CollectonUtls.sNotEmpty(kllTasks)) { // tasks m return ExecutonStatus.FAILURE; } else { // f the return ExecutonStatus.SUCCESS; } } return state; } /** * whether complement end * * @return Boolean whether s complement end */ prvate boolean sComplementEnd() { f (!processInstance.sComplementData()) { return true; } try { Map<Strng, Strng> cmdParam = JSONUtls.toMap(processInstance.getCommandParam()); Date endTme = DateUtls.getScheduleDate(cmdParam.get(CMDPARAM_COMPLEMENT_DATA_END_DATE)); return processInstance.getScheduleTme().equals(endTme); } catch (Excepton e) { logger.error("complement end faled ", e); return false; } }
closed
apache/dolphinscheduler
https://github.com/apache/dolphinscheduler
9,811
[Bug] [ProcessInstance] Replace default global params value failed at "COMPLEMENT_DATA" mode
### Search before asking - [X] I had searched in the [issues](https://github.com/apache/dolphinscheduler/issues?q=is%3Aissue) and found no similar issues. ### What happened <img width="822" alt="process_definition" src="https://user-images.githubusercontent.com/7680235/165489435-14b3f989-9c93-4ac6-be39-bc3561fc6622.png"> The process have several global params default blank. When I run the process at "START_PROCESS" mode, the global_params could be replaced correctly, but if I run the process at "COMPLEMENT_DATA" mode, the replace string all loss. In database, table t_ds_process_instance: Both two modes have the correct command_param, but only "START_PROCESS" have the correct replaced global_params, "COMPLEMENT_DATA" only have the same as process defined. "START_PROCESS": ![correct](https://user-images.githubusercontent.com/7680235/165491987-2757d3df-4635-42ce-9f94-4a302c4c6fdc.jpg) "COMPLEMENT_DATA": ![wrong](https://user-images.githubusercontent.com/7680235/165492073-bb7b581d-026e-4137-aa15-f6277a69079d.jpg) ### What you expected to happen Global params can be replaced correctly at "COMPLEMENT_DATA" mode. ### How to reproduce Create a new process, set some global params default blank. try run at START_PROCESS and COMPLEMENT_DATA mode, see different in t_ds_process_instance. ### Anything else _No response_ ### Version 2.0.3 ### Are you willing to submit PR? - [ ] Yes I am willing to submit a PR! ### Code of Conduct - [X] I agree to follow this project's [Code of Conduct](https://www.apache.org/foundation/policies/conduct)
https://github.com/apache/dolphinscheduler/issues/9811
https://github.com/apache/dolphinscheduler/pull/9952
bc1c15b142ea02cdbd9533e890f8f0af897d1cec
d4aeee16e5f3f67e37a31fa606acf0b313189655
2022-04-27T09:55:39Z
java
2022-05-11T10:37:03Z
dolphinscheduler-master/src/main/java/org/apache/dolphinscheduler/server/master/runner/WorkflowExecuteThread.java
/** * updateProcessInstance process nstance state * after each batch of tasks s executed, the status of the process nstance s updated */ prvate vod updateProcessInstanceState() { ExecutonStatus state = getProcessInstanceState(processInstance); f (processInstance.getState() != state) { logger.nfo( "work flow process nstance [d: {}, name:{}], state change from {} to {}, cmd type: {}", processInstance.getId(), processInstance.getName(), processInstance.getState(), state, processInstance.getCommandType()); processInstance.setState(state); f (state.typeIsFnshed()) { processInstance.setEndTme(new Date()); } processServce.updateProcessInstance(processInstance); StateEvent stateEvent = new StateEvent(); stateEvent.setExecutonStatus(processInstance.getState()); stateEvent.setProcessInstanceId(ths.processInstance.getId()); stateEvent.setType(StateEventType.PROCESS_STATE_CHANGE); // ths.pr // replace ths.stateEvents.add(stateEvent); } } /** * stateEvent's executon status as process nstance state */ prvate vod updateProcessInstanceState(StateEvent stateEvent) {
closed
apache/dolphinscheduler
https://github.com/apache/dolphinscheduler
9,811
[Bug] [ProcessInstance] Replace default global params value failed at "COMPLEMENT_DATA" mode
### Search before asking - [X] I had searched in the [issues](https://github.com/apache/dolphinscheduler/issues?q=is%3Aissue) and found no similar issues. ### What happened <img width="822" alt="process_definition" src="https://user-images.githubusercontent.com/7680235/165489435-14b3f989-9c93-4ac6-be39-bc3561fc6622.png"> The process have several global params default blank. When I run the process at "START_PROCESS" mode, the global_params could be replaced correctly, but if I run the process at "COMPLEMENT_DATA" mode, the replace string all loss. In database, table t_ds_process_instance: Both two modes have the correct command_param, but only "START_PROCESS" have the correct replaced global_params, "COMPLEMENT_DATA" only have the same as process defined. "START_PROCESS": ![correct](https://user-images.githubusercontent.com/7680235/165491987-2757d3df-4635-42ce-9f94-4a302c4c6fdc.jpg) "COMPLEMENT_DATA": ![wrong](https://user-images.githubusercontent.com/7680235/165492073-bb7b581d-026e-4137-aa15-f6277a69079d.jpg) ### What you expected to happen Global params can be replaced correctly at "COMPLEMENT_DATA" mode. ### How to reproduce Create a new process, set some global params default blank. try run at START_PROCESS and COMPLEMENT_DATA mode, see different in t_ds_process_instance. ### Anything else _No response_ ### Version 2.0.3 ### Are you willing to submit PR? - [ ] Yes I am willing to submit a PR! ### Code of Conduct - [X] I agree to follow this project's [Code of Conduct](https://www.apache.org/foundation/policies/conduct)
https://github.com/apache/dolphinscheduler/issues/9811
https://github.com/apache/dolphinscheduler/pull/9952
bc1c15b142ea02cdbd9533e890f8f0af897d1cec
d4aeee16e5f3f67e37a31fa606acf0b313189655
2022-04-27T09:55:39Z
java
2022-05-11T10:37:03Z
dolphinscheduler-master/src/main/java/org/apache/dolphinscheduler/server/master/runner/WorkflowExecuteThread.java
ExecutonStatus state = stateEvent.getExecutonStatus(); f (processInstance.getState() != state) { logger.nfo( "work flow process nstance [d: {}, name:{}], state change from {} to {}, cmd type: {}", processInstance.getId(), processInstance.getName(), processInstance.getState(), state, processInstance.getCommandType()); processInstance.setState(state); f (state.typeIsFnshed()) { processInstance.setEndTme(new Date()); } processServce.updateProcessInstance(processInstance); } } /** * get task dependency result * * @param taskInstance task nstance * @return DependResult */ prvate DependResult getDependResultForTask(TaskInstance taskInstance) { return sTaskDepsComplete(Long.toStrng(taskInstance.getTaskCode())); } /** * add task to standby lst * * @param taskInstance task nstance */ prvate vod addTaskToStandByLst(TaskInstance taskInstance) { try {
closed
apache/dolphinscheduler
https://github.com/apache/dolphinscheduler
9,811
[Bug] [ProcessInstance] Replace default global params value failed at "COMPLEMENT_DATA" mode
### Search before asking - [X] I had searched in the [issues](https://github.com/apache/dolphinscheduler/issues?q=is%3Aissue) and found no similar issues. ### What happened <img width="822" alt="process_definition" src="https://user-images.githubusercontent.com/7680235/165489435-14b3f989-9c93-4ac6-be39-bc3561fc6622.png"> The process have several global params default blank. When I run the process at "START_PROCESS" mode, the global_params could be replaced correctly, but if I run the process at "COMPLEMENT_DATA" mode, the replace string all loss. In database, table t_ds_process_instance: Both two modes have the correct command_param, but only "START_PROCESS" have the correct replaced global_params, "COMPLEMENT_DATA" only have the same as process defined. "START_PROCESS": ![correct](https://user-images.githubusercontent.com/7680235/165491987-2757d3df-4635-42ce-9f94-4a302c4c6fdc.jpg) "COMPLEMENT_DATA": ![wrong](https://user-images.githubusercontent.com/7680235/165492073-bb7b581d-026e-4137-aa15-f6277a69079d.jpg) ### What you expected to happen Global params can be replaced correctly at "COMPLEMENT_DATA" mode. ### How to reproduce Create a new process, set some global params default blank. try run at START_PROCESS and COMPLEMENT_DATA mode, see different in t_ds_process_instance. ### Anything else _No response_ ### Version 2.0.3 ### Are you willing to submit PR? - [ ] Yes I am willing to submit a PR! ### Code of Conduct - [X] I agree to follow this project's [Code of Conduct](https://www.apache.org/foundation/policies/conduct)
https://github.com/apache/dolphinscheduler/issues/9811
https://github.com/apache/dolphinscheduler/pull/9952
bc1c15b142ea02cdbd9533e890f8f0af897d1cec
d4aeee16e5f3f67e37a31fa606acf0b313189655
2022-04-27T09:55:39Z
java
2022-05-11T10:37:03Z
dolphinscheduler-master/src/main/java/org/apache/dolphinscheduler/server/master/runner/WorkflowExecuteThread.java
f (readyToSubmtTaskQueue.contans(taskInstance)) { logger.warn("task was found n ready submt queue, task code:{}", taskInstance.getTaskCode()); return; } logger.nfo("add task to stand by lst, task name:{}, task d:{}, task code:{}", taskInstance.getName(), taskInstance.getId(), taskInstance.getTaskCode()); readyToSubmtTaskQueue.put(taskInstance); } catch (Excepton e) { logger.error("add task nstance to readyToSubmtTaskQueue, taskName:{}, task d:{}", taskInstance.getName(), taskInstance.getId(), e); } } /** * remove task from stand by lst * * @param taskInstance task nstance */ prvate vod removeTaskFromStandbyLst(TaskInstance taskInstance) { logger.nfo("remove task from stand by lst, d: {} name:{}", taskInstance.getId(), taskInstance.getName()); try { readyToSubmtTaskQueue.remove(taskInstance); } catch (Excepton e) { logger.error("remove task nstance from readyToSubmtTaskQueue error, task d:{}, Name: {}", taskInstance.getId(), taskInstance.getName(), e); } } /** * has retry task n standby
closed
apache/dolphinscheduler
https://github.com/apache/dolphinscheduler
9,811
[Bug] [ProcessInstance] Replace default global params value failed at "COMPLEMENT_DATA" mode
### Search before asking - [X] I had searched in the [issues](https://github.com/apache/dolphinscheduler/issues?q=is%3Aissue) and found no similar issues. ### What happened <img width="822" alt="process_definition" src="https://user-images.githubusercontent.com/7680235/165489435-14b3f989-9c93-4ac6-be39-bc3561fc6622.png"> The process have several global params default blank. When I run the process at "START_PROCESS" mode, the global_params could be replaced correctly, but if I run the process at "COMPLEMENT_DATA" mode, the replace string all loss. In database, table t_ds_process_instance: Both two modes have the correct command_param, but only "START_PROCESS" have the correct replaced global_params, "COMPLEMENT_DATA" only have the same as process defined. "START_PROCESS": ![correct](https://user-images.githubusercontent.com/7680235/165491987-2757d3df-4635-42ce-9f94-4a302c4c6fdc.jpg) "COMPLEMENT_DATA": ![wrong](https://user-images.githubusercontent.com/7680235/165492073-bb7b581d-026e-4137-aa15-f6277a69079d.jpg) ### What you expected to happen Global params can be replaced correctly at "COMPLEMENT_DATA" mode. ### How to reproduce Create a new process, set some global params default blank. try run at START_PROCESS and COMPLEMENT_DATA mode, see different in t_ds_process_instance. ### Anything else _No response_ ### Version 2.0.3 ### Are you willing to submit PR? - [ ] Yes I am willing to submit a PR! ### Code of Conduct - [X] I agree to follow this project's [Code of Conduct](https://www.apache.org/foundation/policies/conduct)
https://github.com/apache/dolphinscheduler/issues/9811
https://github.com/apache/dolphinscheduler/pull/9952
bc1c15b142ea02cdbd9533e890f8f0af897d1cec
d4aeee16e5f3f67e37a31fa606acf0b313189655
2022-04-27T09:55:39Z
java
2022-05-11T10:37:03Z
dolphinscheduler-master/src/main/java/org/apache/dolphinscheduler/server/master/runner/WorkflowExecuteThread.java
* * @return Boolean whether has retry task n standby */ prvate boolean hasRetryTaskInStandBy() { for (Iterator<TaskInstance> ter = readyToSubmtTaskQueue.terator(); ter.hasNext(); ) { f (ter.next().getState().typeIsFalure()) { return true; } } return false; } /** * close the on gong tasks */ prvate vod kllAllTasks() { logger.nfo("kll called on process nstance d: {}, num: {}", processInstance.getId(), actveTaskProcessorMaps.sze()); f (readyToSubmtTaskQueue.sze() > 0) { readyToSubmtTaskQueue.clear(); } for (long taskCode : actveTaskProcessorMaps.keySet()) { ITaskProcessor taskProcessor = actveTaskProcessorMaps.get(taskCode); Integer taskInstanceId = valdTaskMap.get(taskCode); f (taskInstanceId == null || taskInstanceId.equals(0)) { contnue; } TaskInstance taskInstance = processServce.fndTaskInstanceById(taskInstanceId); f (taskInstance == null || taskInstance.getState().typeIsFnshed()) { contnue; }
closed
apache/dolphinscheduler
https://github.com/apache/dolphinscheduler
9,811
[Bug] [ProcessInstance] Replace default global params value failed at "COMPLEMENT_DATA" mode
### Search before asking - [X] I had searched in the [issues](https://github.com/apache/dolphinscheduler/issues?q=is%3Aissue) and found no similar issues. ### What happened <img width="822" alt="process_definition" src="https://user-images.githubusercontent.com/7680235/165489435-14b3f989-9c93-4ac6-be39-bc3561fc6622.png"> The process have several global params default blank. When I run the process at "START_PROCESS" mode, the global_params could be replaced correctly, but if I run the process at "COMPLEMENT_DATA" mode, the replace string all loss. In database, table t_ds_process_instance: Both two modes have the correct command_param, but only "START_PROCESS" have the correct replaced global_params, "COMPLEMENT_DATA" only have the same as process defined. "START_PROCESS": ![correct](https://user-images.githubusercontent.com/7680235/165491987-2757d3df-4635-42ce-9f94-4a302c4c6fdc.jpg) "COMPLEMENT_DATA": ![wrong](https://user-images.githubusercontent.com/7680235/165492073-bb7b581d-026e-4137-aa15-f6277a69079d.jpg) ### What you expected to happen Global params can be replaced correctly at "COMPLEMENT_DATA" mode. ### How to reproduce Create a new process, set some global params default blank. try run at START_PROCESS and COMPLEMENT_DATA mode, see different in t_ds_process_instance. ### Anything else _No response_ ### Version 2.0.3 ### Are you willing to submit PR? - [ ] Yes I am willing to submit a PR! ### Code of Conduct - [X] I agree to follow this project's [Code of Conduct](https://www.apache.org/foundation/policies/conduct)
https://github.com/apache/dolphinscheduler/issues/9811
https://github.com/apache/dolphinscheduler/pull/9952
bc1c15b142ea02cdbd9533e890f8f0af897d1cec
d4aeee16e5f3f67e37a31fa606acf0b313189655
2022-04-27T09:55:39Z
java
2022-05-11T10:37:03Z
dolphinscheduler-master/src/main/java/org/apache/dolphinscheduler/server/master/runner/WorkflowExecuteThread.java
taskProcessor.acton(TaskActon.STOP); f (taskProcessor.taskInstance().getState().typeIsFnshed()) { StateEvent stateEvent = new StateEvent(); stateEvent.setType(StateEventType.TASK_STATE_CHANGE); stateEvent.setProcessInstanceId(ths.processInstance.getId()); stateEvent.setTaskInstanceId(taskInstance.getId()); stateEvent.setExecutonStatus(taskProcessor.taskInstance().getState()); ths.addStateEvent(stateEvent); } } } publc boolean workFlowFnsh() { return ths.processInstance.getState().typeIsFnshed(); } /** * handlng the lst of tasks to be submtted */ prvate vod submtStandByTask() { try { nt length = readyToSubmtTaskQueue.sze(); for (nt = 0; < length; ++) { TaskInstance task = readyToSubmtTaskQueue.peek(); f (task == null) { contnue; } // stop ta f (task.taskCanRetry()) { TaskInstance retryTask = processServce.fndTaskInstanceById(task.getId()); f (retryTask != null && retryTask.getState().equals(ExecutonStatus.FORCED_SUCCESS)) { task.setState(retryTask.getState());
closed
apache/dolphinscheduler
https://github.com/apache/dolphinscheduler
9,811
[Bug] [ProcessInstance] Replace default global params value failed at "COMPLEMENT_DATA" mode
### Search before asking - [X] I had searched in the [issues](https://github.com/apache/dolphinscheduler/issues?q=is%3Aissue) and found no similar issues. ### What happened <img width="822" alt="process_definition" src="https://user-images.githubusercontent.com/7680235/165489435-14b3f989-9c93-4ac6-be39-bc3561fc6622.png"> The process have several global params default blank. When I run the process at "START_PROCESS" mode, the global_params could be replaced correctly, but if I run the process at "COMPLEMENT_DATA" mode, the replace string all loss. In database, table t_ds_process_instance: Both two modes have the correct command_param, but only "START_PROCESS" have the correct replaced global_params, "COMPLEMENT_DATA" only have the same as process defined. "START_PROCESS": ![correct](https://user-images.githubusercontent.com/7680235/165491987-2757d3df-4635-42ce-9f94-4a302c4c6fdc.jpg) "COMPLEMENT_DATA": ![wrong](https://user-images.githubusercontent.com/7680235/165492073-bb7b581d-026e-4137-aa15-f6277a69079d.jpg) ### What you expected to happen Global params can be replaced correctly at "COMPLEMENT_DATA" mode. ### How to reproduce Create a new process, set some global params default blank. try run at START_PROCESS and COMPLEMENT_DATA mode, see different in t_ds_process_instance. ### Anything else _No response_ ### Version 2.0.3 ### Are you willing to submit PR? - [ ] Yes I am willing to submit a PR! ### Code of Conduct - [X] I agree to follow this project's [Code of Conduct](https://www.apache.org/foundation/policies/conduct)
https://github.com/apache/dolphinscheduler/issues/9811
https://github.com/apache/dolphinscheduler/pull/9952
bc1c15b142ea02cdbd9533e890f8f0af897d1cec
d4aeee16e5f3f67e37a31fa606acf0b313189655
2022-04-27T09:55:39Z
java
2022-05-11T10:37:03Z
dolphinscheduler-master/src/main/java/org/apache/dolphinscheduler/server/master/runner/WorkflowExecuteThread.java
logger.nfo("task: {} has been forced success, put t nto complete task lst and stop retryng", task.getName()); removeTaskFromStandbyLst(task); completeTaskMap.put(task.getTaskCode(), task.getId()); taskInstanceMap.put(task.getId(), task); submtPostNode(Long.toStrng(task.getTaskCode())); contnue; } } //nt var f (task.sFrstRun()) { //get pre Set<Strng> preTask = dag.getPrevousNodes(Long.toStrng(task.getTaskCode())); getPreVarPool(task, preTask); } DependResult dependResult = getDependResultForTask(task); f (DependResult.SUCCESS == dependResult) { TaskInstance taskInstance = submtTaskExec(task); f (taskInstance == null) { ths.taskFaledSubmt = true; // Remove removeTaskFromStandbyLst(task); completeTaskMap.put(task.getTaskCode(), task.getId()); errorTaskMap.put(task.getTaskCode(), task.getId()); logger.error("process {}, task {}, code:{} submt task faled.", task.getProcessInstanceId(), task.getName(), task.getTaskCode()); } else { removeTaskFromStandbyLst(task); } } else f (DependResult.FAILED == dependResult) { // f the dependFaledTaskMap.put(task.getTaskCode(), task.getId());
closed
apache/dolphinscheduler
https://github.com/apache/dolphinscheduler
9,811
[Bug] [ProcessInstance] Replace default global params value failed at "COMPLEMENT_DATA" mode
### Search before asking - [X] I had searched in the [issues](https://github.com/apache/dolphinscheduler/issues?q=is%3Aissue) and found no similar issues. ### What happened <img width="822" alt="process_definition" src="https://user-images.githubusercontent.com/7680235/165489435-14b3f989-9c93-4ac6-be39-bc3561fc6622.png"> The process have several global params default blank. When I run the process at "START_PROCESS" mode, the global_params could be replaced correctly, but if I run the process at "COMPLEMENT_DATA" mode, the replace string all loss. In database, table t_ds_process_instance: Both two modes have the correct command_param, but only "START_PROCESS" have the correct replaced global_params, "COMPLEMENT_DATA" only have the same as process defined. "START_PROCESS": ![correct](https://user-images.githubusercontent.com/7680235/165491987-2757d3df-4635-42ce-9f94-4a302c4c6fdc.jpg) "COMPLEMENT_DATA": ![wrong](https://user-images.githubusercontent.com/7680235/165492073-bb7b581d-026e-4137-aa15-f6277a69079d.jpg) ### What you expected to happen Global params can be replaced correctly at "COMPLEMENT_DATA" mode. ### How to reproduce Create a new process, set some global params default blank. try run at START_PROCESS and COMPLEMENT_DATA mode, see different in t_ds_process_instance. ### Anything else _No response_ ### Version 2.0.3 ### Are you willing to submit PR? - [ ] Yes I am willing to submit a PR! ### Code of Conduct - [X] I agree to follow this project's [Code of Conduct](https://www.apache.org/foundation/policies/conduct)
https://github.com/apache/dolphinscheduler/issues/9811
https://github.com/apache/dolphinscheduler/pull/9952
bc1c15b142ea02cdbd9533e890f8f0af897d1cec
d4aeee16e5f3f67e37a31fa606acf0b313189655
2022-04-27T09:55:39Z
java
2022-05-11T10:37:03Z
dolphinscheduler-master/src/main/java/org/apache/dolphinscheduler/server/master/runner/WorkflowExecuteThread.java
removeTaskFromStandbyLst(task); logger.nfo("task {},d:{} depend result : {}", task.getName(), task.getId(), dependResult); } else f (DependResult.NON_EXEC == dependResult) { // for som removeTaskFromStandbyLst(task); logger.nfo("remove task {},d:{} , because depend result : {}", task.getName(), task.getId(), dependResult); } } } catch (Excepton e) { logger.error("submt standby task error", e); } } /** * get recovery task nstance lst * * @param taskIdArray task d array * @return recovery task nstance lst */ prvate Lst<TaskInstance> getRecoverTaskInstanceLst(Strng[] taskIdArray) { f (taskIdArray == null || taskIdArray.length == 0) { return new ArrayLst<>(); } Lst<Integer> taskIdLst = new ArrayLst<>(taskIdArray.length); for (Strng taskId : taskIdArray) { try { Integer d = Integer.valueOf(taskId); taskIdLst.add(d); } catch (Excepton e) { logger.error("get recovery task nstance faled ", e); }
closed
apache/dolphinscheduler
https://github.com/apache/dolphinscheduler
9,811
[Bug] [ProcessInstance] Replace default global params value failed at "COMPLEMENT_DATA" mode
### Search before asking - [X] I had searched in the [issues](https://github.com/apache/dolphinscheduler/issues?q=is%3Aissue) and found no similar issues. ### What happened <img width="822" alt="process_definition" src="https://user-images.githubusercontent.com/7680235/165489435-14b3f989-9c93-4ac6-be39-bc3561fc6622.png"> The process have several global params default blank. When I run the process at "START_PROCESS" mode, the global_params could be replaced correctly, but if I run the process at "COMPLEMENT_DATA" mode, the replace string all loss. In database, table t_ds_process_instance: Both two modes have the correct command_param, but only "START_PROCESS" have the correct replaced global_params, "COMPLEMENT_DATA" only have the same as process defined. "START_PROCESS": ![correct](https://user-images.githubusercontent.com/7680235/165491987-2757d3df-4635-42ce-9f94-4a302c4c6fdc.jpg) "COMPLEMENT_DATA": ![wrong](https://user-images.githubusercontent.com/7680235/165492073-bb7b581d-026e-4137-aa15-f6277a69079d.jpg) ### What you expected to happen Global params can be replaced correctly at "COMPLEMENT_DATA" mode. ### How to reproduce Create a new process, set some global params default blank. try run at START_PROCESS and COMPLEMENT_DATA mode, see different in t_ds_process_instance. ### Anything else _No response_ ### Version 2.0.3 ### Are you willing to submit PR? - [ ] Yes I am willing to submit a PR! ### Code of Conduct - [X] I agree to follow this project's [Code of Conduct](https://www.apache.org/foundation/policies/conduct)
https://github.com/apache/dolphinscheduler/issues/9811
https://github.com/apache/dolphinscheduler/pull/9952
bc1c15b142ea02cdbd9533e890f8f0af897d1cec
d4aeee16e5f3f67e37a31fa606acf0b313189655
2022-04-27T09:55:39Z
java
2022-05-11T10:37:03Z
dolphinscheduler-master/src/main/java/org/apache/dolphinscheduler/server/master/runner/WorkflowExecuteThread.java
} return processServce.fndTaskInstanceByIdLst(taskIdLst); } /** * get start task nstance lst * * @param cmdParam command param * @return task nstance lst */ prvate Lst<TaskInstance> getStartTaskInstanceLst(Strng cmdParam) { Lst<TaskInstance> nstanceLst = new ArrayLst<>(); Map<Strng, Strng> paramMap = JSONUtls.toMap(cmdParam); f (paramMap != null && paramMap.contansKey(CMD_PARAM_RECOVERY_START_NODE_STRING)) { Strng[] dLst = paramMap.get(CMD_PARAM_RECOVERY_START_NODE_STRING).splt(Constants.COMMA); nstanceLst = getRecoverTaskInstanceLst(dLst); } return nstanceLst; } /** * parse "StartNodeNameLst" from cmd param * * @param cmdParam command param * @return start node name lst */ prvate Lst<Strng> parseStartNodeName(Strng cmdParam) { Lst<Strng> startNodeNameLst = new ArrayLst<>(); Map<Strng, Strng> paramMap = JSONUtls.toMap(cmdParam); f (paramMap == null) { return startNodeNameLst; }
closed
apache/dolphinscheduler
https://github.com/apache/dolphinscheduler
9,811
[Bug] [ProcessInstance] Replace default global params value failed at "COMPLEMENT_DATA" mode
### Search before asking - [X] I had searched in the [issues](https://github.com/apache/dolphinscheduler/issues?q=is%3Aissue) and found no similar issues. ### What happened <img width="822" alt="process_definition" src="https://user-images.githubusercontent.com/7680235/165489435-14b3f989-9c93-4ac6-be39-bc3561fc6622.png"> The process have several global params default blank. When I run the process at "START_PROCESS" mode, the global_params could be replaced correctly, but if I run the process at "COMPLEMENT_DATA" mode, the replace string all loss. In database, table t_ds_process_instance: Both two modes have the correct command_param, but only "START_PROCESS" have the correct replaced global_params, "COMPLEMENT_DATA" only have the same as process defined. "START_PROCESS": ![correct](https://user-images.githubusercontent.com/7680235/165491987-2757d3df-4635-42ce-9f94-4a302c4c6fdc.jpg) "COMPLEMENT_DATA": ![wrong](https://user-images.githubusercontent.com/7680235/165492073-bb7b581d-026e-4137-aa15-f6277a69079d.jpg) ### What you expected to happen Global params can be replaced correctly at "COMPLEMENT_DATA" mode. ### How to reproduce Create a new process, set some global params default blank. try run at START_PROCESS and COMPLEMENT_DATA mode, see different in t_ds_process_instance. ### Anything else _No response_ ### Version 2.0.3 ### Are you willing to submit PR? - [ ] Yes I am willing to submit a PR! ### Code of Conduct - [X] I agree to follow this project's [Code of Conduct](https://www.apache.org/foundation/policies/conduct)
https://github.com/apache/dolphinscheduler/issues/9811
https://github.com/apache/dolphinscheduler/pull/9952
bc1c15b142ea02cdbd9533e890f8f0af897d1cec
d4aeee16e5f3f67e37a31fa606acf0b313189655
2022-04-27T09:55:39Z
java
2022-05-11T10:37:03Z
dolphinscheduler-master/src/main/java/org/apache/dolphinscheduler/server/master/runner/WorkflowExecuteThread.java
f (paramMap.contansKey(CMD_PARAM_START_NODES)) { startNodeNameLst = Arrays.asLst(paramMap.get(CMD_PARAM_START_NODES).splt(Constants.COMMA)); } return startNodeNameLst; } /** * generate start node code lst from parsng command param; * f "StartNodeIdLst" exsts n command param, return StartNodeIdLst * * @return recovery node code lst */ prvate Lst<Strng> getRecoveryNodeCodeLst(Lst<TaskInstance> recoverNodeLst) { Lst<Strng> recoveryNodeCodeLst = new ArrayLst<>(); f (CollectonUtls.sNotEmpty(recoverNodeLst)) { for (TaskInstance task : recoverNodeLst) { recoveryNodeCodeLst.add(Long.toStrng(task.getTaskCode())); } } return recoveryNodeCodeLst; } /** * generate flow dag * * @param totalTaskNodeLst total task node lst * @param startNodeNameLst start node name lst * @param recoveryNodeCodeLst recovery node code lst * @param depNodeType depend node type * @return ProcessDag process dag * @throws Excepton excepton */
closed
apache/dolphinscheduler
https://github.com/apache/dolphinscheduler
9,811
[Bug] [ProcessInstance] Replace default global params value failed at "COMPLEMENT_DATA" mode
### Search before asking - [X] I had searched in the [issues](https://github.com/apache/dolphinscheduler/issues?q=is%3Aissue) and found no similar issues. ### What happened <img width="822" alt="process_definition" src="https://user-images.githubusercontent.com/7680235/165489435-14b3f989-9c93-4ac6-be39-bc3561fc6622.png"> The process have several global params default blank. When I run the process at "START_PROCESS" mode, the global_params could be replaced correctly, but if I run the process at "COMPLEMENT_DATA" mode, the replace string all loss. In database, table t_ds_process_instance: Both two modes have the correct command_param, but only "START_PROCESS" have the correct replaced global_params, "COMPLEMENT_DATA" only have the same as process defined. "START_PROCESS": ![correct](https://user-images.githubusercontent.com/7680235/165491987-2757d3df-4635-42ce-9f94-4a302c4c6fdc.jpg) "COMPLEMENT_DATA": ![wrong](https://user-images.githubusercontent.com/7680235/165492073-bb7b581d-026e-4137-aa15-f6277a69079d.jpg) ### What you expected to happen Global params can be replaced correctly at "COMPLEMENT_DATA" mode. ### How to reproduce Create a new process, set some global params default blank. try run at START_PROCESS and COMPLEMENT_DATA mode, see different in t_ds_process_instance. ### Anything else _No response_ ### Version 2.0.3 ### Are you willing to submit PR? - [ ] Yes I am willing to submit a PR! ### Code of Conduct - [X] I agree to follow this project's [Code of Conduct](https://www.apache.org/foundation/policies/conduct)
https://github.com/apache/dolphinscheduler/issues/9811
https://github.com/apache/dolphinscheduler/pull/9952
bc1c15b142ea02cdbd9533e890f8f0af897d1cec
d4aeee16e5f3f67e37a31fa606acf0b313189655
2022-04-27T09:55:39Z
java
2022-05-11T10:37:03Z
dolphinscheduler-master/src/main/java/org/apache/dolphinscheduler/server/master/runner/WorkflowExecuteThread.java
publc ProcessDag generateFlowDag(Lst<TaskNode> totalTaskNodeLst, Lst<Strng> startNodeNameLst, Lst<Strng> recoveryNodeCodeLst, TaskDependType depNodeType) throws Excepton { return DagHelper.generateFlowDag(totalTaskNodeLst, startNodeNameLst, recoveryNodeCodeLst, depNodeType); } /** * check task queue */ prvate boolean checkTaskQueue() { AtomcBoolean result = new AtomcBoolean(false); taskInstanceMap.forEach((d, taskInstance) -> { f (taskInstance != null && taskInstance.getTaskGroupId() > 0) { result.set(true); } }); return result.get(); } /** * s new process nstance */ prvate boolean sNewProcessInstance() { f (ExecutonStatus.RUNNING_EXECUTION == processInstance.getState() && processInstance.getRunTmes() == 1) { return true; } else { return false; } } }
closed
apache/dolphinscheduler
https://github.com/apache/dolphinscheduler
9,811
[Bug] [ProcessInstance] Replace default global params value failed at "COMPLEMENT_DATA" mode
### Search before asking - [X] I had searched in the [issues](https://github.com/apache/dolphinscheduler/issues?q=is%3Aissue) and found no similar issues. ### What happened <img width="822" alt="process_definition" src="https://user-images.githubusercontent.com/7680235/165489435-14b3f989-9c93-4ac6-be39-bc3561fc6622.png"> The process have several global params default blank. When I run the process at "START_PROCESS" mode, the global_params could be replaced correctly, but if I run the process at "COMPLEMENT_DATA" mode, the replace string all loss. In database, table t_ds_process_instance: Both two modes have the correct command_param, but only "START_PROCESS" have the correct replaced global_params, "COMPLEMENT_DATA" only have the same as process defined. "START_PROCESS": ![correct](https://user-images.githubusercontent.com/7680235/165491987-2757d3df-4635-42ce-9f94-4a302c4c6fdc.jpg) "COMPLEMENT_DATA": ![wrong](https://user-images.githubusercontent.com/7680235/165492073-bb7b581d-026e-4137-aa15-f6277a69079d.jpg) ### What you expected to happen Global params can be replaced correctly at "COMPLEMENT_DATA" mode. ### How to reproduce Create a new process, set some global params default blank. try run at START_PROCESS and COMPLEMENT_DATA mode, see different in t_ds_process_instance. ### Anything else _No response_ ### Version 2.0.3 ### Are you willing to submit PR? - [ ] Yes I am willing to submit a PR! ### Code of Conduct - [X] I agree to follow this project's [Code of Conduct](https://www.apache.org/foundation/policies/conduct)
https://github.com/apache/dolphinscheduler/issues/9811
https://github.com/apache/dolphinscheduler/pull/9952
bc1c15b142ea02cdbd9533e890f8f0af897d1cec
d4aeee16e5f3f67e37a31fa606acf0b313189655
2022-04-27T09:55:39Z
java
2022-05-11T10:37:03Z
dolphinscheduler-service/src/main/java/org/apache/dolphinscheduler/service/process/ProcessServiceImpl.java
/* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with * this work for additional information regarding copyright ownership. * The ASF licenses this file to You under the Apache License, Version 2.0 * (the "License"); you may not use this file except in compliance with * the License. You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software
closed
apache/dolphinscheduler
https://github.com/apache/dolphinscheduler
9,811
[Bug] [ProcessInstance] Replace default global params value failed at "COMPLEMENT_DATA" mode
### Search before asking - [X] I had searched in the [issues](https://github.com/apache/dolphinscheduler/issues?q=is%3Aissue) and found no similar issues. ### What happened <img width="822" alt="process_definition" src="https://user-images.githubusercontent.com/7680235/165489435-14b3f989-9c93-4ac6-be39-bc3561fc6622.png"> The process have several global params default blank. When I run the process at "START_PROCESS" mode, the global_params could be replaced correctly, but if I run the process at "COMPLEMENT_DATA" mode, the replace string all loss. In database, table t_ds_process_instance: Both two modes have the correct command_param, but only "START_PROCESS" have the correct replaced global_params, "COMPLEMENT_DATA" only have the same as process defined. "START_PROCESS": ![correct](https://user-images.githubusercontent.com/7680235/165491987-2757d3df-4635-42ce-9f94-4a302c4c6fdc.jpg) "COMPLEMENT_DATA": ![wrong](https://user-images.githubusercontent.com/7680235/165492073-bb7b581d-026e-4137-aa15-f6277a69079d.jpg) ### What you expected to happen Global params can be replaced correctly at "COMPLEMENT_DATA" mode. ### How to reproduce Create a new process, set some global params default blank. try run at START_PROCESS and COMPLEMENT_DATA mode, see different in t_ds_process_instance. ### Anything else _No response_ ### Version 2.0.3 ### Are you willing to submit PR? - [ ] Yes I am willing to submit a PR! ### Code of Conduct - [X] I agree to follow this project's [Code of Conduct](https://www.apache.org/foundation/policies/conduct)
https://github.com/apache/dolphinscheduler/issues/9811
https://github.com/apache/dolphinscheduler/pull/9952
bc1c15b142ea02cdbd9533e890f8f0af897d1cec
d4aeee16e5f3f67e37a31fa606acf0b313189655
2022-04-27T09:55:39Z
java
2022-05-11T10:37:03Z
dolphinscheduler-service/src/main/java/org/apache/dolphinscheduler/service/process/ProcessServiceImpl.java
* distributed under the License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. */ package org.apache.dolphinscheduler.service.process; import static java.util.stream.Collectors.toSet; import static org.apache.dolphinscheduler.common.Constants.CMDPARAM_COMPLEMENT_DATA_END_DATE; import static org.apache.dolphinscheduler.common.Constants.CMDPARAM_COMPLEMENT_DATA_START_DATE; import static org.apache.dolphinscheduler.common.Constants.CMD_PARAM_EMPTY_SUB_PROCESS; import static org.apache.dolphinscheduler.common.Constants.CMD_PARAM_FATHER_PARAMS; import static org.apache.dolphinscheduler.common.Constants.CMD_PARAM_RECOVER_PROCESS_ID_STRING; import static org.apache.dolphinscheduler.common.Constants.CMD_PARAM_SUB_PROCESS; import static org.apache.dolphinscheduler.common.Constants.CMD_PARAM_SUB_PROCESS_DEFINE_CODE; import static org.apache.dolphinscheduler.common.Constants.CMD_PARAM_SUB_PROCESS_PARENT_INSTANCE_ID; import static org.apache.dolphinscheduler.common.Constants.LOCAL_PARAMS; import static org.apache.dolphinscheduler.plugin.task.api.enums.DataType.VARCHAR; import static org.apache.dolphinscheduler.plugin.task.api.enums.Direct.IN; import static org.apache.dolphinscheduler.plugin.task.api.utils.DataQualityConstants.TASK_INSTANCE_ID; import org.apache.dolphinscheduler.common.Constants; import org.apache.dolphinscheduler.common.enums.AuthorizationType; import org.apache.dolphinscheduler.common.enums.CommandType; import org.apache.dolphinscheduler.common.enums.FailureStrategy; import org.apache.dolphinscheduler.common.enums.Flag; import org.apache.dolphinscheduler.common.enums.ReleaseState; import org.apache.dolphinscheduler.common.enums.TaskDependType; import org.apache.dolphinscheduler.common.enums.TaskGroupQueueStatus; import org.apache.dolphinscheduler.common.enums.TimeoutFlag; import org.apache.dolphinscheduler.common.enums.WarningType; import org.apache.dolphinscheduler.common.graph.DAG;
closed
apache/dolphinscheduler
https://github.com/apache/dolphinscheduler
9,811
[Bug] [ProcessInstance] Replace default global params value failed at "COMPLEMENT_DATA" mode
### Search before asking - [X] I had searched in the [issues](https://github.com/apache/dolphinscheduler/issues?q=is%3Aissue) and found no similar issues. ### What happened <img width="822" alt="process_definition" src="https://user-images.githubusercontent.com/7680235/165489435-14b3f989-9c93-4ac6-be39-bc3561fc6622.png"> The process have several global params default blank. When I run the process at "START_PROCESS" mode, the global_params could be replaced correctly, but if I run the process at "COMPLEMENT_DATA" mode, the replace string all loss. In database, table t_ds_process_instance: Both two modes have the correct command_param, but only "START_PROCESS" have the correct replaced global_params, "COMPLEMENT_DATA" only have the same as process defined. "START_PROCESS": ![correct](https://user-images.githubusercontent.com/7680235/165491987-2757d3df-4635-42ce-9f94-4a302c4c6fdc.jpg) "COMPLEMENT_DATA": ![wrong](https://user-images.githubusercontent.com/7680235/165492073-bb7b581d-026e-4137-aa15-f6277a69079d.jpg) ### What you expected to happen Global params can be replaced correctly at "COMPLEMENT_DATA" mode. ### How to reproduce Create a new process, set some global params default blank. try run at START_PROCESS and COMPLEMENT_DATA mode, see different in t_ds_process_instance. ### Anything else _No response_ ### Version 2.0.3 ### Are you willing to submit PR? - [ ] Yes I am willing to submit a PR! ### Code of Conduct - [X] I agree to follow this project's [Code of Conduct](https://www.apache.org/foundation/policies/conduct)
https://github.com/apache/dolphinscheduler/issues/9811
https://github.com/apache/dolphinscheduler/pull/9952
bc1c15b142ea02cdbd9533e890f8f0af897d1cec
d4aeee16e5f3f67e37a31fa606acf0b313189655
2022-04-27T09:55:39Z
java
2022-05-11T10:37:03Z
dolphinscheduler-service/src/main/java/org/apache/dolphinscheduler/service/process/ProcessServiceImpl.java
import org.apache.dolphinscheduler.common.model.TaskNode; import org.apache.dolphinscheduler.common.model.TaskNodeRelation; import org.apache.dolphinscheduler.common.process.ProcessDag; import org.apache.dolphinscheduler.common.utils.CodeGenerateUtils; import org.apache.dolphinscheduler.common.utils.CodeGenerateUtils.CodeGenerateException; import org.apache.dolphinscheduler.common.utils.DateUtils; import org.apache.dolphinscheduler.common.utils.JSONUtils; import org.apache.dolphinscheduler.common.utils.ParameterUtils; import org.apache.dolphinscheduler.dao.entity.Command; import org.apache.dolphinscheduler.dao.entity.DagData; import org.apache.dolphinscheduler.dao.entity.DataSource; import org.apache.dolphinscheduler.dao.entity.DependentProcessDefinition; import org.apache.dolphinscheduler.dao.entity.DqComparisonType; import org.apache.dolphinscheduler.dao.entity.DqExecuteResult; import org.apache.dolphinscheduler.dao.entity.DqRule; import org.apache.dolphinscheduler.dao.entity.DqRuleExecuteSql; import org.apache.dolphinscheduler.dao.entity.DqRuleInputEntry; import org.apache.dolphinscheduler.dao.entity.DqTaskStatisticsValue; import org.apache.dolphinscheduler.dao.entity.Environment; import org.apache.dolphinscheduler.dao.entity.ErrorCommand; import org.apache.dolphinscheduler.dao.entity.ProcessDefinition; import org.apache.dolphinscheduler.dao.entity.ProcessDefinitionLog; import org.apache.dolphinscheduler.dao.entity.ProcessInstance; import org.apache.dolphinscheduler.dao.entity.ProcessInstanceMap; import org.apache.dolphinscheduler.dao.entity.ProcessTaskRelation; import org.apache.dolphinscheduler.dao.entity.ProcessTaskRelationLog; import org.apache.dolphinscheduler.dao.entity.Project; import org.apache.dolphinscheduler.dao.entity.ProjectUser; import org.apache.dolphinscheduler.dao.entity.Resource; import org.apache.dolphinscheduler.dao.entity.Schedule;
closed
apache/dolphinscheduler
https://github.com/apache/dolphinscheduler
9,811
[Bug] [ProcessInstance] Replace default global params value failed at "COMPLEMENT_DATA" mode
### Search before asking - [X] I had searched in the [issues](https://github.com/apache/dolphinscheduler/issues?q=is%3Aissue) and found no similar issues. ### What happened <img width="822" alt="process_definition" src="https://user-images.githubusercontent.com/7680235/165489435-14b3f989-9c93-4ac6-be39-bc3561fc6622.png"> The process have several global params default blank. When I run the process at "START_PROCESS" mode, the global_params could be replaced correctly, but if I run the process at "COMPLEMENT_DATA" mode, the replace string all loss. In database, table t_ds_process_instance: Both two modes have the correct command_param, but only "START_PROCESS" have the correct replaced global_params, "COMPLEMENT_DATA" only have the same as process defined. "START_PROCESS": ![correct](https://user-images.githubusercontent.com/7680235/165491987-2757d3df-4635-42ce-9f94-4a302c4c6fdc.jpg) "COMPLEMENT_DATA": ![wrong](https://user-images.githubusercontent.com/7680235/165492073-bb7b581d-026e-4137-aa15-f6277a69079d.jpg) ### What you expected to happen Global params can be replaced correctly at "COMPLEMENT_DATA" mode. ### How to reproduce Create a new process, set some global params default blank. try run at START_PROCESS and COMPLEMENT_DATA mode, see different in t_ds_process_instance. ### Anything else _No response_ ### Version 2.0.3 ### Are you willing to submit PR? - [ ] Yes I am willing to submit a PR! ### Code of Conduct - [X] I agree to follow this project's [Code of Conduct](https://www.apache.org/foundation/policies/conduct)
https://github.com/apache/dolphinscheduler/issues/9811
https://github.com/apache/dolphinscheduler/pull/9952
bc1c15b142ea02cdbd9533e890f8f0af897d1cec
d4aeee16e5f3f67e37a31fa606acf0b313189655
2022-04-27T09:55:39Z
java
2022-05-11T10:37:03Z
dolphinscheduler-service/src/main/java/org/apache/dolphinscheduler/service/process/ProcessServiceImpl.java
import org.apache.dolphinscheduler.dao.entity.TaskDefinition; import org.apache.dolphinscheduler.dao.entity.TaskDefinitionLog; import org.apache.dolphinscheduler.dao.entity.TaskGroup; import org.apache.dolphinscheduler.dao.entity.TaskGroupQueue; import org.apache.dolphinscheduler.dao.entity.TaskInstance; import org.apache.dolphinscheduler.dao.entity.Tenant; import org.apache.dolphinscheduler.dao.entity.UdfFunc; import org.apache.dolphinscheduler.dao.entity.User; import org.apache.dolphinscheduler.dao.mapper.CommandMapper; import org.apache.dolphinscheduler.dao.mapper.DataSourceMapper; import org.apache.dolphinscheduler.dao.mapper.DqComparisonTypeMapper; import org.apache.dolphinscheduler.dao.mapper.DqExecuteResultMapper; import org.apache.dolphinscheduler.dao.mapper.DqRuleExecuteSqlMapper; import org.apache.dolphinscheduler.dao.mapper.DqRuleInputEntryMapper; import org.apache.dolphinscheduler.dao.mapper.DqRuleMapper; import org.apache.dolphinscheduler.dao.mapper.DqTaskStatisticsValueMapper; import org.apache.dolphinscheduler.dao.mapper.EnvironmentMapper; import org.apache.dolphinscheduler.dao.mapper.ErrorCommandMapper; import org.apache.dolphinscheduler.dao.mapper.ProcessDefinitionLogMapper; import org.apache.dolphinscheduler.dao.mapper.ProcessDefinitionMapper; import org.apache.dolphinscheduler.dao.mapper.ProcessInstanceMapMapper; import org.apache.dolphinscheduler.dao.mapper.ProcessInstanceMapper; import org.apache.dolphinscheduler.dao.mapper.ProcessTaskRelationLogMapper; import org.apache.dolphinscheduler.dao.mapper.ProcessTaskRelationMapper; import org.apache.dolphinscheduler.dao.mapper.ProjectMapper; import org.apache.dolphinscheduler.dao.mapper.ResourceMapper; import org.apache.dolphinscheduler.dao.mapper.ResourceUserMapper; import org.apache.dolphinscheduler.dao.mapper.ScheduleMapper; import org.apache.dolphinscheduler.dao.mapper.TaskDefinitionLogMapper; import org.apache.dolphinscheduler.dao.mapper.TaskDefinitionMapper;
closed
apache/dolphinscheduler
https://github.com/apache/dolphinscheduler
9,811
[Bug] [ProcessInstance] Replace default global params value failed at "COMPLEMENT_DATA" mode
### Search before asking - [X] I had searched in the [issues](https://github.com/apache/dolphinscheduler/issues?q=is%3Aissue) and found no similar issues. ### What happened <img width="822" alt="process_definition" src="https://user-images.githubusercontent.com/7680235/165489435-14b3f989-9c93-4ac6-be39-bc3561fc6622.png"> The process have several global params default blank. When I run the process at "START_PROCESS" mode, the global_params could be replaced correctly, but if I run the process at "COMPLEMENT_DATA" mode, the replace string all loss. In database, table t_ds_process_instance: Both two modes have the correct command_param, but only "START_PROCESS" have the correct replaced global_params, "COMPLEMENT_DATA" only have the same as process defined. "START_PROCESS": ![correct](https://user-images.githubusercontent.com/7680235/165491987-2757d3df-4635-42ce-9f94-4a302c4c6fdc.jpg) "COMPLEMENT_DATA": ![wrong](https://user-images.githubusercontent.com/7680235/165492073-bb7b581d-026e-4137-aa15-f6277a69079d.jpg) ### What you expected to happen Global params can be replaced correctly at "COMPLEMENT_DATA" mode. ### How to reproduce Create a new process, set some global params default blank. try run at START_PROCESS and COMPLEMENT_DATA mode, see different in t_ds_process_instance. ### Anything else _No response_ ### Version 2.0.3 ### Are you willing to submit PR? - [ ] Yes I am willing to submit a PR! ### Code of Conduct - [X] I agree to follow this project's [Code of Conduct](https://www.apache.org/foundation/policies/conduct)
https://github.com/apache/dolphinscheduler/issues/9811
https://github.com/apache/dolphinscheduler/pull/9952
bc1c15b142ea02cdbd9533e890f8f0af897d1cec
d4aeee16e5f3f67e37a31fa606acf0b313189655
2022-04-27T09:55:39Z
java
2022-05-11T10:37:03Z
dolphinscheduler-service/src/main/java/org/apache/dolphinscheduler/service/process/ProcessServiceImpl.java
import org.apache.dolphinscheduler.dao.mapper.TaskGroupMapper; import org.apache.dolphinscheduler.dao.mapper.TaskGroupQueueMapper; import org.apache.dolphinscheduler.dao.mapper.TaskInstanceMapper; import org.apache.dolphinscheduler.dao.mapper.TenantMapper; import org.apache.dolphinscheduler.dao.mapper.UdfFuncMapper; import org.apache.dolphinscheduler.dao.mapper.UserMapper; import org.apache.dolphinscheduler.dao.mapper.WorkFlowLineageMapper; import org.apache.dolphinscheduler.dao.utils.DagHelper; import org.apache.dolphinscheduler.dao.utils.DqRuleUtils; import org.apache.dolphinscheduler.plugin.task.api.enums.Direct; import org.apache.dolphinscheduler.plugin.task.api.enums.ExecutionStatus; import org.apache.dolphinscheduler.plugin.task.api.enums.dp.DqTaskState; import org.apache.dolphinscheduler.plugin.task.api.model.DateInterval; import org.apache.dolphinscheduler.plugin.task.api.model.Property; import org.apache.dolphinscheduler.plugin.task.api.model.ResourceInfo; import org.apache.dolphinscheduler.plugin.task.api.parameters.AbstractParameters; import org.apache.dolphinscheduler.plugin.task.api.parameters.ParametersNode; import org.apache.dolphinscheduler.plugin.task.api.parameters.SubProcessParameters; import org.apache.dolphinscheduler.plugin.task.api.parameters.TaskTimeoutParameter; import org.apache.dolphinscheduler.remote.command.StateEventChangeCommand; import org.apache.dolphinscheduler.remote.command.TaskEventChangeCommand; import org.apache.dolphinscheduler.remote.processor.StateEventCallbackService; import org.apache.dolphinscheduler.remote.utils.Host; import org.apache.dolphinscheduler.service.bean.SpringApplicationContext; import org.apache.dolphinscheduler.service.exceptions.ServiceException; import org.apache.dolphinscheduler.service.log.LogClientService; import org.apache.dolphinscheduler.service.quartz.cron.CronUtils; import org.apache.dolphinscheduler.service.task.TaskPluginManager; import org.apache.dolphinscheduler.spi.enums.ResourceType; import org.apache.commons.collections.CollectionUtils;
closed
apache/dolphinscheduler
https://github.com/apache/dolphinscheduler
9,811
[Bug] [ProcessInstance] Replace default global params value failed at "COMPLEMENT_DATA" mode
### Search before asking - [X] I had searched in the [issues](https://github.com/apache/dolphinscheduler/issues?q=is%3Aissue) and found no similar issues. ### What happened <img width="822" alt="process_definition" src="https://user-images.githubusercontent.com/7680235/165489435-14b3f989-9c93-4ac6-be39-bc3561fc6622.png"> The process have several global params default blank. When I run the process at "START_PROCESS" mode, the global_params could be replaced correctly, but if I run the process at "COMPLEMENT_DATA" mode, the replace string all loss. In database, table t_ds_process_instance: Both two modes have the correct command_param, but only "START_PROCESS" have the correct replaced global_params, "COMPLEMENT_DATA" only have the same as process defined. "START_PROCESS": ![correct](https://user-images.githubusercontent.com/7680235/165491987-2757d3df-4635-42ce-9f94-4a302c4c6fdc.jpg) "COMPLEMENT_DATA": ![wrong](https://user-images.githubusercontent.com/7680235/165492073-bb7b581d-026e-4137-aa15-f6277a69079d.jpg) ### What you expected to happen Global params can be replaced correctly at "COMPLEMENT_DATA" mode. ### How to reproduce Create a new process, set some global params default blank. try run at START_PROCESS and COMPLEMENT_DATA mode, see different in t_ds_process_instance. ### Anything else _No response_ ### Version 2.0.3 ### Are you willing to submit PR? - [ ] Yes I am willing to submit a PR! ### Code of Conduct - [X] I agree to follow this project's [Code of Conduct](https://www.apache.org/foundation/policies/conduct)
https://github.com/apache/dolphinscheduler/issues/9811
https://github.com/apache/dolphinscheduler/pull/9952
bc1c15b142ea02cdbd9533e890f8f0af897d1cec
d4aeee16e5f3f67e37a31fa606acf0b313189655
2022-04-27T09:55:39Z
java
2022-05-11T10:37:03Z
dolphinscheduler-service/src/main/java/org/apache/dolphinscheduler/service/process/ProcessServiceImpl.java
import org.apache.commons.lang.StringUtils; import org.apache.commons.lang.math.NumberUtils; import java.util.ArrayList; import java.util.Arrays; import java.util.Date; import java.util.EnumMap; import java.util.HashMap; import java.util.HashSet; import java.util.List; import java.util.Map; import java.util.Map.Entry; import java.util.Objects; import java.util.Set; import java.util.stream.Collectors; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Component; import org.springframework.transaction.annotation.Transactional; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.fasterxml.jackson.core.type.TypeReference; import com.fasterxml.jackson.databind.node.ObjectNode; import com.google.common.collect.Lists; /** * process relative dao that some mappers in this. */ @Component public class ProcessServiceImpl implements ProcessService { private final Logger logger = LoggerFactory.getLogger(getClass()); private final int[] stateArray = new int[] {ExecutionStatus.SUBMITTED_SUCCESS.ordinal(),
closed
apache/dolphinscheduler
https://github.com/apache/dolphinscheduler
9,811
[Bug] [ProcessInstance] Replace default global params value failed at "COMPLEMENT_DATA" mode
### Search before asking - [X] I had searched in the [issues](https://github.com/apache/dolphinscheduler/issues?q=is%3Aissue) and found no similar issues. ### What happened <img width="822" alt="process_definition" src="https://user-images.githubusercontent.com/7680235/165489435-14b3f989-9c93-4ac6-be39-bc3561fc6622.png"> The process have several global params default blank. When I run the process at "START_PROCESS" mode, the global_params could be replaced correctly, but if I run the process at "COMPLEMENT_DATA" mode, the replace string all loss. In database, table t_ds_process_instance: Both two modes have the correct command_param, but only "START_PROCESS" have the correct replaced global_params, "COMPLEMENT_DATA" only have the same as process defined. "START_PROCESS": ![correct](https://user-images.githubusercontent.com/7680235/165491987-2757d3df-4635-42ce-9f94-4a302c4c6fdc.jpg) "COMPLEMENT_DATA": ![wrong](https://user-images.githubusercontent.com/7680235/165492073-bb7b581d-026e-4137-aa15-f6277a69079d.jpg) ### What you expected to happen Global params can be replaced correctly at "COMPLEMENT_DATA" mode. ### How to reproduce Create a new process, set some global params default blank. try run at START_PROCESS and COMPLEMENT_DATA mode, see different in t_ds_process_instance. ### Anything else _No response_ ### Version 2.0.3 ### Are you willing to submit PR? - [ ] Yes I am willing to submit a PR! ### Code of Conduct - [X] I agree to follow this project's [Code of Conduct](https://www.apache.org/foundation/policies/conduct)
https://github.com/apache/dolphinscheduler/issues/9811
https://github.com/apache/dolphinscheduler/pull/9952
bc1c15b142ea02cdbd9533e890f8f0af897d1cec
d4aeee16e5f3f67e37a31fa606acf0b313189655
2022-04-27T09:55:39Z
java
2022-05-11T10:37:03Z
dolphinscheduler-service/src/main/java/org/apache/dolphinscheduler/service/process/ProcessServiceImpl.java
ExecutionStatus.DISPATCH.ordinal(), ExecutionStatus.RUNNING_EXECUTION.ordinal(), ExecutionStatus.DELAY_EXECUTION.ordinal(), ExecutionStatus.READY_PAUSE.ordinal(), ExecutionStatus.READY_STOP.ordinal()}; @Autowired private UserMapper userMapper; @Autowired private ProcessDefinitionMapper processDefineMapper; @Autowired private ProcessDefinitionLogMapper processDefineLogMapper; @Autowired private ProcessInstanceMapper processInstanceMapper; @Autowired private DataSourceMapper dataSourceMapper; @Autowired private ProcessInstanceMapMapper processInstanceMapMapper; @Autowired private TaskInstanceMapper taskInstanceMapper; @Autowired private CommandMapper commandMapper; @Autowired private ScheduleMapper scheduleMapper; @Autowired private UdfFuncMapper udfFuncMapper; @Autowired private ResourceMapper resourceMapper; @Autowired private ResourceUserMapper resourceUserMapper; @Autowired
closed
apache/dolphinscheduler
https://github.com/apache/dolphinscheduler
9,811
[Bug] [ProcessInstance] Replace default global params value failed at "COMPLEMENT_DATA" mode
### Search before asking - [X] I had searched in the [issues](https://github.com/apache/dolphinscheduler/issues?q=is%3Aissue) and found no similar issues. ### What happened <img width="822" alt="process_definition" src="https://user-images.githubusercontent.com/7680235/165489435-14b3f989-9c93-4ac6-be39-bc3561fc6622.png"> The process have several global params default blank. When I run the process at "START_PROCESS" mode, the global_params could be replaced correctly, but if I run the process at "COMPLEMENT_DATA" mode, the replace string all loss. In database, table t_ds_process_instance: Both two modes have the correct command_param, but only "START_PROCESS" have the correct replaced global_params, "COMPLEMENT_DATA" only have the same as process defined. "START_PROCESS": ![correct](https://user-images.githubusercontent.com/7680235/165491987-2757d3df-4635-42ce-9f94-4a302c4c6fdc.jpg) "COMPLEMENT_DATA": ![wrong](https://user-images.githubusercontent.com/7680235/165492073-bb7b581d-026e-4137-aa15-f6277a69079d.jpg) ### What you expected to happen Global params can be replaced correctly at "COMPLEMENT_DATA" mode. ### How to reproduce Create a new process, set some global params default blank. try run at START_PROCESS and COMPLEMENT_DATA mode, see different in t_ds_process_instance. ### Anything else _No response_ ### Version 2.0.3 ### Are you willing to submit PR? - [ ] Yes I am willing to submit a PR! ### Code of Conduct - [X] I agree to follow this project's [Code of Conduct](https://www.apache.org/foundation/policies/conduct)
https://github.com/apache/dolphinscheduler/issues/9811
https://github.com/apache/dolphinscheduler/pull/9952
bc1c15b142ea02cdbd9533e890f8f0af897d1cec
d4aeee16e5f3f67e37a31fa606acf0b313189655
2022-04-27T09:55:39Z
java
2022-05-11T10:37:03Z
dolphinscheduler-service/src/main/java/org/apache/dolphinscheduler/service/process/ProcessServiceImpl.java
private ErrorCommandMapper errorCommandMapper; @Autowired private TenantMapper tenantMapper; @Autowired private ProjectMapper projectMapper; @Autowired private DqExecuteResultMapper dqExecuteResultMapper; @Autowired private DqRuleMapper dqRuleMapper; @Autowired private DqRuleInputEntryMapper dqRuleInputEntryMapper; @Autowired private DqRuleExecuteSqlMapper dqRuleExecuteSqlMapper; @Autowired private DqComparisonTypeMapper dqComparisonTypeMapper; @Autowired private DqTaskStatisticsValueMapper dqTaskStatisticsValueMapper; @Autowired private TaskDefinitionMapper taskDefinitionMapper; @Autowired private TaskDefinitionLogMapper taskDefinitionLogMapper; @Autowired private ProcessTaskRelationMapper processTaskRelationMapper; @Autowired private ProcessTaskRelationLogMapper processTaskRelationLogMapper; @Autowired StateEventCallbackService stateEventCallbackService; @Autowired private EnvironmentMapper environmentMapper; @Autowired
closed
apache/dolphinscheduler
https://github.com/apache/dolphinscheduler
9,811
[Bug] [ProcessInstance] Replace default global params value failed at "COMPLEMENT_DATA" mode
### Search before asking - [X] I had searched in the [issues](https://github.com/apache/dolphinscheduler/issues?q=is%3Aissue) and found no similar issues. ### What happened <img width="822" alt="process_definition" src="https://user-images.githubusercontent.com/7680235/165489435-14b3f989-9c93-4ac6-be39-bc3561fc6622.png"> The process have several global params default blank. When I run the process at "START_PROCESS" mode, the global_params could be replaced correctly, but if I run the process at "COMPLEMENT_DATA" mode, the replace string all loss. In database, table t_ds_process_instance: Both two modes have the correct command_param, but only "START_PROCESS" have the correct replaced global_params, "COMPLEMENT_DATA" only have the same as process defined. "START_PROCESS": ![correct](https://user-images.githubusercontent.com/7680235/165491987-2757d3df-4635-42ce-9f94-4a302c4c6fdc.jpg) "COMPLEMENT_DATA": ![wrong](https://user-images.githubusercontent.com/7680235/165492073-bb7b581d-026e-4137-aa15-f6277a69079d.jpg) ### What you expected to happen Global params can be replaced correctly at "COMPLEMENT_DATA" mode. ### How to reproduce Create a new process, set some global params default blank. try run at START_PROCESS and COMPLEMENT_DATA mode, see different in t_ds_process_instance. ### Anything else _No response_ ### Version 2.0.3 ### Are you willing to submit PR? - [ ] Yes I am willing to submit a PR! ### Code of Conduct - [X] I agree to follow this project's [Code of Conduct](https://www.apache.org/foundation/policies/conduct)
https://github.com/apache/dolphinscheduler/issues/9811
https://github.com/apache/dolphinscheduler/pull/9952
bc1c15b142ea02cdbd9533e890f8f0af897d1cec
d4aeee16e5f3f67e37a31fa606acf0b313189655
2022-04-27T09:55:39Z
java
2022-05-11T10:37:03Z
dolphinscheduler-service/src/main/java/org/apache/dolphinscheduler/service/process/ProcessServiceImpl.java
private TaskGroupQueueMapper taskGroupQueueMapper; @Autowired private TaskGroupMapper taskGroupMapper; @Autowired private WorkFlowLineageMapper workFlowLineageMapper; @Autowired private TaskPluginManager taskPluginManager; /** * handle Command (construct ProcessInstance from Command) , wrapped in transaction * * @param logger logger * @param host host * @param command found command * @return process instance */ @Override @Transactional public ProcessInstance handleCommand(Logger logger, String host, Command command) { ProcessInstance processInstance = constructProcessInstance(command, host); if (processInstance == null) { logger.error("scan command, command parameter is error: {}", command); moveToErrorCommand(command, "process instance is null"); return null; } processInstance.setCommandType(command.getCommandType()); processInstance.addHistoryCmd(command.getCommandType()); ProcessDefinition processDefinition = this.findProcessDefinition(processInstance.getProcessDefinitionCode(), processInstance.getProcessDefinitionVersion()); if (processDefinition.getExecutionType().typeIsSerial()) {
closed
apache/dolphinscheduler
https://github.com/apache/dolphinscheduler
9,811
[Bug] [ProcessInstance] Replace default global params value failed at "COMPLEMENT_DATA" mode
### Search before asking - [X] I had searched in the [issues](https://github.com/apache/dolphinscheduler/issues?q=is%3Aissue) and found no similar issues. ### What happened <img width="822" alt="process_definition" src="https://user-images.githubusercontent.com/7680235/165489435-14b3f989-9c93-4ac6-be39-bc3561fc6622.png"> The process have several global params default blank. When I run the process at "START_PROCESS" mode, the global_params could be replaced correctly, but if I run the process at "COMPLEMENT_DATA" mode, the replace string all loss. In database, table t_ds_process_instance: Both two modes have the correct command_param, but only "START_PROCESS" have the correct replaced global_params, "COMPLEMENT_DATA" only have the same as process defined. "START_PROCESS": ![correct](https://user-images.githubusercontent.com/7680235/165491987-2757d3df-4635-42ce-9f94-4a302c4c6fdc.jpg) "COMPLEMENT_DATA": ![wrong](https://user-images.githubusercontent.com/7680235/165492073-bb7b581d-026e-4137-aa15-f6277a69079d.jpg) ### What you expected to happen Global params can be replaced correctly at "COMPLEMENT_DATA" mode. ### How to reproduce Create a new process, set some global params default blank. try run at START_PROCESS and COMPLEMENT_DATA mode, see different in t_ds_process_instance. ### Anything else _No response_ ### Version 2.0.3 ### Are you willing to submit PR? - [ ] Yes I am willing to submit a PR! ### Code of Conduct - [X] I agree to follow this project's [Code of Conduct](https://www.apache.org/foundation/policies/conduct)
https://github.com/apache/dolphinscheduler/issues/9811
https://github.com/apache/dolphinscheduler/pull/9952
bc1c15b142ea02cdbd9533e890f8f0af897d1cec
d4aeee16e5f3f67e37a31fa606acf0b313189655
2022-04-27T09:55:39Z
java
2022-05-11T10:37:03Z
dolphinscheduler-service/src/main/java/org/apache/dolphinscheduler/service/process/ProcessServiceImpl.java
saveSerialProcess(processInstance, processDefinition); if (processInstance.getState() != ExecutionStatus.SUBMITTED_SUCCESS) { setSubProcessParam(processInstance); deleteCommandWithCheck(command.getId()); return null; } } else { saveProcessInstance(processInstance); } setSubProcessParam(processInstance); deleteCommandWithCheck(command.getId()); return processInstance; } protected void saveSerialProcess(ProcessInstance processInstance, ProcessDefinition processDefinition) { processInstance.setState(ExecutionStatus.SERIAL_WAIT); saveProcessInstance(processInstance); if (processDefinition.getExecutionType().typeIsSerialWait()) { while (true) { List<ProcessInstance> runningProcessInstances = this.processInstanceMapper.queryByProcessDefineCodeAndProcessDefinitionVersionAndStatusAndNextId(processInstance.getProcessDefinitionCode(), processInstance.getProcessDefinitionVersion(), Constants.RUNNING_PROCESS_STATE, processInstance.getId()); if (CollectionUtils.isEmpty(runningProcessInstances)) { processInstance.setState(ExecutionStatus.SUBMITTED_SUCCESS); saveProcessInstance(processInstance); return; } ProcessInstance runningProcess = runningProcessInstances.get(0); if (this.processInstanceMapper.updateNextProcessIdById(processInstance.getId(), runningProcess.getId())) { return;
closed
apache/dolphinscheduler
https://github.com/apache/dolphinscheduler
9,811
[Bug] [ProcessInstance] Replace default global params value failed at "COMPLEMENT_DATA" mode
### Search before asking - [X] I had searched in the [issues](https://github.com/apache/dolphinscheduler/issues?q=is%3Aissue) and found no similar issues. ### What happened <img width="822" alt="process_definition" src="https://user-images.githubusercontent.com/7680235/165489435-14b3f989-9c93-4ac6-be39-bc3561fc6622.png"> The process have several global params default blank. When I run the process at "START_PROCESS" mode, the global_params could be replaced correctly, but if I run the process at "COMPLEMENT_DATA" mode, the replace string all loss. In database, table t_ds_process_instance: Both two modes have the correct command_param, but only "START_PROCESS" have the correct replaced global_params, "COMPLEMENT_DATA" only have the same as process defined. "START_PROCESS": ![correct](https://user-images.githubusercontent.com/7680235/165491987-2757d3df-4635-42ce-9f94-4a302c4c6fdc.jpg) "COMPLEMENT_DATA": ![wrong](https://user-images.githubusercontent.com/7680235/165492073-bb7b581d-026e-4137-aa15-f6277a69079d.jpg) ### What you expected to happen Global params can be replaced correctly at "COMPLEMENT_DATA" mode. ### How to reproduce Create a new process, set some global params default blank. try run at START_PROCESS and COMPLEMENT_DATA mode, see different in t_ds_process_instance. ### Anything else _No response_ ### Version 2.0.3 ### Are you willing to submit PR? - [ ] Yes I am willing to submit a PR! ### Code of Conduct - [X] I agree to follow this project's [Code of Conduct](https://www.apache.org/foundation/policies/conduct)
https://github.com/apache/dolphinscheduler/issues/9811
https://github.com/apache/dolphinscheduler/pull/9952
bc1c15b142ea02cdbd9533e890f8f0af897d1cec
d4aeee16e5f3f67e37a31fa606acf0b313189655
2022-04-27T09:55:39Z
java
2022-05-11T10:37:03Z
dolphinscheduler-service/src/main/java/org/apache/dolphinscheduler/service/process/ProcessServiceImpl.java
} } } else if (processDefinition.getExecutionType().typeIsSerialDiscard()) { List<ProcessInstance> runningProcessInstances = this.processInstanceMapper.queryByProcessDefineCodeAndProcessDefinitionVersionAndStatusAndNextId(processInstance.getProcessDefinitionCode(), processInstance.getProcessDefinitionVersion(), Constants.RUNNING_PROCESS_STATE, processInstance.getId()); if (CollectionUtils.isEmpty(runningProcessInstances)) { processInstance.setState(ExecutionStatus.STOP); saveProcessInstance(processInstance); } } else if (processDefinition.getExecutionType().typeIsSerialPriority()) { List<ProcessInstance> runningProcessInstances = this.processInstanceMapper.queryByProcessDefineCodeAndProcessDefinitionVersionAndStatusAndNextId(processInstance.getProcessDefinitionCode(), processInstance.getProcessDefinitionVersion(), Constants.RUNNING_PROCESS_STATE, processInstance.getId()); if (CollectionUtils.isNotEmpty(runningProcessInstances)) { for (ProcessInstance info : runningProcessInstances) { info.setCommandType(CommandType.STOP); info.addHistoryCmd(CommandType.STOP); info.setState(ExecutionStatus.READY_STOP); int update = updateProcessInstance(info); if (update > 0) { String host = info.getHost(); String address = host.split(":")[0]; int port = Integer.parseInt(host.split(":")[1]); StateEventChangeCommand stateEventChangeCommand = new StateEventChangeCommand( info.getId(), 0, info.getState(), info.getId(), 0 ); try { stateEventCallbackService.sendResult(address, port, stateEventChangeCommand.convert2Command()); } catch (Exception e) { logger.error("sendResultError");
closed
apache/dolphinscheduler
https://github.com/apache/dolphinscheduler
9,811
[Bug] [ProcessInstance] Replace default global params value failed at "COMPLEMENT_DATA" mode
### Search before asking - [X] I had searched in the [issues](https://github.com/apache/dolphinscheduler/issues?q=is%3Aissue) and found no similar issues. ### What happened <img width="822" alt="process_definition" src="https://user-images.githubusercontent.com/7680235/165489435-14b3f989-9c93-4ac6-be39-bc3561fc6622.png"> The process have several global params default blank. When I run the process at "START_PROCESS" mode, the global_params could be replaced correctly, but if I run the process at "COMPLEMENT_DATA" mode, the replace string all loss. In database, table t_ds_process_instance: Both two modes have the correct command_param, but only "START_PROCESS" have the correct replaced global_params, "COMPLEMENT_DATA" only have the same as process defined. "START_PROCESS": ![correct](https://user-images.githubusercontent.com/7680235/165491987-2757d3df-4635-42ce-9f94-4a302c4c6fdc.jpg) "COMPLEMENT_DATA": ![wrong](https://user-images.githubusercontent.com/7680235/165492073-bb7b581d-026e-4137-aa15-f6277a69079d.jpg) ### What you expected to happen Global params can be replaced correctly at "COMPLEMENT_DATA" mode. ### How to reproduce Create a new process, set some global params default blank. try run at START_PROCESS and COMPLEMENT_DATA mode, see different in t_ds_process_instance. ### Anything else _No response_ ### Version 2.0.3 ### Are you willing to submit PR? - [ ] Yes I am willing to submit a PR! ### Code of Conduct - [X] I agree to follow this project's [Code of Conduct](https://www.apache.org/foundation/policies/conduct)
https://github.com/apache/dolphinscheduler/issues/9811
https://github.com/apache/dolphinscheduler/pull/9952
bc1c15b142ea02cdbd9533e890f8f0af897d1cec
d4aeee16e5f3f67e37a31fa606acf0b313189655
2022-04-27T09:55:39Z
java
2022-05-11T10:37:03Z
dolphinscheduler-service/src/main/java/org/apache/dolphinscheduler/service/process/ProcessServiceImpl.java
} } } } } } /** * save error command, and delete original command * * @param command command * @param message message */ @Override public void moveToErrorCommand(Command command, String message) { ErrorCommand errorCommand = new ErrorCommand(command, message); this.errorCommandMapper.insert(errorCommand); this.commandMapper.deleteById(command.getId()); } /** * set process waiting thread * * @param command command * @param processInstance processInstance * @return process instance */ private ProcessInstance setWaitingThreadProcess(Command command, ProcessInstance processInstance) { processInstance.setState(ExecutionStatus.WAITING_THREAD); if (command.getCommandType() != CommandType.RECOVER_WAITING_THREAD) { processInstance.addHistoryCmd(command.getCommandType()); }
closed
apache/dolphinscheduler
https://github.com/apache/dolphinscheduler
9,811
[Bug] [ProcessInstance] Replace default global params value failed at "COMPLEMENT_DATA" mode
### Search before asking - [X] I had searched in the [issues](https://github.com/apache/dolphinscheduler/issues?q=is%3Aissue) and found no similar issues. ### What happened <img width="822" alt="process_definition" src="https://user-images.githubusercontent.com/7680235/165489435-14b3f989-9c93-4ac6-be39-bc3561fc6622.png"> The process have several global params default blank. When I run the process at "START_PROCESS" mode, the global_params could be replaced correctly, but if I run the process at "COMPLEMENT_DATA" mode, the replace string all loss. In database, table t_ds_process_instance: Both two modes have the correct command_param, but only "START_PROCESS" have the correct replaced global_params, "COMPLEMENT_DATA" only have the same as process defined. "START_PROCESS": ![correct](https://user-images.githubusercontent.com/7680235/165491987-2757d3df-4635-42ce-9f94-4a302c4c6fdc.jpg) "COMPLEMENT_DATA": ![wrong](https://user-images.githubusercontent.com/7680235/165492073-bb7b581d-026e-4137-aa15-f6277a69079d.jpg) ### What you expected to happen Global params can be replaced correctly at "COMPLEMENT_DATA" mode. ### How to reproduce Create a new process, set some global params default blank. try run at START_PROCESS and COMPLEMENT_DATA mode, see different in t_ds_process_instance. ### Anything else _No response_ ### Version 2.0.3 ### Are you willing to submit PR? - [ ] Yes I am willing to submit a PR! ### Code of Conduct - [X] I agree to follow this project's [Code of Conduct](https://www.apache.org/foundation/policies/conduct)
https://github.com/apache/dolphinscheduler/issues/9811
https://github.com/apache/dolphinscheduler/pull/9952
bc1c15b142ea02cdbd9533e890f8f0af897d1cec
d4aeee16e5f3f67e37a31fa606acf0b313189655
2022-04-27T09:55:39Z
java
2022-05-11T10:37:03Z
dolphinscheduler-service/src/main/java/org/apache/dolphinscheduler/service/process/ProcessServiceImpl.java
saveProcessInstance(processInstance); this.setSubProcessParam(processInstance); createRecoveryWaitingThreadCommand(command, processInstance); return null; } /** * insert one command * * @param command command * @return create result */ @Override public int createCommand(Command command) { int result = 0; if (command != null) { Schedule schedule = scheduleMapper.queryByProcessDefinitionCode(command.getProcessDefinitionCode()); Map<String, String> commandParams = JSONUtils.toMap(command.getCommandParam()); if (commandParams != null && schedule != null) { commandParams.put(Constants.SCHEDULE_TIMEZONE, schedule.getTimezoneId()); command.setCommandParam(JSONUtils.toJsonString(commandParams)); } result = commandMapper.insert(command); } return result; } /** * get command page */ @Override
closed
apache/dolphinscheduler
https://github.com/apache/dolphinscheduler
9,811
[Bug] [ProcessInstance] Replace default global params value failed at "COMPLEMENT_DATA" mode
### Search before asking - [X] I had searched in the [issues](https://github.com/apache/dolphinscheduler/issues?q=is%3Aissue) and found no similar issues. ### What happened <img width="822" alt="process_definition" src="https://user-images.githubusercontent.com/7680235/165489435-14b3f989-9c93-4ac6-be39-bc3561fc6622.png"> The process have several global params default blank. When I run the process at "START_PROCESS" mode, the global_params could be replaced correctly, but if I run the process at "COMPLEMENT_DATA" mode, the replace string all loss. In database, table t_ds_process_instance: Both two modes have the correct command_param, but only "START_PROCESS" have the correct replaced global_params, "COMPLEMENT_DATA" only have the same as process defined. "START_PROCESS": ![correct](https://user-images.githubusercontent.com/7680235/165491987-2757d3df-4635-42ce-9f94-4a302c4c6fdc.jpg) "COMPLEMENT_DATA": ![wrong](https://user-images.githubusercontent.com/7680235/165492073-bb7b581d-026e-4137-aa15-f6277a69079d.jpg) ### What you expected to happen Global params can be replaced correctly at "COMPLEMENT_DATA" mode. ### How to reproduce Create a new process, set some global params default blank. try run at START_PROCESS and COMPLEMENT_DATA mode, see different in t_ds_process_instance. ### Anything else _No response_ ### Version 2.0.3 ### Are you willing to submit PR? - [ ] Yes I am willing to submit a PR! ### Code of Conduct - [X] I agree to follow this project's [Code of Conduct](https://www.apache.org/foundation/policies/conduct)
https://github.com/apache/dolphinscheduler/issues/9811
https://github.com/apache/dolphinscheduler/pull/9952
bc1c15b142ea02cdbd9533e890f8f0af897d1cec
d4aeee16e5f3f67e37a31fa606acf0b313189655
2022-04-27T09:55:39Z
java
2022-05-11T10:37:03Z
dolphinscheduler-service/src/main/java/org/apache/dolphinscheduler/service/process/ProcessServiceImpl.java
public List<Command> findCommandPage(int pageSize, int pageNumber) { return commandMapper.queryCommandPage(pageSize, pageNumber * pageSize); } /** * get command page */ @Override public List<Command> findCommandPageBySlot(int pageSize, int pageNumber, int masterCount, int thisMasterSlot) { if (masterCount <= 0) { return Lists.newArrayList(); } return commandMapper.queryCommandPageBySlot(pageSize, pageNumber * pageSize, masterCount, thisMasterSlot); } /** * check the input command exists in queue list * * @param command command * @return create command result */ @Override public boolean verifyIsNeedCreateCommand(Command command) { boolean isNeedCreate = true; EnumMap<CommandType, Integer> cmdTypeMap = new EnumMap<>(CommandType.class); cmdTypeMap.put(CommandType.REPEAT_RUNNING, 1); cmdTypeMap.put(CommandType.RECOVER_SUSPENDED_PROCESS, 1); cmdTypeMap.put(CommandType.START_FAILURE_TASK_PROCESS, 1); CommandType commandType = command.getCommandType(); if (cmdTypeMap.containsKey(commandType)) { ObjectNode cmdParamObj = JSONUtils.parseObject(command.getCommandParam()); int processInstanceId = cmdParamObj.path(CMD_PARAM_RECOVER_PROCESS_ID_STRING).asInt();
closed
apache/dolphinscheduler
https://github.com/apache/dolphinscheduler
9,811
[Bug] [ProcessInstance] Replace default global params value failed at "COMPLEMENT_DATA" mode
### Search before asking - [X] I had searched in the [issues](https://github.com/apache/dolphinscheduler/issues?q=is%3Aissue) and found no similar issues. ### What happened <img width="822" alt="process_definition" src="https://user-images.githubusercontent.com/7680235/165489435-14b3f989-9c93-4ac6-be39-bc3561fc6622.png"> The process have several global params default blank. When I run the process at "START_PROCESS" mode, the global_params could be replaced correctly, but if I run the process at "COMPLEMENT_DATA" mode, the replace string all loss. In database, table t_ds_process_instance: Both two modes have the correct command_param, but only "START_PROCESS" have the correct replaced global_params, "COMPLEMENT_DATA" only have the same as process defined. "START_PROCESS": ![correct](https://user-images.githubusercontent.com/7680235/165491987-2757d3df-4635-42ce-9f94-4a302c4c6fdc.jpg) "COMPLEMENT_DATA": ![wrong](https://user-images.githubusercontent.com/7680235/165492073-bb7b581d-026e-4137-aa15-f6277a69079d.jpg) ### What you expected to happen Global params can be replaced correctly at "COMPLEMENT_DATA" mode. ### How to reproduce Create a new process, set some global params default blank. try run at START_PROCESS and COMPLEMENT_DATA mode, see different in t_ds_process_instance. ### Anything else _No response_ ### Version 2.0.3 ### Are you willing to submit PR? - [ ] Yes I am willing to submit a PR! ### Code of Conduct - [X] I agree to follow this project's [Code of Conduct](https://www.apache.org/foundation/policies/conduct)
https://github.com/apache/dolphinscheduler/issues/9811
https://github.com/apache/dolphinscheduler/pull/9952
bc1c15b142ea02cdbd9533e890f8f0af897d1cec
d4aeee16e5f3f67e37a31fa606acf0b313189655
2022-04-27T09:55:39Z
java
2022-05-11T10:37:03Z
dolphinscheduler-service/src/main/java/org/apache/dolphinscheduler/service/process/ProcessServiceImpl.java
List<Command> commands = commandMapper.selectList(null); for (Command tmpCommand : commands) { if (cmdTypeMap.containsKey(tmpCommand.getCommandType())) { ObjectNode tempObj = JSONUtils.parseObject(tmpCommand.getCommandParam()); if (tempObj != null && processInstanceId == tempObj.path(CMD_PARAM_RECOVER_PROCESS_ID_STRING).asInt()) { isNeedCreate = false; break; } } } } return isNeedCreate; } /** * find process instance detail by id * * @param processId processId * @return process instance */ @Override public ProcessInstance findProcessInstanceDetailById(int processId) { return processInstanceMapper.queryDetailById(processId); } /** * get task node list by definitionId */ @Override public List<TaskDefinition> getTaskNodeListByDefinition(long defineCode) { ProcessDefinition processDefinition = processDefineMapper.queryByCode(defineCode);
closed
apache/dolphinscheduler
https://github.com/apache/dolphinscheduler
9,811
[Bug] [ProcessInstance] Replace default global params value failed at "COMPLEMENT_DATA" mode
### Search before asking - [X] I had searched in the [issues](https://github.com/apache/dolphinscheduler/issues?q=is%3Aissue) and found no similar issues. ### What happened <img width="822" alt="process_definition" src="https://user-images.githubusercontent.com/7680235/165489435-14b3f989-9c93-4ac6-be39-bc3561fc6622.png"> The process have several global params default blank. When I run the process at "START_PROCESS" mode, the global_params could be replaced correctly, but if I run the process at "COMPLEMENT_DATA" mode, the replace string all loss. In database, table t_ds_process_instance: Both two modes have the correct command_param, but only "START_PROCESS" have the correct replaced global_params, "COMPLEMENT_DATA" only have the same as process defined. "START_PROCESS": ![correct](https://user-images.githubusercontent.com/7680235/165491987-2757d3df-4635-42ce-9f94-4a302c4c6fdc.jpg) "COMPLEMENT_DATA": ![wrong](https://user-images.githubusercontent.com/7680235/165492073-bb7b581d-026e-4137-aa15-f6277a69079d.jpg) ### What you expected to happen Global params can be replaced correctly at "COMPLEMENT_DATA" mode. ### How to reproduce Create a new process, set some global params default blank. try run at START_PROCESS and COMPLEMENT_DATA mode, see different in t_ds_process_instance. ### Anything else _No response_ ### Version 2.0.3 ### Are you willing to submit PR? - [ ] Yes I am willing to submit a PR! ### Code of Conduct - [X] I agree to follow this project's [Code of Conduct](https://www.apache.org/foundation/policies/conduct)
https://github.com/apache/dolphinscheduler/issues/9811
https://github.com/apache/dolphinscheduler/pull/9952
bc1c15b142ea02cdbd9533e890f8f0af897d1cec
d4aeee16e5f3f67e37a31fa606acf0b313189655
2022-04-27T09:55:39Z
java
2022-05-11T10:37:03Z
dolphinscheduler-service/src/main/java/org/apache/dolphinscheduler/service/process/ProcessServiceImpl.java
if (processDefinition == null) { logger.error("process define not exists"); return Lists.newArrayList(); } List<ProcessTaskRelationLog> processTaskRelations = processTaskRelationLogMapper.queryByProcessCodeAndVersion(processDefinition.getCode(), processDefinition.getVersion()); Set<TaskDefinition> taskDefinitionSet = new HashSet<>(); for (ProcessTaskRelationLog processTaskRelation : processTaskRelations) { if (processTaskRelation.getPostTaskCode() > 0) { taskDefinitionSet.add(new TaskDefinition(processTaskRelation.getPostTaskCode(), processTaskRelation.getPostTaskVersion())); } } if (taskDefinitionSet.isEmpty()) { return Lists.newArrayList(); } List<TaskDefinitionLog> taskDefinitionLogs = taskDefinitionLogMapper.queryByTaskDefinitions(taskDefinitionSet); return Lists.newArrayList(taskDefinitionLogs); } /** * find process instance by id * * @param processId processId * @return process instance */ @Override public ProcessInstance findProcessInstanceById(int processId) { return processInstanceMapper.selectById(processId); } /** * find process define by id. *
closed
apache/dolphinscheduler
https://github.com/apache/dolphinscheduler
9,811
[Bug] [ProcessInstance] Replace default global params value failed at "COMPLEMENT_DATA" mode
### Search before asking - [X] I had searched in the [issues](https://github.com/apache/dolphinscheduler/issues?q=is%3Aissue) and found no similar issues. ### What happened <img width="822" alt="process_definition" src="https://user-images.githubusercontent.com/7680235/165489435-14b3f989-9c93-4ac6-be39-bc3561fc6622.png"> The process have several global params default blank. When I run the process at "START_PROCESS" mode, the global_params could be replaced correctly, but if I run the process at "COMPLEMENT_DATA" mode, the replace string all loss. In database, table t_ds_process_instance: Both two modes have the correct command_param, but only "START_PROCESS" have the correct replaced global_params, "COMPLEMENT_DATA" only have the same as process defined. "START_PROCESS": ![correct](https://user-images.githubusercontent.com/7680235/165491987-2757d3df-4635-42ce-9f94-4a302c4c6fdc.jpg) "COMPLEMENT_DATA": ![wrong](https://user-images.githubusercontent.com/7680235/165492073-bb7b581d-026e-4137-aa15-f6277a69079d.jpg) ### What you expected to happen Global params can be replaced correctly at "COMPLEMENT_DATA" mode. ### How to reproduce Create a new process, set some global params default blank. try run at START_PROCESS and COMPLEMENT_DATA mode, see different in t_ds_process_instance. ### Anything else _No response_ ### Version 2.0.3 ### Are you willing to submit PR? - [ ] Yes I am willing to submit a PR! ### Code of Conduct - [X] I agree to follow this project's [Code of Conduct](https://www.apache.org/foundation/policies/conduct)
https://github.com/apache/dolphinscheduler/issues/9811
https://github.com/apache/dolphinscheduler/pull/9952
bc1c15b142ea02cdbd9533e890f8f0af897d1cec
d4aeee16e5f3f67e37a31fa606acf0b313189655
2022-04-27T09:55:39Z
java
2022-05-11T10:37:03Z
dolphinscheduler-service/src/main/java/org/apache/dolphinscheduler/service/process/ProcessServiceImpl.java
* @param processDefinitionId processDefinitionId * @return process definition */ @Override public ProcessDefinition findProcessDefineById(int processDefinitionId) { return processDefineMapper.selectById(processDefinitionId); } /** * find process define by code and version. * * @param processDefinitionCode processDefinitionCode * @return process definition */ @Override public ProcessDefinition findProcessDefinition(Long processDefinitionCode, int version) { ProcessDefinition processDefinition = processDefineMapper.queryByCode(processDefinitionCode); if (processDefinition == null || processDefinition.getVersion() != version) { processDefinition = processDefineLogMapper.queryByDefinitionCodeAndVersion(processDefinitionCode, version); if (processDefinition != null) { processDefinition.setId(0); } } return processDefinition; } /** * find process define by code. * * @param processDefinitionCode processDefinitionCode * @return process definition */
closed
apache/dolphinscheduler
https://github.com/apache/dolphinscheduler
9,811
[Bug] [ProcessInstance] Replace default global params value failed at "COMPLEMENT_DATA" mode
### Search before asking - [X] I had searched in the [issues](https://github.com/apache/dolphinscheduler/issues?q=is%3Aissue) and found no similar issues. ### What happened <img width="822" alt="process_definition" src="https://user-images.githubusercontent.com/7680235/165489435-14b3f989-9c93-4ac6-be39-bc3561fc6622.png"> The process have several global params default blank. When I run the process at "START_PROCESS" mode, the global_params could be replaced correctly, but if I run the process at "COMPLEMENT_DATA" mode, the replace string all loss. In database, table t_ds_process_instance: Both two modes have the correct command_param, but only "START_PROCESS" have the correct replaced global_params, "COMPLEMENT_DATA" only have the same as process defined. "START_PROCESS": ![correct](https://user-images.githubusercontent.com/7680235/165491987-2757d3df-4635-42ce-9f94-4a302c4c6fdc.jpg) "COMPLEMENT_DATA": ![wrong](https://user-images.githubusercontent.com/7680235/165492073-bb7b581d-026e-4137-aa15-f6277a69079d.jpg) ### What you expected to happen Global params can be replaced correctly at "COMPLEMENT_DATA" mode. ### How to reproduce Create a new process, set some global params default blank. try run at START_PROCESS and COMPLEMENT_DATA mode, see different in t_ds_process_instance. ### Anything else _No response_ ### Version 2.0.3 ### Are you willing to submit PR? - [ ] Yes I am willing to submit a PR! ### Code of Conduct - [X] I agree to follow this project's [Code of Conduct](https://www.apache.org/foundation/policies/conduct)
https://github.com/apache/dolphinscheduler/issues/9811
https://github.com/apache/dolphinscheduler/pull/9952
bc1c15b142ea02cdbd9533e890f8f0af897d1cec
d4aeee16e5f3f67e37a31fa606acf0b313189655
2022-04-27T09:55:39Z
java
2022-05-11T10:37:03Z
dolphinscheduler-service/src/main/java/org/apache/dolphinscheduler/service/process/ProcessServiceImpl.java
@Override public ProcessDefinition findProcessDefinitionByCode(Long processDefinitionCode) { return processDefineMapper.queryByCode(processDefinitionCode); } /** * delete work process instance by id * * @param processInstanceId processInstanceId * @return delete process instance result */ @Override public int deleteWorkProcessInstanceById(int processInstanceId) { return processInstanceMapper.deleteById(processInstanceId); } /** * delete all sub process by parent instance id * * @param processInstanceId processInstanceId * @return delete all sub process instance result */ @Override public int deleteAllSubWorkProcessByParentId(int processInstanceId) { List<Integer> subProcessIdList = processInstanceMapMapper.querySubIdListByParentId(processInstanceId); for (Integer subId : subProcessIdList) { deleteAllSubWorkProcessByParentId(subId); deleteWorkProcessMapByParentId(subId); removeTaskLogFile(subId); deleteWorkProcessInstanceById(subId); } return 1;
closed
apache/dolphinscheduler
https://github.com/apache/dolphinscheduler
9,811
[Bug] [ProcessInstance] Replace default global params value failed at "COMPLEMENT_DATA" mode
### Search before asking - [X] I had searched in the [issues](https://github.com/apache/dolphinscheduler/issues?q=is%3Aissue) and found no similar issues. ### What happened <img width="822" alt="process_definition" src="https://user-images.githubusercontent.com/7680235/165489435-14b3f989-9c93-4ac6-be39-bc3561fc6622.png"> The process have several global params default blank. When I run the process at "START_PROCESS" mode, the global_params could be replaced correctly, but if I run the process at "COMPLEMENT_DATA" mode, the replace string all loss. In database, table t_ds_process_instance: Both two modes have the correct command_param, but only "START_PROCESS" have the correct replaced global_params, "COMPLEMENT_DATA" only have the same as process defined. "START_PROCESS": ![correct](https://user-images.githubusercontent.com/7680235/165491987-2757d3df-4635-42ce-9f94-4a302c4c6fdc.jpg) "COMPLEMENT_DATA": ![wrong](https://user-images.githubusercontent.com/7680235/165492073-bb7b581d-026e-4137-aa15-f6277a69079d.jpg) ### What you expected to happen Global params can be replaced correctly at "COMPLEMENT_DATA" mode. ### How to reproduce Create a new process, set some global params default blank. try run at START_PROCESS and COMPLEMENT_DATA mode, see different in t_ds_process_instance. ### Anything else _No response_ ### Version 2.0.3 ### Are you willing to submit PR? - [ ] Yes I am willing to submit a PR! ### Code of Conduct - [X] I agree to follow this project's [Code of Conduct](https://www.apache.org/foundation/policies/conduct)
https://github.com/apache/dolphinscheduler/issues/9811
https://github.com/apache/dolphinscheduler/pull/9952
bc1c15b142ea02cdbd9533e890f8f0af897d1cec
d4aeee16e5f3f67e37a31fa606acf0b313189655
2022-04-27T09:55:39Z
java
2022-05-11T10:37:03Z
dolphinscheduler-service/src/main/java/org/apache/dolphinscheduler/service/process/ProcessServiceImpl.java
} /** * remove task log file * * @param processInstanceId processInstanceId */ @Override public void removeTaskLogFile(Integer processInstanceId) { List<TaskInstance> taskInstanceList = findValidTaskListByProcessId(processInstanceId); if (CollectionUtils.isEmpty(taskInstanceList)) { return; } try (LogClientService logClient = new LogClientService()) { for (TaskInstance taskInstance : taskInstanceList) { String taskLogPath = taskInstance.getLogPath(); if (StringUtils.isEmpty(taskInstance.getHost())) { continue; } Host host = Host.of(taskInstance.getHost()); logClient.removeTaskLog(host.getIp(), host.getPort(), taskLogPath); } } } /** * recursive delete all task instance by process instance id */ @Override public void deleteWorkTaskInstanceByProcessInstanceId(int processInstanceId) { List<TaskInstance> taskInstanceList = findValidTaskListByProcessId(processInstanceId);
closed
apache/dolphinscheduler
https://github.com/apache/dolphinscheduler
9,811
[Bug] [ProcessInstance] Replace default global params value failed at "COMPLEMENT_DATA" mode
### Search before asking - [X] I had searched in the [issues](https://github.com/apache/dolphinscheduler/issues?q=is%3Aissue) and found no similar issues. ### What happened <img width="822" alt="process_definition" src="https://user-images.githubusercontent.com/7680235/165489435-14b3f989-9c93-4ac6-be39-bc3561fc6622.png"> The process have several global params default blank. When I run the process at "START_PROCESS" mode, the global_params could be replaced correctly, but if I run the process at "COMPLEMENT_DATA" mode, the replace string all loss. In database, table t_ds_process_instance: Both two modes have the correct command_param, but only "START_PROCESS" have the correct replaced global_params, "COMPLEMENT_DATA" only have the same as process defined. "START_PROCESS": ![correct](https://user-images.githubusercontent.com/7680235/165491987-2757d3df-4635-42ce-9f94-4a302c4c6fdc.jpg) "COMPLEMENT_DATA": ![wrong](https://user-images.githubusercontent.com/7680235/165492073-bb7b581d-026e-4137-aa15-f6277a69079d.jpg) ### What you expected to happen Global params can be replaced correctly at "COMPLEMENT_DATA" mode. ### How to reproduce Create a new process, set some global params default blank. try run at START_PROCESS and COMPLEMENT_DATA mode, see different in t_ds_process_instance. ### Anything else _No response_ ### Version 2.0.3 ### Are you willing to submit PR? - [ ] Yes I am willing to submit a PR! ### Code of Conduct - [X] I agree to follow this project's [Code of Conduct](https://www.apache.org/foundation/policies/conduct)
https://github.com/apache/dolphinscheduler/issues/9811
https://github.com/apache/dolphinscheduler/pull/9952
bc1c15b142ea02cdbd9533e890f8f0af897d1cec
d4aeee16e5f3f67e37a31fa606acf0b313189655
2022-04-27T09:55:39Z
java
2022-05-11T10:37:03Z
dolphinscheduler-service/src/main/java/org/apache/dolphinscheduler/service/process/ProcessServiceImpl.java
if (CollectionUtils.isEmpty(taskInstanceList)) { return; } List<Integer> taskInstanceIdList = new ArrayList<>(); for (TaskInstance taskInstance : taskInstanceList) { taskInstanceIdList.add(taskInstance.getId()); } taskInstanceMapper.deleteBatchIds(taskInstanceIdList); } /** * recursive query sub process definition id by parent id. * * @param parentCode parentCode * @param ids ids */ @Override public void recurseFindSubProcess(long parentCode, List<Long> ids) { List<TaskDefinition> taskNodeList = this.getTaskNodeListByDefinition(parentCode); if (taskNodeList != null && !taskNodeList.isEmpty()) { for (TaskDefinition taskNode : taskNodeList) { String parameter = taskNode.getTaskParams(); ObjectNode parameterJson = JSONUtils.parseObject(parameter); if (parameterJson.get(CMD_PARAM_SUB_PROCESS_DEFINE_CODE) != null) { SubProcessParameters subProcessParam = JSONUtils.parseObject(parameter, SubProcessParameters.class); ids.add(subProcessParam.getProcessDefinitionCode()); recurseFindSubProcess(subProcessParam.getProcessDefinitionCode(), ids); } } } }
closed
apache/dolphinscheduler
https://github.com/apache/dolphinscheduler
9,811
[Bug] [ProcessInstance] Replace default global params value failed at "COMPLEMENT_DATA" mode
### Search before asking - [X] I had searched in the [issues](https://github.com/apache/dolphinscheduler/issues?q=is%3Aissue) and found no similar issues. ### What happened <img width="822" alt="process_definition" src="https://user-images.githubusercontent.com/7680235/165489435-14b3f989-9c93-4ac6-be39-bc3561fc6622.png"> The process have several global params default blank. When I run the process at "START_PROCESS" mode, the global_params could be replaced correctly, but if I run the process at "COMPLEMENT_DATA" mode, the replace string all loss. In database, table t_ds_process_instance: Both two modes have the correct command_param, but only "START_PROCESS" have the correct replaced global_params, "COMPLEMENT_DATA" only have the same as process defined. "START_PROCESS": ![correct](https://user-images.githubusercontent.com/7680235/165491987-2757d3df-4635-42ce-9f94-4a302c4c6fdc.jpg) "COMPLEMENT_DATA": ![wrong](https://user-images.githubusercontent.com/7680235/165492073-bb7b581d-026e-4137-aa15-f6277a69079d.jpg) ### What you expected to happen Global params can be replaced correctly at "COMPLEMENT_DATA" mode. ### How to reproduce Create a new process, set some global params default blank. try run at START_PROCESS and COMPLEMENT_DATA mode, see different in t_ds_process_instance. ### Anything else _No response_ ### Version 2.0.3 ### Are you willing to submit PR? - [ ] Yes I am willing to submit a PR! ### Code of Conduct - [X] I agree to follow this project's [Code of Conduct](https://www.apache.org/foundation/policies/conduct)
https://github.com/apache/dolphinscheduler/issues/9811
https://github.com/apache/dolphinscheduler/pull/9952
bc1c15b142ea02cdbd9533e890f8f0af897d1cec
d4aeee16e5f3f67e37a31fa606acf0b313189655
2022-04-27T09:55:39Z
java
2022-05-11T10:37:03Z
dolphinscheduler-service/src/main/java/org/apache/dolphinscheduler/service/process/ProcessServiceImpl.java
/** * create recovery waiting thread command when thread pool is not enough for the process instance. * sub work process instance need not to create recovery command. * create recovery waiting thread command and delete origin command at the same time. * if the recovery command is exists, only update the field update_time * * @param originCommand originCommand * @param processInstance processInstance */ @Override public void createRecoveryWaitingThreadCommand(Command originCommand, ProcessInstance processInstance) { if (processInstance.getIsSubProcess() == Flag.YES) { if (originCommand != null) { commandMapper.deleteById(originCommand.getId()); } return; } Map<String, String> cmdParam = new HashMap<>(); cmdParam.put(Constants.CMD_PARAM_RECOVERY_WAITING_THREAD, String.valueOf(processInstance.getId())); if (originCommand == null) { Command command = new Command( CommandType.RECOVER_WAITING_THREAD, processInstance.getTaskDependType(), processInstance.getFailureStrategy(), processInstance.getExecutorId(), processInstance.getProcessDefinition().getCode(), JSONUtils.toJsonString(cmdParam), processInstance.getWarningType(),
closed
apache/dolphinscheduler
https://github.com/apache/dolphinscheduler
9,811
[Bug] [ProcessInstance] Replace default global params value failed at "COMPLEMENT_DATA" mode
### Search before asking - [X] I had searched in the [issues](https://github.com/apache/dolphinscheduler/issues?q=is%3Aissue) and found no similar issues. ### What happened <img width="822" alt="process_definition" src="https://user-images.githubusercontent.com/7680235/165489435-14b3f989-9c93-4ac6-be39-bc3561fc6622.png"> The process have several global params default blank. When I run the process at "START_PROCESS" mode, the global_params could be replaced correctly, but if I run the process at "COMPLEMENT_DATA" mode, the replace string all loss. In database, table t_ds_process_instance: Both two modes have the correct command_param, but only "START_PROCESS" have the correct replaced global_params, "COMPLEMENT_DATA" only have the same as process defined. "START_PROCESS": ![correct](https://user-images.githubusercontent.com/7680235/165491987-2757d3df-4635-42ce-9f94-4a302c4c6fdc.jpg) "COMPLEMENT_DATA": ![wrong](https://user-images.githubusercontent.com/7680235/165492073-bb7b581d-026e-4137-aa15-f6277a69079d.jpg) ### What you expected to happen Global params can be replaced correctly at "COMPLEMENT_DATA" mode. ### How to reproduce Create a new process, set some global params default blank. try run at START_PROCESS and COMPLEMENT_DATA mode, see different in t_ds_process_instance. ### Anything else _No response_ ### Version 2.0.3 ### Are you willing to submit PR? - [ ] Yes I am willing to submit a PR! ### Code of Conduct - [X] I agree to follow this project's [Code of Conduct](https://www.apache.org/foundation/policies/conduct)
https://github.com/apache/dolphinscheduler/issues/9811
https://github.com/apache/dolphinscheduler/pull/9952
bc1c15b142ea02cdbd9533e890f8f0af897d1cec
d4aeee16e5f3f67e37a31fa606acf0b313189655
2022-04-27T09:55:39Z
java
2022-05-11T10:37:03Z
dolphinscheduler-service/src/main/java/org/apache/dolphinscheduler/service/process/ProcessServiceImpl.java
processInstance.getWarningGroupId(), processInstance.getScheduleTime(), processInstance.getWorkerGroup(), processInstance.getEnvironmentCode(), processInstance.getProcessInstancePriority(), processInstance.getDryRun(), processInstance.getId(), processInstance.getProcessDefinitionVersion() ); saveCommand(command); return; } if (originCommand.getCommandType() == CommandType.RECOVER_WAITING_THREAD) { originCommand.setUpdateTime(new Date()); saveCommand(originCommand); } else { commandMapper.deleteById(originCommand.getId()); originCommand.setId(0); originCommand.setCommandType(CommandType.RECOVER_WAITING_THREAD); originCommand.setUpdateTime(new Date()); originCommand.setCommandParam(JSONUtils.toJsonString(cmdParam)); originCommand.setProcessInstancePriority(processInstance.getProcessInstancePriority()); saveCommand(originCommand); } } /** * get schedule time from command *
closed
apache/dolphinscheduler
https://github.com/apache/dolphinscheduler
9,811
[Bug] [ProcessInstance] Replace default global params value failed at "COMPLEMENT_DATA" mode
### Search before asking - [X] I had searched in the [issues](https://github.com/apache/dolphinscheduler/issues?q=is%3Aissue) and found no similar issues. ### What happened <img width="822" alt="process_definition" src="https://user-images.githubusercontent.com/7680235/165489435-14b3f989-9c93-4ac6-be39-bc3561fc6622.png"> The process have several global params default blank. When I run the process at "START_PROCESS" mode, the global_params could be replaced correctly, but if I run the process at "COMPLEMENT_DATA" mode, the replace string all loss. In database, table t_ds_process_instance: Both two modes have the correct command_param, but only "START_PROCESS" have the correct replaced global_params, "COMPLEMENT_DATA" only have the same as process defined. "START_PROCESS": ![correct](https://user-images.githubusercontent.com/7680235/165491987-2757d3df-4635-42ce-9f94-4a302c4c6fdc.jpg) "COMPLEMENT_DATA": ![wrong](https://user-images.githubusercontent.com/7680235/165492073-bb7b581d-026e-4137-aa15-f6277a69079d.jpg) ### What you expected to happen Global params can be replaced correctly at "COMPLEMENT_DATA" mode. ### How to reproduce Create a new process, set some global params default blank. try run at START_PROCESS and COMPLEMENT_DATA mode, see different in t_ds_process_instance. ### Anything else _No response_ ### Version 2.0.3 ### Are you willing to submit PR? - [ ] Yes I am willing to submit a PR! ### Code of Conduct - [X] I agree to follow this project's [Code of Conduct](https://www.apache.org/foundation/policies/conduct)
https://github.com/apache/dolphinscheduler/issues/9811
https://github.com/apache/dolphinscheduler/pull/9952
bc1c15b142ea02cdbd9533e890f8f0af897d1cec
d4aeee16e5f3f67e37a31fa606acf0b313189655
2022-04-27T09:55:39Z
java
2022-05-11T10:37:03Z
dolphinscheduler-service/src/main/java/org/apache/dolphinscheduler/service/process/ProcessServiceImpl.java
* @param command command * @param cmdParam cmdParam map * @return date */ private Date getScheduleTime(Command command, Map<String, String> cmdParam) { Date scheduleTime = command.getScheduleTime(); if (scheduleTime == null && cmdParam != null && cmdParam.containsKey(CMDPARAM_COMPLEMENT_DATA_START_DATE)) { Date start = DateUtils.stringToDate(cmdParam.get(CMDPARAM_COMPLEMENT_DATA_START_DATE)); Date end = DateUtils.stringToDate(cmdParam.get(CMDPARAM_COMPLEMENT_DATA_END_DATE)); List<Schedule> schedules = queryReleaseSchedulerListByProcessDefinitionCode(command.getProcessDefinitionCode()); List<Date> complementDateList = CronUtils.getSelfFireDateList(start, end, schedules); if (complementDateList.size() > 0) { scheduleTime = complementDateList.get(0); } else { logger.error("set scheduler time error: complement date list is empty, command: {}", command.toString()); } } return scheduleTime; } /** * generate a new work process instance from command. * * @param processDefinition processDefinition * @param command command * @param cmdParam cmdParam map * @return process instance */
closed
apache/dolphinscheduler
https://github.com/apache/dolphinscheduler
9,811
[Bug] [ProcessInstance] Replace default global params value failed at "COMPLEMENT_DATA" mode
### Search before asking - [X] I had searched in the [issues](https://github.com/apache/dolphinscheduler/issues?q=is%3Aissue) and found no similar issues. ### What happened <img width="822" alt="process_definition" src="https://user-images.githubusercontent.com/7680235/165489435-14b3f989-9c93-4ac6-be39-bc3561fc6622.png"> The process have several global params default blank. When I run the process at "START_PROCESS" mode, the global_params could be replaced correctly, but if I run the process at "COMPLEMENT_DATA" mode, the replace string all loss. In database, table t_ds_process_instance: Both two modes have the correct command_param, but only "START_PROCESS" have the correct replaced global_params, "COMPLEMENT_DATA" only have the same as process defined. "START_PROCESS": ![correct](https://user-images.githubusercontent.com/7680235/165491987-2757d3df-4635-42ce-9f94-4a302c4c6fdc.jpg) "COMPLEMENT_DATA": ![wrong](https://user-images.githubusercontent.com/7680235/165492073-bb7b581d-026e-4137-aa15-f6277a69079d.jpg) ### What you expected to happen Global params can be replaced correctly at "COMPLEMENT_DATA" mode. ### How to reproduce Create a new process, set some global params default blank. try run at START_PROCESS and COMPLEMENT_DATA mode, see different in t_ds_process_instance. ### Anything else _No response_ ### Version 2.0.3 ### Are you willing to submit PR? - [ ] Yes I am willing to submit a PR! ### Code of Conduct - [X] I agree to follow this project's [Code of Conduct](https://www.apache.org/foundation/policies/conduct)
https://github.com/apache/dolphinscheduler/issues/9811
https://github.com/apache/dolphinscheduler/pull/9952
bc1c15b142ea02cdbd9533e890f8f0af897d1cec
d4aeee16e5f3f67e37a31fa606acf0b313189655
2022-04-27T09:55:39Z
java
2022-05-11T10:37:03Z
dolphinscheduler-service/src/main/java/org/apache/dolphinscheduler/service/process/ProcessServiceImpl.java
private ProcessInstance generateNewProcessInstance(ProcessDefinition processDefinition, Command command, Map<String, String> cmdParam) { ProcessInstance processInstance = new ProcessInstance(processDefinition); processInstance.setProcessDefinitionCode(processDefinition.getCode()); processInstance.setProcessDefinitionVersion(processDefinition.getVersion()); processInstance.setState(ExecutionStatus.RUNNING_EXECUTION); processInstance.setRecovery(Flag.NO); processInstance.setStartTime(new Date()); processInstance.setRestartTime(processInstance.getStartTime()); processInstance.setRunTimes(1); processInstance.setMaxTryTimes(0); processInstance.setCommandParam(command.getCommandParam()); processInstance.setCommandType(command.getCommandType()); processInstance.setIsSubProcess(Flag.NO); processInstance.setTaskDependType(command.getTaskDependType()); processInstance.setFailureStrategy(command.getFailureStrategy()); processInstance.setExecutorId(command.getExecutorId()); WarningType warningType = command.getWarningType() == null ? WarningType.NONE : command.getWarningType(); processInstance.setWarningType(warningType); Integer warningGroupId = command.getWarningGroupId() == null ? 0 : command.getWarningGroupId(); processInstance.setWarningGroupId(warningGroupId); processInstance.setDryRun(command.getDryRun()); if (command.getScheduleTime() != null) { processInstance.setScheduleTime(command.getScheduleTime()); } processInstance.setCommandStartTime(command.getStartTime()); processInstance.setLocations(processDefinition.getLocations()); setGlobalParamIfCommanded(processDefinition, cmdParam);
closed
apache/dolphinscheduler
https://github.com/apache/dolphinscheduler
9,811
[Bug] [ProcessInstance] Replace default global params value failed at "COMPLEMENT_DATA" mode
### Search before asking - [X] I had searched in the [issues](https://github.com/apache/dolphinscheduler/issues?q=is%3Aissue) and found no similar issues. ### What happened <img width="822" alt="process_definition" src="https://user-images.githubusercontent.com/7680235/165489435-14b3f989-9c93-4ac6-be39-bc3561fc6622.png"> The process have several global params default blank. When I run the process at "START_PROCESS" mode, the global_params could be replaced correctly, but if I run the process at "COMPLEMENT_DATA" mode, the replace string all loss. In database, table t_ds_process_instance: Both two modes have the correct command_param, but only "START_PROCESS" have the correct replaced global_params, "COMPLEMENT_DATA" only have the same as process defined. "START_PROCESS": ![correct](https://user-images.githubusercontent.com/7680235/165491987-2757d3df-4635-42ce-9f94-4a302c4c6fdc.jpg) "COMPLEMENT_DATA": ![wrong](https://user-images.githubusercontent.com/7680235/165492073-bb7b581d-026e-4137-aa15-f6277a69079d.jpg) ### What you expected to happen Global params can be replaced correctly at "COMPLEMENT_DATA" mode. ### How to reproduce Create a new process, set some global params default blank. try run at START_PROCESS and COMPLEMENT_DATA mode, see different in t_ds_process_instance. ### Anything else _No response_ ### Version 2.0.3 ### Are you willing to submit PR? - [ ] Yes I am willing to submit a PR! ### Code of Conduct - [X] I agree to follow this project's [Code of Conduct](https://www.apache.org/foundation/policies/conduct)
https://github.com/apache/dolphinscheduler/issues/9811
https://github.com/apache/dolphinscheduler/pull/9952
bc1c15b142ea02cdbd9533e890f8f0af897d1cec
d4aeee16e5f3f67e37a31fa606acf0b313189655
2022-04-27T09:55:39Z
java
2022-05-11T10:37:03Z
dolphinscheduler-service/src/main/java/org/apache/dolphinscheduler/service/process/ProcessServiceImpl.java
Map<String, String> commandParamMap = JSONUtils.toMap(command.getCommandParam()); String timezoneId = null; if (commandParamMap != null) { timezoneId = commandParamMap.get(Constants.SCHEDULE_TIMEZONE); } processInstance.setGlobalParams(ParameterUtils.curingGlobalParams( processDefinition.getGlobalParamMap(), processDefinition.getGlobalParamList(), getCommandTypeIfComplement(processInstance, command), processInstance.getScheduleTime(), timezoneId)); processInstance.setProcessInstancePriority(command.getProcessInstancePriority()); String workerGroup = StringUtils.isBlank(command.getWorkerGroup()) ? Constants.DEFAULT_WORKER_GROUP : command.getWorkerGroup(); processInstance.setWorkerGroup(workerGroup); processInstance.setEnvironmentCode(Objects.isNull(command.getEnvironmentCode()) ? -1 : command.getEnvironmentCode()); processInstance.setTimeout(processDefinition.getTimeout()); processInstance.setTenantId(processDefinition.getTenantId()); return processInstance; } private void setGlobalParamIfCommanded(ProcessDefinition processDefinition, Map<String, String> cmdParam) { Map<String, String> startParamMap = new HashMap<>(); if (cmdParam != null && cmdParam.containsKey(Constants.CMD_PARAM_START_PARAMS)) { String startParamJson = cmdParam.get(Constants.CMD_PARAM_START_PARAMS); startParamMap = JSONUtils.toMap(startParamJson); } Map<String, String> fatherParamMap = new HashMap<>(); if (cmdParam != null && cmdParam.containsKey(Constants.CMD_PARAM_FATHER_PARAMS)) { String fatherParamJson = cmdParam.get(Constants.CMD_PARAM_FATHER_PARAMS);
closed
apache/dolphinscheduler
https://github.com/apache/dolphinscheduler
9,811
[Bug] [ProcessInstance] Replace default global params value failed at "COMPLEMENT_DATA" mode
### Search before asking - [X] I had searched in the [issues](https://github.com/apache/dolphinscheduler/issues?q=is%3Aissue) and found no similar issues. ### What happened <img width="822" alt="process_definition" src="https://user-images.githubusercontent.com/7680235/165489435-14b3f989-9c93-4ac6-be39-bc3561fc6622.png"> The process have several global params default blank. When I run the process at "START_PROCESS" mode, the global_params could be replaced correctly, but if I run the process at "COMPLEMENT_DATA" mode, the replace string all loss. In database, table t_ds_process_instance: Both two modes have the correct command_param, but only "START_PROCESS" have the correct replaced global_params, "COMPLEMENT_DATA" only have the same as process defined. "START_PROCESS": ![correct](https://user-images.githubusercontent.com/7680235/165491987-2757d3df-4635-42ce-9f94-4a302c4c6fdc.jpg) "COMPLEMENT_DATA": ![wrong](https://user-images.githubusercontent.com/7680235/165492073-bb7b581d-026e-4137-aa15-f6277a69079d.jpg) ### What you expected to happen Global params can be replaced correctly at "COMPLEMENT_DATA" mode. ### How to reproduce Create a new process, set some global params default blank. try run at START_PROCESS and COMPLEMENT_DATA mode, see different in t_ds_process_instance. ### Anything else _No response_ ### Version 2.0.3 ### Are you willing to submit PR? - [ ] Yes I am willing to submit a PR! ### Code of Conduct - [X] I agree to follow this project's [Code of Conduct](https://www.apache.org/foundation/policies/conduct)
https://github.com/apache/dolphinscheduler/issues/9811
https://github.com/apache/dolphinscheduler/pull/9952
bc1c15b142ea02cdbd9533e890f8f0af897d1cec
d4aeee16e5f3f67e37a31fa606acf0b313189655
2022-04-27T09:55:39Z
java
2022-05-11T10:37:03Z
dolphinscheduler-service/src/main/java/org/apache/dolphinscheduler/service/process/ProcessServiceImpl.java
fatherParamMap = JSONUtils.toMap(fatherParamJson); } startParamMap.putAll(fatherParamMap); Map<String, String> globalMap = processDefinition.getGlobalParamMap(); List<Property> globalParamList = processDefinition.getGlobalParamList(); if (startParamMap.size() > 0 && globalMap != null) { for (Map.Entry<String, String> param : globalMap.entrySet()) { String val = startParamMap.get(param.getKey()); if (val != null) { param.setValue(val); } } for (Entry<String, String> startParam : startParamMap.entrySet()) { if (!globalMap.containsKey(startParam.getKey())) { globalMap.put(startParam.getKey(), startParam.getValue()); globalParamList.add(new Property(startParam.getKey(), IN, VARCHAR, startParam.getValue())); } } } } /** * get process tenant * there is tenant id in definition, use the tenant of the definition. * if there is not tenant id in the definiton or the tenant not exist * use definition creator's tenant. * * @param tenantId tenantId * @param userId userId
closed
apache/dolphinscheduler
https://github.com/apache/dolphinscheduler
9,811
[Bug] [ProcessInstance] Replace default global params value failed at "COMPLEMENT_DATA" mode
### Search before asking - [X] I had searched in the [issues](https://github.com/apache/dolphinscheduler/issues?q=is%3Aissue) and found no similar issues. ### What happened <img width="822" alt="process_definition" src="https://user-images.githubusercontent.com/7680235/165489435-14b3f989-9c93-4ac6-be39-bc3561fc6622.png"> The process have several global params default blank. When I run the process at "START_PROCESS" mode, the global_params could be replaced correctly, but if I run the process at "COMPLEMENT_DATA" mode, the replace string all loss. In database, table t_ds_process_instance: Both two modes have the correct command_param, but only "START_PROCESS" have the correct replaced global_params, "COMPLEMENT_DATA" only have the same as process defined. "START_PROCESS": ![correct](https://user-images.githubusercontent.com/7680235/165491987-2757d3df-4635-42ce-9f94-4a302c4c6fdc.jpg) "COMPLEMENT_DATA": ![wrong](https://user-images.githubusercontent.com/7680235/165492073-bb7b581d-026e-4137-aa15-f6277a69079d.jpg) ### What you expected to happen Global params can be replaced correctly at "COMPLEMENT_DATA" mode. ### How to reproduce Create a new process, set some global params default blank. try run at START_PROCESS and COMPLEMENT_DATA mode, see different in t_ds_process_instance. ### Anything else _No response_ ### Version 2.0.3 ### Are you willing to submit PR? - [ ] Yes I am willing to submit a PR! ### Code of Conduct - [X] I agree to follow this project's [Code of Conduct](https://www.apache.org/foundation/policies/conduct)
https://github.com/apache/dolphinscheduler/issues/9811
https://github.com/apache/dolphinscheduler/pull/9952
bc1c15b142ea02cdbd9533e890f8f0af897d1cec
d4aeee16e5f3f67e37a31fa606acf0b313189655
2022-04-27T09:55:39Z
java
2022-05-11T10:37:03Z
dolphinscheduler-service/src/main/java/org/apache/dolphinscheduler/service/process/ProcessServiceImpl.java
* @return tenant */ @Override public Tenant getTenantForProcess(int tenantId, int userId) { Tenant tenant = null; if (tenantId >= 0) { tenant = tenantMapper.queryById(tenantId); } if (userId == 0) { return null; } if (tenant == null) { User user = userMapper.selectById(userId); tenant = tenantMapper.queryById(user.getTenantId()); } return tenant; } /** * get an environment * use the code of the environment to find a environment. * * @param environmentCode environmentCode * @return Environment */ @Override public Environment findEnvironmentByCode(Long environmentCode) { Environment environment = null; if (environmentCode >= 0) { environment = environmentMapper.queryByEnvironmentCode(environmentCode); }
closed
apache/dolphinscheduler
https://github.com/apache/dolphinscheduler
9,811
[Bug] [ProcessInstance] Replace default global params value failed at "COMPLEMENT_DATA" mode
### Search before asking - [X] I had searched in the [issues](https://github.com/apache/dolphinscheduler/issues?q=is%3Aissue) and found no similar issues. ### What happened <img width="822" alt="process_definition" src="https://user-images.githubusercontent.com/7680235/165489435-14b3f989-9c93-4ac6-be39-bc3561fc6622.png"> The process have several global params default blank. When I run the process at "START_PROCESS" mode, the global_params could be replaced correctly, but if I run the process at "COMPLEMENT_DATA" mode, the replace string all loss. In database, table t_ds_process_instance: Both two modes have the correct command_param, but only "START_PROCESS" have the correct replaced global_params, "COMPLEMENT_DATA" only have the same as process defined. "START_PROCESS": ![correct](https://user-images.githubusercontent.com/7680235/165491987-2757d3df-4635-42ce-9f94-4a302c4c6fdc.jpg) "COMPLEMENT_DATA": ![wrong](https://user-images.githubusercontent.com/7680235/165492073-bb7b581d-026e-4137-aa15-f6277a69079d.jpg) ### What you expected to happen Global params can be replaced correctly at "COMPLEMENT_DATA" mode. ### How to reproduce Create a new process, set some global params default blank. try run at START_PROCESS and COMPLEMENT_DATA mode, see different in t_ds_process_instance. ### Anything else _No response_ ### Version 2.0.3 ### Are you willing to submit PR? - [ ] Yes I am willing to submit a PR! ### Code of Conduct - [X] I agree to follow this project's [Code of Conduct](https://www.apache.org/foundation/policies/conduct)
https://github.com/apache/dolphinscheduler/issues/9811
https://github.com/apache/dolphinscheduler/pull/9952
bc1c15b142ea02cdbd9533e890f8f0af897d1cec
d4aeee16e5f3f67e37a31fa606acf0b313189655
2022-04-27T09:55:39Z
java
2022-05-11T10:37:03Z
dolphinscheduler-service/src/main/java/org/apache/dolphinscheduler/service/process/ProcessServiceImpl.java
return environment; } /** * check command parameters is valid * * @param command command * @param cmdParam cmdParam map * @return whether command param is valid */ private Boolean checkCmdParam(Command command, Map<String, String> cmdParam) { if (command.getTaskDependType() == TaskDependType.TASK_ONLY || command.getTaskDependType() == TaskDependType.TASK_PRE) { if (cmdParam == null || !cmdParam.containsKey(Constants.CMD_PARAM_START_NODES) || cmdParam.get(Constants.CMD_PARAM_START_NODES).isEmpty()) { logger.error("command node depend type is {}, but start nodes is null ", command.getTaskDependType()); return false; } } return true; } /** * construct process instance according to one command. * * @param command command * @param host host * @return process instance */ protected ProcessInstance constructProcessInstance(Command command, String host) { ProcessInstance processInstance; ProcessDefinition processDefinition;
closed
apache/dolphinscheduler
https://github.com/apache/dolphinscheduler
9,811
[Bug] [ProcessInstance] Replace default global params value failed at "COMPLEMENT_DATA" mode
### Search before asking - [X] I had searched in the [issues](https://github.com/apache/dolphinscheduler/issues?q=is%3Aissue) and found no similar issues. ### What happened <img width="822" alt="process_definition" src="https://user-images.githubusercontent.com/7680235/165489435-14b3f989-9c93-4ac6-be39-bc3561fc6622.png"> The process have several global params default blank. When I run the process at "START_PROCESS" mode, the global_params could be replaced correctly, but if I run the process at "COMPLEMENT_DATA" mode, the replace string all loss. In database, table t_ds_process_instance: Both two modes have the correct command_param, but only "START_PROCESS" have the correct replaced global_params, "COMPLEMENT_DATA" only have the same as process defined. "START_PROCESS": ![correct](https://user-images.githubusercontent.com/7680235/165491987-2757d3df-4635-42ce-9f94-4a302c4c6fdc.jpg) "COMPLEMENT_DATA": ![wrong](https://user-images.githubusercontent.com/7680235/165492073-bb7b581d-026e-4137-aa15-f6277a69079d.jpg) ### What you expected to happen Global params can be replaced correctly at "COMPLEMENT_DATA" mode. ### How to reproduce Create a new process, set some global params default blank. try run at START_PROCESS and COMPLEMENT_DATA mode, see different in t_ds_process_instance. ### Anything else _No response_ ### Version 2.0.3 ### Are you willing to submit PR? - [ ] Yes I am willing to submit a PR! ### Code of Conduct - [X] I agree to follow this project's [Code of Conduct](https://www.apache.org/foundation/policies/conduct)
https://github.com/apache/dolphinscheduler/issues/9811
https://github.com/apache/dolphinscheduler/pull/9952
bc1c15b142ea02cdbd9533e890f8f0af897d1cec
d4aeee16e5f3f67e37a31fa606acf0b313189655
2022-04-27T09:55:39Z
java
2022-05-11T10:37:03Z
dolphinscheduler-service/src/main/java/org/apache/dolphinscheduler/service/process/ProcessServiceImpl.java
CommandType commandType = command.getCommandType(); processDefinition = this.findProcessDefinition(command.getProcessDefinitionCode(), command.getProcessDefinitionVersion()); if (processDefinition == null) { logger.error("cannot find the work process define! define code : {}", command.getProcessDefinitionCode()); return null; } Map<String, String> cmdParam = JSONUtils.toMap(command.getCommandParam()); int processInstanceId = command.getProcessInstanceId(); if (processInstanceId == 0) { processInstance = generateNewProcessInstance(processDefinition, command, cmdParam); } else { processInstance = this.findProcessInstanceDetailById(processInstanceId); if (processInstance == null) { return null; } } if (cmdParam != null) { CommandType commandTypeIfComplement = getCommandTypeIfComplement(processInstance, command); if (commandTypeIfComplement == CommandType.REPEAT_RUNNING) { setGlobalParamIfCommanded(processDefinition, cmdParam); } String timezoneId = cmdParam.get(Constants.SCHEDULE_TIMEZONE); processInstance.setGlobalParams(ParameterUtils.curingGlobalParams( processDefinition.getGlobalParamMap(), processDefinition.getGlobalParamList(), commandTypeIfComplement, processInstance.getScheduleTime(), timezoneId));
closed
apache/dolphinscheduler
https://github.com/apache/dolphinscheduler
9,811
[Bug] [ProcessInstance] Replace default global params value failed at "COMPLEMENT_DATA" mode
### Search before asking - [X] I had searched in the [issues](https://github.com/apache/dolphinscheduler/issues?q=is%3Aissue) and found no similar issues. ### What happened <img width="822" alt="process_definition" src="https://user-images.githubusercontent.com/7680235/165489435-14b3f989-9c93-4ac6-be39-bc3561fc6622.png"> The process have several global params default blank. When I run the process at "START_PROCESS" mode, the global_params could be replaced correctly, but if I run the process at "COMPLEMENT_DATA" mode, the replace string all loss. In database, table t_ds_process_instance: Both two modes have the correct command_param, but only "START_PROCESS" have the correct replaced global_params, "COMPLEMENT_DATA" only have the same as process defined. "START_PROCESS": ![correct](https://user-images.githubusercontent.com/7680235/165491987-2757d3df-4635-42ce-9f94-4a302c4c6fdc.jpg) "COMPLEMENT_DATA": ![wrong](https://user-images.githubusercontent.com/7680235/165492073-bb7b581d-026e-4137-aa15-f6277a69079d.jpg) ### What you expected to happen Global params can be replaced correctly at "COMPLEMENT_DATA" mode. ### How to reproduce Create a new process, set some global params default blank. try run at START_PROCESS and COMPLEMENT_DATA mode, see different in t_ds_process_instance. ### Anything else _No response_ ### Version 2.0.3 ### Are you willing to submit PR? - [ ] Yes I am willing to submit a PR! ### Code of Conduct - [X] I agree to follow this project's [Code of Conduct](https://www.apache.org/foundation/policies/conduct)
https://github.com/apache/dolphinscheduler/issues/9811
https://github.com/apache/dolphinscheduler/pull/9952
bc1c15b142ea02cdbd9533e890f8f0af897d1cec
d4aeee16e5f3f67e37a31fa606acf0b313189655
2022-04-27T09:55:39Z
java
2022-05-11T10:37:03Z
dolphinscheduler-service/src/main/java/org/apache/dolphinscheduler/service/process/ProcessServiceImpl.java
processInstance.setProcessDefinition(processDefinition); } if (processInstance.getCommandParam() != null) { Map<String, String> processCmdParam = JSONUtils.toMap(processInstance.getCommandParam()); processCmdParam.forEach((key, value) -> { if (!cmdParam.containsKey(key)) { cmdParam.put(key, value); } }); } if (cmdParam != null && cmdParam.containsKey(Constants.CMD_PARAM_SUB_PROCESS)) { processInstance.setCommandParam(command.getCommandParam()); } if (Boolean.FALSE.equals(checkCmdParam(command, cmdParam))) { logger.error("command parameter check failed!"); return null; } if (command.getScheduleTime() != null) { processInstance.setScheduleTime(command.getScheduleTime()); } processInstance.setHost(host); processInstance.setRestartTime(new Date()); ExecutionStatus runStatus = ExecutionStatus.RUNNING_EXECUTION; int runTime = processInstance.getRunTimes(); switch (commandType) { case START_PROCESS: break; case START_FAILURE_TASK_PROCESS:
closed
apache/dolphinscheduler
https://github.com/apache/dolphinscheduler
9,811
[Bug] [ProcessInstance] Replace default global params value failed at "COMPLEMENT_DATA" mode
### Search before asking - [X] I had searched in the [issues](https://github.com/apache/dolphinscheduler/issues?q=is%3Aissue) and found no similar issues. ### What happened <img width="822" alt="process_definition" src="https://user-images.githubusercontent.com/7680235/165489435-14b3f989-9c93-4ac6-be39-bc3561fc6622.png"> The process have several global params default blank. When I run the process at "START_PROCESS" mode, the global_params could be replaced correctly, but if I run the process at "COMPLEMENT_DATA" mode, the replace string all loss. In database, table t_ds_process_instance: Both two modes have the correct command_param, but only "START_PROCESS" have the correct replaced global_params, "COMPLEMENT_DATA" only have the same as process defined. "START_PROCESS": ![correct](https://user-images.githubusercontent.com/7680235/165491987-2757d3df-4635-42ce-9f94-4a302c4c6fdc.jpg) "COMPLEMENT_DATA": ![wrong](https://user-images.githubusercontent.com/7680235/165492073-bb7b581d-026e-4137-aa15-f6277a69079d.jpg) ### What you expected to happen Global params can be replaced correctly at "COMPLEMENT_DATA" mode. ### How to reproduce Create a new process, set some global params default blank. try run at START_PROCESS and COMPLEMENT_DATA mode, see different in t_ds_process_instance. ### Anything else _No response_ ### Version 2.0.3 ### Are you willing to submit PR? - [ ] Yes I am willing to submit a PR! ### Code of Conduct - [X] I agree to follow this project's [Code of Conduct](https://www.apache.org/foundation/policies/conduct)
https://github.com/apache/dolphinscheduler/issues/9811
https://github.com/apache/dolphinscheduler/pull/9952
bc1c15b142ea02cdbd9533e890f8f0af897d1cec
d4aeee16e5f3f67e37a31fa606acf0b313189655
2022-04-27T09:55:39Z
java
2022-05-11T10:37:03Z
dolphinscheduler-service/src/main/java/org/apache/dolphinscheduler/service/process/ProcessServiceImpl.java
List<Integer> failedList = this.findTaskIdByInstanceState(processInstance.getId(), ExecutionStatus.FAILURE); List<Integer> toleranceList = this.findTaskIdByInstanceState(processInstance.getId(), ExecutionStatus.NEED_FAULT_TOLERANCE); List<Integer> killedList = this.findTaskIdByInstanceState(processInstance.getId(), ExecutionStatus.KILL); cmdParam.remove(Constants.CMD_PARAM_RECOVERY_START_NODE_STRING); failedList.addAll(killedList); failedList.addAll(toleranceList); for (Integer taskId : failedList) { initTaskInstance(this.findTaskInstanceById(taskId)); } cmdParam.put(Constants.CMD_PARAM_RECOVERY_START_NODE_STRING, String.join(Constants.COMMA, convertIntListToString(failedList))); processInstance.setCommandParam(JSONUtils.toJsonString(cmdParam)); processInstance.setRunTimes(runTime + 1); break; case START_CURRENT_TASK_PROCESS: break; case RECOVER_WAITING_THREAD: break; case RECOVER_SUSPENDED_PROCESS: cmdParam.remove(Constants.CMD_PARAM_RECOVERY_START_NODE_STRING); List<Integer> suspendedNodeList = this.findTaskIdByInstanceState(processInstance.getId(), ExecutionStatus.PAUSE); List<Integer> stopNodeList = findTaskIdByInstanceState(processInstance.getId(), ExecutionStatus.KILL); suspendedNodeList.addAll(stopNodeList); for (Integer taskId : suspendedNodeList) { initTaskInstance(this.findTaskInstanceById(taskId)); }
closed
apache/dolphinscheduler
https://github.com/apache/dolphinscheduler
9,811
[Bug] [ProcessInstance] Replace default global params value failed at "COMPLEMENT_DATA" mode
### Search before asking - [X] I had searched in the [issues](https://github.com/apache/dolphinscheduler/issues?q=is%3Aissue) and found no similar issues. ### What happened <img width="822" alt="process_definition" src="https://user-images.githubusercontent.com/7680235/165489435-14b3f989-9c93-4ac6-be39-bc3561fc6622.png"> The process have several global params default blank. When I run the process at "START_PROCESS" mode, the global_params could be replaced correctly, but if I run the process at "COMPLEMENT_DATA" mode, the replace string all loss. In database, table t_ds_process_instance: Both two modes have the correct command_param, but only "START_PROCESS" have the correct replaced global_params, "COMPLEMENT_DATA" only have the same as process defined. "START_PROCESS": ![correct](https://user-images.githubusercontent.com/7680235/165491987-2757d3df-4635-42ce-9f94-4a302c4c6fdc.jpg) "COMPLEMENT_DATA": ![wrong](https://user-images.githubusercontent.com/7680235/165492073-bb7b581d-026e-4137-aa15-f6277a69079d.jpg) ### What you expected to happen Global params can be replaced correctly at "COMPLEMENT_DATA" mode. ### How to reproduce Create a new process, set some global params default blank. try run at START_PROCESS and COMPLEMENT_DATA mode, see different in t_ds_process_instance. ### Anything else _No response_ ### Version 2.0.3 ### Are you willing to submit PR? - [ ] Yes I am willing to submit a PR! ### Code of Conduct - [X] I agree to follow this project's [Code of Conduct](https://www.apache.org/foundation/policies/conduct)
https://github.com/apache/dolphinscheduler/issues/9811
https://github.com/apache/dolphinscheduler/pull/9952
bc1c15b142ea02cdbd9533e890f8f0af897d1cec
d4aeee16e5f3f67e37a31fa606acf0b313189655
2022-04-27T09:55:39Z
java
2022-05-11T10:37:03Z
dolphinscheduler-service/src/main/java/org/apache/dolphinscheduler/service/process/ProcessServiceImpl.java
cmdParam.put(Constants.CMD_PARAM_RECOVERY_START_NODE_STRING, String.join(",", convertIntListToString(suspendedNodeList))); processInstance.setCommandParam(JSONUtils.toJsonString(cmdParam)); processInstance.setRunTimes(runTime + 1); break; case RECOVER_TOLERANCE_FAULT_PROCESS: processInstance.setRecovery(Flag.YES); runStatus = processInstance.getState(); break; case COMPLEMENT_DATA: if (processInstance.getId() != 0) { List<TaskInstance> taskInstanceList = this.findValidTaskListByProcessId(processInstance.getId()); for (TaskInstance taskInstance : taskInstanceList) { taskInstance.setFlag(Flag.NO); this.updateTaskInstance(taskInstance); } } break; case REPEAT_RUNNING: if (cmdParam.containsKey(Constants.CMD_PARAM_RECOVERY_START_NODE_STRING)) { cmdParam.remove(Constants.CMD_PARAM_RECOVERY_START_NODE_STRING); processInstance.setCommandParam(JSONUtils.toJsonString(cmdParam)); } List<TaskInstance> validTaskList = findValidTaskListByProcessId(processInstance.getId()); for (TaskInstance taskInstance : validTaskList) { taskInstance.setFlag(Flag.NO); updateTaskInstance(taskInstance);
closed
apache/dolphinscheduler
https://github.com/apache/dolphinscheduler
9,811
[Bug] [ProcessInstance] Replace default global params value failed at "COMPLEMENT_DATA" mode
### Search before asking - [X] I had searched in the [issues](https://github.com/apache/dolphinscheduler/issues?q=is%3Aissue) and found no similar issues. ### What happened <img width="822" alt="process_definition" src="https://user-images.githubusercontent.com/7680235/165489435-14b3f989-9c93-4ac6-be39-bc3561fc6622.png"> The process have several global params default blank. When I run the process at "START_PROCESS" mode, the global_params could be replaced correctly, but if I run the process at "COMPLEMENT_DATA" mode, the replace string all loss. In database, table t_ds_process_instance: Both two modes have the correct command_param, but only "START_PROCESS" have the correct replaced global_params, "COMPLEMENT_DATA" only have the same as process defined. "START_PROCESS": ![correct](https://user-images.githubusercontent.com/7680235/165491987-2757d3df-4635-42ce-9f94-4a302c4c6fdc.jpg) "COMPLEMENT_DATA": ![wrong](https://user-images.githubusercontent.com/7680235/165492073-bb7b581d-026e-4137-aa15-f6277a69079d.jpg) ### What you expected to happen Global params can be replaced correctly at "COMPLEMENT_DATA" mode. ### How to reproduce Create a new process, set some global params default blank. try run at START_PROCESS and COMPLEMENT_DATA mode, see different in t_ds_process_instance. ### Anything else _No response_ ### Version 2.0.3 ### Are you willing to submit PR? - [ ] Yes I am willing to submit a PR! ### Code of Conduct - [X] I agree to follow this project's [Code of Conduct](https://www.apache.org/foundation/policies/conduct)
https://github.com/apache/dolphinscheduler/issues/9811
https://github.com/apache/dolphinscheduler/pull/9952
bc1c15b142ea02cdbd9533e890f8f0af897d1cec
d4aeee16e5f3f67e37a31fa606acf0b313189655
2022-04-27T09:55:39Z
java
2022-05-11T10:37:03Z
dolphinscheduler-service/src/main/java/org/apache/dolphinscheduler/service/process/ProcessServiceImpl.java
} processInstance.setStartTime(new Date()); processInstance.setRestartTime(processInstance.getStartTime()); processInstance.setEndTime(null); processInstance.setRunTimes(runTime + 1); initComplementDataParam(processDefinition, processInstance, cmdParam); break; case SCHEDULER: break; default: break; } processInstance.setState(runStatus); return processInstance; } /** * get process definition by command * If it is a fault-tolerant command, get the specified version of ProcessDefinition through ProcessInstance * Otherwise, get the latest version of ProcessDefinition * * @return ProcessDefinition */ private ProcessDefinition getProcessDefinitionByCommand(long processDefinitionCode, Map<String, String> cmdParam) { if (cmdParam != null) { int processInstanceId = 0; if (cmdParam.containsKey(Constants.CMD_PARAM_RECOVER_PROCESS_ID_STRING)) { processInstanceId = Integer.parseInt(cmdParam.get(Constants.CMD_PARAM_RECOVER_PROCESS_ID_STRING)); } else if (cmdParam.containsKey(Constants.CMD_PARAM_SUB_PROCESS)) { processInstanceId = Integer.parseInt(cmdParam.get(Constants.CMD_PARAM_SUB_PROCESS)); } else if (cmdParam.containsKey(Constants.CMD_PARAM_RECOVERY_WAITING_THREAD)) {
closed
apache/dolphinscheduler
https://github.com/apache/dolphinscheduler
9,811
[Bug] [ProcessInstance] Replace default global params value failed at "COMPLEMENT_DATA" mode
### Search before asking - [X] I had searched in the [issues](https://github.com/apache/dolphinscheduler/issues?q=is%3Aissue) and found no similar issues. ### What happened <img width="822" alt="process_definition" src="https://user-images.githubusercontent.com/7680235/165489435-14b3f989-9c93-4ac6-be39-bc3561fc6622.png"> The process have several global params default blank. When I run the process at "START_PROCESS" mode, the global_params could be replaced correctly, but if I run the process at "COMPLEMENT_DATA" mode, the replace string all loss. In database, table t_ds_process_instance: Both two modes have the correct command_param, but only "START_PROCESS" have the correct replaced global_params, "COMPLEMENT_DATA" only have the same as process defined. "START_PROCESS": ![correct](https://user-images.githubusercontent.com/7680235/165491987-2757d3df-4635-42ce-9f94-4a302c4c6fdc.jpg) "COMPLEMENT_DATA": ![wrong](https://user-images.githubusercontent.com/7680235/165492073-bb7b581d-026e-4137-aa15-f6277a69079d.jpg) ### What you expected to happen Global params can be replaced correctly at "COMPLEMENT_DATA" mode. ### How to reproduce Create a new process, set some global params default blank. try run at START_PROCESS and COMPLEMENT_DATA mode, see different in t_ds_process_instance. ### Anything else _No response_ ### Version 2.0.3 ### Are you willing to submit PR? - [ ] Yes I am willing to submit a PR! ### Code of Conduct - [X] I agree to follow this project's [Code of Conduct](https://www.apache.org/foundation/policies/conduct)
https://github.com/apache/dolphinscheduler/issues/9811
https://github.com/apache/dolphinscheduler/pull/9952
bc1c15b142ea02cdbd9533e890f8f0af897d1cec
d4aeee16e5f3f67e37a31fa606acf0b313189655
2022-04-27T09:55:39Z
java
2022-05-11T10:37:03Z
dolphinscheduler-service/src/main/java/org/apache/dolphinscheduler/service/process/ProcessServiceImpl.java
processInstanceId = Integer.parseInt(cmdParam.get(Constants.CMD_PARAM_RECOVERY_WAITING_THREAD)); } if (processInstanceId != 0) { ProcessInstance processInstance = this.findProcessInstanceDetailById(processInstanceId); if (processInstance == null) { return null; } return processDefineLogMapper.queryByDefinitionCodeAndVersion( processInstance.getProcessDefinitionCode(), processInstance.getProcessDefinitionVersion()); } } return processDefineMapper.queryByCode(processDefinitionCode); } /** * return complement data if the process start with complement data * * @param processInstance processInstance * @param command command * @return command type */ private CommandType getCommandTypeIfComplement(ProcessInstance processInstance, Command command) { if (CommandType.COMPLEMENT_DATA == processInstance.getCmdTypeIfComplement()) { return CommandType.COMPLEMENT_DATA; } else { return command.getCommandType(); } } /** * initialize complement data parameters *
closed
apache/dolphinscheduler
https://github.com/apache/dolphinscheduler
9,811
[Bug] [ProcessInstance] Replace default global params value failed at "COMPLEMENT_DATA" mode
### Search before asking - [X] I had searched in the [issues](https://github.com/apache/dolphinscheduler/issues?q=is%3Aissue) and found no similar issues. ### What happened <img width="822" alt="process_definition" src="https://user-images.githubusercontent.com/7680235/165489435-14b3f989-9c93-4ac6-be39-bc3561fc6622.png"> The process have several global params default blank. When I run the process at "START_PROCESS" mode, the global_params could be replaced correctly, but if I run the process at "COMPLEMENT_DATA" mode, the replace string all loss. In database, table t_ds_process_instance: Both two modes have the correct command_param, but only "START_PROCESS" have the correct replaced global_params, "COMPLEMENT_DATA" only have the same as process defined. "START_PROCESS": ![correct](https://user-images.githubusercontent.com/7680235/165491987-2757d3df-4635-42ce-9f94-4a302c4c6fdc.jpg) "COMPLEMENT_DATA": ![wrong](https://user-images.githubusercontent.com/7680235/165492073-bb7b581d-026e-4137-aa15-f6277a69079d.jpg) ### What you expected to happen Global params can be replaced correctly at "COMPLEMENT_DATA" mode. ### How to reproduce Create a new process, set some global params default blank. try run at START_PROCESS and COMPLEMENT_DATA mode, see different in t_ds_process_instance. ### Anything else _No response_ ### Version 2.0.3 ### Are you willing to submit PR? - [ ] Yes I am willing to submit a PR! ### Code of Conduct - [X] I agree to follow this project's [Code of Conduct](https://www.apache.org/foundation/policies/conduct)
https://github.com/apache/dolphinscheduler/issues/9811
https://github.com/apache/dolphinscheduler/pull/9952
bc1c15b142ea02cdbd9533e890f8f0af897d1cec
d4aeee16e5f3f67e37a31fa606acf0b313189655
2022-04-27T09:55:39Z
java
2022-05-11T10:37:03Z
dolphinscheduler-service/src/main/java/org/apache/dolphinscheduler/service/process/ProcessServiceImpl.java
* @param processDefinition processDefinition * @param processInstance processInstance * @param cmdParam cmdParam */ private void initComplementDataParam(ProcessDefinition processDefinition, ProcessInstance processInstance, Map<String, String> cmdParam) { if (!processInstance.isComplementData()) { return; } Date start = DateUtils.stringToDate(cmdParam.get(CMDPARAM_COMPLEMENT_DATA_START_DATE)); Date end = DateUtils.stringToDate(cmdParam.get(CMDPARAM_COMPLEMENT_DATA_END_DATE)); List<Schedule> listSchedules = queryReleaseSchedulerListByProcessDefinitionCode(processInstance.getProcessDefinitionCode()); List<Date> complementDate = CronUtils.getSelfFireDateList(start, end, listSchedules); if (complementDate.size() > 0 && Flag.NO == processInstance.getIsSubProcess()) { processInstance.setScheduleTime(complementDate.get(0)); } String timezoneId = cmdParam.get(Constants.SCHEDULE_TIMEZONE); processInstance.setGlobalParams(ParameterUtils.curingGlobalParams( processDefinition.getGlobalParamMap(), processDefinition.getGlobalParamList(), CommandType.COMPLEMENT_DATA, processInstance.getScheduleTime(), timezoneId)); } /** * set sub work process parameters. * handle sub work process instance, update relation table and command parameters * set sub work process flag, extends parent work process command parameters *
closed
apache/dolphinscheduler
https://github.com/apache/dolphinscheduler
9,811
[Bug] [ProcessInstance] Replace default global params value failed at "COMPLEMENT_DATA" mode
### Search before asking - [X] I had searched in the [issues](https://github.com/apache/dolphinscheduler/issues?q=is%3Aissue) and found no similar issues. ### What happened <img width="822" alt="process_definition" src="https://user-images.githubusercontent.com/7680235/165489435-14b3f989-9c93-4ac6-be39-bc3561fc6622.png"> The process have several global params default blank. When I run the process at "START_PROCESS" mode, the global_params could be replaced correctly, but if I run the process at "COMPLEMENT_DATA" mode, the replace string all loss. In database, table t_ds_process_instance: Both two modes have the correct command_param, but only "START_PROCESS" have the correct replaced global_params, "COMPLEMENT_DATA" only have the same as process defined. "START_PROCESS": ![correct](https://user-images.githubusercontent.com/7680235/165491987-2757d3df-4635-42ce-9f94-4a302c4c6fdc.jpg) "COMPLEMENT_DATA": ![wrong](https://user-images.githubusercontent.com/7680235/165492073-bb7b581d-026e-4137-aa15-f6277a69079d.jpg) ### What you expected to happen Global params can be replaced correctly at "COMPLEMENT_DATA" mode. ### How to reproduce Create a new process, set some global params default blank. try run at START_PROCESS and COMPLEMENT_DATA mode, see different in t_ds_process_instance. ### Anything else _No response_ ### Version 2.0.3 ### Are you willing to submit PR? - [ ] Yes I am willing to submit a PR! ### Code of Conduct - [X] I agree to follow this project's [Code of Conduct](https://www.apache.org/foundation/policies/conduct)
https://github.com/apache/dolphinscheduler/issues/9811
https://github.com/apache/dolphinscheduler/pull/9952
bc1c15b142ea02cdbd9533e890f8f0af897d1cec
d4aeee16e5f3f67e37a31fa606acf0b313189655
2022-04-27T09:55:39Z
java
2022-05-11T10:37:03Z
dolphinscheduler-service/src/main/java/org/apache/dolphinscheduler/service/process/ProcessServiceImpl.java
* @param subProcessInstance subProcessInstance */ @Override public void setSubProcessParam(ProcessInstance subProcessInstance) { String cmdParam = subProcessInstance.getCommandParam(); if (StringUtils.isEmpty(cmdParam)) { return; } Map<String, String> paramMap = JSONUtils.toMap(cmdParam); if (paramMap.containsKey(CMD_PARAM_SUB_PROCESS) && CMD_PARAM_EMPTY_SUB_PROCESS.equals(paramMap.get(CMD_PARAM_SUB_PROCESS))) { paramMap.remove(CMD_PARAM_SUB_PROCESS); paramMap.put(CMD_PARAM_SUB_PROCESS, String.valueOf(subProcessInstance.getId())); subProcessInstance.setCommandParam(JSONUtils.toJsonString(paramMap)); subProcessInstance.setIsSubProcess(Flag.YES); this.saveProcessInstance(subProcessInstance); } String parentInstanceId = paramMap.get(CMD_PARAM_SUB_PROCESS_PARENT_INSTANCE_ID); if (StringUtils.isNotEmpty(parentInstanceId)) { ProcessInstance parentInstance = findProcessInstanceDetailById(Integer.parseInt(parentInstanceId)); if (parentInstance != null) { subProcessInstance.setGlobalParams(joinGlobalParams(parentInstance.getGlobalParams(), subProcessInstance.getGlobalParams())); subProcessInstance.setVarPool(joinVarPool(parentInstance.getVarPool(), subProcessInstance.getVarPool())); this.saveProcessInstance(subProcessInstance); } else { logger.error("sub process command params error, cannot find parent instance: {} ", cmdParam); } }
closed
apache/dolphinscheduler
https://github.com/apache/dolphinscheduler
9,811
[Bug] [ProcessInstance] Replace default global params value failed at "COMPLEMENT_DATA" mode
### Search before asking - [X] I had searched in the [issues](https://github.com/apache/dolphinscheduler/issues?q=is%3Aissue) and found no similar issues. ### What happened <img width="822" alt="process_definition" src="https://user-images.githubusercontent.com/7680235/165489435-14b3f989-9c93-4ac6-be39-bc3561fc6622.png"> The process have several global params default blank. When I run the process at "START_PROCESS" mode, the global_params could be replaced correctly, but if I run the process at "COMPLEMENT_DATA" mode, the replace string all loss. In database, table t_ds_process_instance: Both two modes have the correct command_param, but only "START_PROCESS" have the correct replaced global_params, "COMPLEMENT_DATA" only have the same as process defined. "START_PROCESS": ![correct](https://user-images.githubusercontent.com/7680235/165491987-2757d3df-4635-42ce-9f94-4a302c4c6fdc.jpg) "COMPLEMENT_DATA": ![wrong](https://user-images.githubusercontent.com/7680235/165492073-bb7b581d-026e-4137-aa15-f6277a69079d.jpg) ### What you expected to happen Global params can be replaced correctly at "COMPLEMENT_DATA" mode. ### How to reproduce Create a new process, set some global params default blank. try run at START_PROCESS and COMPLEMENT_DATA mode, see different in t_ds_process_instance. ### Anything else _No response_ ### Version 2.0.3 ### Are you willing to submit PR? - [ ] Yes I am willing to submit a PR! ### Code of Conduct - [X] I agree to follow this project's [Code of Conduct](https://www.apache.org/foundation/policies/conduct)
https://github.com/apache/dolphinscheduler/issues/9811
https://github.com/apache/dolphinscheduler/pull/9952
bc1c15b142ea02cdbd9533e890f8f0af897d1cec
d4aeee16e5f3f67e37a31fa606acf0b313189655
2022-04-27T09:55:39Z
java
2022-05-11T10:37:03Z
dolphinscheduler-service/src/main/java/org/apache/dolphinscheduler/service/process/ProcessServiceImpl.java
ProcessInstanceMap processInstanceMap = JSONUtils.parseObject(cmdParam, ProcessInstanceMap.class); if (processInstanceMap == null || processInstanceMap.getParentProcessInstanceId() == 0) { return; } processInstanceMap.setProcessInstanceId(subProcessInstance.getId()); this.updateWorkProcessInstanceMap(processInstanceMap); } /** * join parent global params into sub process. * only the keys doesn't in sub process global would be joined. * * @param parentGlobalParams parentGlobalParams * @param subGlobalParams subGlobalParams * @return global params join */ private String joinGlobalParams(String parentGlobalParams, String subGlobalParams) { List<Property> parentParams = Lists.newArrayList(JSONUtils.toList(parentGlobalParams, Property.class)); List<Property> subParams = JSONUtils.toList(subGlobalParams, Property.class); Set<String> parentParamKeys = parentParams.stream().map(Property::getProp).collect(toSet()); List<Property> extraSubParams = subParams.stream() .filter(subProp -> !parentParamKeys.contains(subProp.getProp())).collect(Collectors.toList()); parentParams.addAll(extraSubParams); return JSONUtils.toJsonString(parentParams);
closed
apache/dolphinscheduler
https://github.com/apache/dolphinscheduler
9,811
[Bug] [ProcessInstance] Replace default global params value failed at "COMPLEMENT_DATA" mode
### Search before asking - [X] I had searched in the [issues](https://github.com/apache/dolphinscheduler/issues?q=is%3Aissue) and found no similar issues. ### What happened <img width="822" alt="process_definition" src="https://user-images.githubusercontent.com/7680235/165489435-14b3f989-9c93-4ac6-be39-bc3561fc6622.png"> The process have several global params default blank. When I run the process at "START_PROCESS" mode, the global_params could be replaced correctly, but if I run the process at "COMPLEMENT_DATA" mode, the replace string all loss. In database, table t_ds_process_instance: Both two modes have the correct command_param, but only "START_PROCESS" have the correct replaced global_params, "COMPLEMENT_DATA" only have the same as process defined. "START_PROCESS": ![correct](https://user-images.githubusercontent.com/7680235/165491987-2757d3df-4635-42ce-9f94-4a302c4c6fdc.jpg) "COMPLEMENT_DATA": ![wrong](https://user-images.githubusercontent.com/7680235/165492073-bb7b581d-026e-4137-aa15-f6277a69079d.jpg) ### What you expected to happen Global params can be replaced correctly at "COMPLEMENT_DATA" mode. ### How to reproduce Create a new process, set some global params default blank. try run at START_PROCESS and COMPLEMENT_DATA mode, see different in t_ds_process_instance. ### Anything else _No response_ ### Version 2.0.3 ### Are you willing to submit PR? - [ ] Yes I am willing to submit a PR! ### Code of Conduct - [X] I agree to follow this project's [Code of Conduct](https://www.apache.org/foundation/policies/conduct)
https://github.com/apache/dolphinscheduler/issues/9811
https://github.com/apache/dolphinscheduler/pull/9952
bc1c15b142ea02cdbd9533e890f8f0af897d1cec
d4aeee16e5f3f67e37a31fa606acf0b313189655
2022-04-27T09:55:39Z
java
2022-05-11T10:37:03Z
dolphinscheduler-service/src/main/java/org/apache/dolphinscheduler/service/process/ProcessServiceImpl.java
} /** * join parent var pool params into sub process. * only the keys doesn't in sub process global would be joined. * * @param parentValPool * @param subValPool * @return */ private String joinVarPool(String parentValPool, String subValPool) { List<Property> parentValPools = Lists.newArrayList(JSONUtils.toList(parentValPool, Property.class)); parentValPools = parentValPools.stream().filter(valPool -> valPool.getDirect() == Direct.OUT).collect(Collectors.toList()); List<Property> subValPools = Lists.newArrayList(JSONUtils.toList(subValPool, Property.class)); Set<String> parentValPoolKeys = parentValPools.stream().map(Property::getProp).collect(toSet()); List<Property> extraSubValPools = subValPools.stream().filter(sub -> !parentValPoolKeys.contains(sub.getProp())).collect(Collectors.toList()); parentValPools.addAll(extraSubValPools); return JSONUtils.toJsonString(parentValPools); } /** * initialize task instance * * @param taskInstance taskInstance */ private void initTaskInstance(TaskInstance taskInstance) { if (!taskInstance.isSubProcess() && (taskInstance.getState().typeIsCancel() || taskInstance.getState().typeIsFailure())) { taskInstance.setFlag(Flag.NO); updateTaskInstance(taskInstance); return; }
closed
apache/dolphinscheduler
https://github.com/apache/dolphinscheduler
9,811
[Bug] [ProcessInstance] Replace default global params value failed at "COMPLEMENT_DATA" mode
### Search before asking - [X] I had searched in the [issues](https://github.com/apache/dolphinscheduler/issues?q=is%3Aissue) and found no similar issues. ### What happened <img width="822" alt="process_definition" src="https://user-images.githubusercontent.com/7680235/165489435-14b3f989-9c93-4ac6-be39-bc3561fc6622.png"> The process have several global params default blank. When I run the process at "START_PROCESS" mode, the global_params could be replaced correctly, but if I run the process at "COMPLEMENT_DATA" mode, the replace string all loss. In database, table t_ds_process_instance: Both two modes have the correct command_param, but only "START_PROCESS" have the correct replaced global_params, "COMPLEMENT_DATA" only have the same as process defined. "START_PROCESS": ![correct](https://user-images.githubusercontent.com/7680235/165491987-2757d3df-4635-42ce-9f94-4a302c4c6fdc.jpg) "COMPLEMENT_DATA": ![wrong](https://user-images.githubusercontent.com/7680235/165492073-bb7b581d-026e-4137-aa15-f6277a69079d.jpg) ### What you expected to happen Global params can be replaced correctly at "COMPLEMENT_DATA" mode. ### How to reproduce Create a new process, set some global params default blank. try run at START_PROCESS and COMPLEMENT_DATA mode, see different in t_ds_process_instance. ### Anything else _No response_ ### Version 2.0.3 ### Are you willing to submit PR? - [ ] Yes I am willing to submit a PR! ### Code of Conduct - [X] I agree to follow this project's [Code of Conduct](https://www.apache.org/foundation/policies/conduct)
https://github.com/apache/dolphinscheduler/issues/9811
https://github.com/apache/dolphinscheduler/pull/9952
bc1c15b142ea02cdbd9533e890f8f0af897d1cec
d4aeee16e5f3f67e37a31fa606acf0b313189655
2022-04-27T09:55:39Z
java
2022-05-11T10:37:03Z
dolphinscheduler-service/src/main/java/org/apache/dolphinscheduler/service/process/ProcessServiceImpl.java
taskInstance.setState(ExecutionStatus.SUBMITTED_SUCCESS); updateTaskInstance(taskInstance); } /** * retry submit task to db */ @Override public TaskInstance submitTaskWithRetry(ProcessInstance processInstance, TaskInstance taskInstance, int commitRetryTimes, int commitInterval) { int retryTimes = 1; TaskInstance task = null; while (retryTimes <= commitRetryTimes) { try { task = SpringApplicationContext.getBean(ProcessService.class).submitTask(processInstance, taskInstance); if (task != null && task.getId() != 0) { break; } logger.error("task commit to db failed , taskId {} has already retry {} times, please check the database", taskInstance.getId(), retryTimes); Thread.sleep(commitInterval); } catch (Exception e) { logger.error("task commit to db failed", e); } retryTimes += 1; } return task; } /** * submit task to db * submit sub process to command *
closed
apache/dolphinscheduler
https://github.com/apache/dolphinscheduler
9,811
[Bug] [ProcessInstance] Replace default global params value failed at "COMPLEMENT_DATA" mode
### Search before asking - [X] I had searched in the [issues](https://github.com/apache/dolphinscheduler/issues?q=is%3Aissue) and found no similar issues. ### What happened <img width="822" alt="process_definition" src="https://user-images.githubusercontent.com/7680235/165489435-14b3f989-9c93-4ac6-be39-bc3561fc6622.png"> The process have several global params default blank. When I run the process at "START_PROCESS" mode, the global_params could be replaced correctly, but if I run the process at "COMPLEMENT_DATA" mode, the replace string all loss. In database, table t_ds_process_instance: Both two modes have the correct command_param, but only "START_PROCESS" have the correct replaced global_params, "COMPLEMENT_DATA" only have the same as process defined. "START_PROCESS": ![correct](https://user-images.githubusercontent.com/7680235/165491987-2757d3df-4635-42ce-9f94-4a302c4c6fdc.jpg) "COMPLEMENT_DATA": ![wrong](https://user-images.githubusercontent.com/7680235/165492073-bb7b581d-026e-4137-aa15-f6277a69079d.jpg) ### What you expected to happen Global params can be replaced correctly at "COMPLEMENT_DATA" mode. ### How to reproduce Create a new process, set some global params default blank. try run at START_PROCESS and COMPLEMENT_DATA mode, see different in t_ds_process_instance. ### Anything else _No response_ ### Version 2.0.3 ### Are you willing to submit PR? - [ ] Yes I am willing to submit a PR! ### Code of Conduct - [X] I agree to follow this project's [Code of Conduct](https://www.apache.org/foundation/policies/conduct)
https://github.com/apache/dolphinscheduler/issues/9811
https://github.com/apache/dolphinscheduler/pull/9952
bc1c15b142ea02cdbd9533e890f8f0af897d1cec
d4aeee16e5f3f67e37a31fa606acf0b313189655
2022-04-27T09:55:39Z
java
2022-05-11T10:37:03Z
dolphinscheduler-service/src/main/java/org/apache/dolphinscheduler/service/process/ProcessServiceImpl.java
* @param processInstance processInstance * @param taskInstance taskInstance * @return task instance */ @Override @Transactional(rollbackFor = Exception.class) public TaskInstance submitTask(ProcessInstance processInstance, TaskInstance taskInstance) { logger.info("start submit task : {}, instance id:{}, state: {}", taskInstance.getName(), taskInstance.getProcessInstanceId(), processInstance.getState()); TaskInstance task = submitTaskInstanceToDB(taskInstance, processInstance); if (task == null) { logger.error("end submit task to db error, task name:{}, process id:{} state: {} ", taskInstance.getName(), taskInstance.getProcessInstance(), processInstance.getState()); return null; } if (!task.getState().typeIsFinished()) { createSubWorkProcess(processInstance, task); } logger.info("end submit task to db successfully:{} {} state:{} complete, instance id:{} state: {} ", taskInstance.getId(), taskInstance.getName(), task.getState(), processInstance.getId(), processInstance.getState()); return task; } /** * set work process instance map * consider o * repeat running does not generate new sub process instance * set map {parent instance id, task instance id, 0(child instance id)} * * @param parentInstance parentInstance
closed
apache/dolphinscheduler
https://github.com/apache/dolphinscheduler
9,811
[Bug] [ProcessInstance] Replace default global params value failed at "COMPLEMENT_DATA" mode
### Search before asking - [X] I had searched in the [issues](https://github.com/apache/dolphinscheduler/issues?q=is%3Aissue) and found no similar issues. ### What happened <img width="822" alt="process_definition" src="https://user-images.githubusercontent.com/7680235/165489435-14b3f989-9c93-4ac6-be39-bc3561fc6622.png"> The process have several global params default blank. When I run the process at "START_PROCESS" mode, the global_params could be replaced correctly, but if I run the process at "COMPLEMENT_DATA" mode, the replace string all loss. In database, table t_ds_process_instance: Both two modes have the correct command_param, but only "START_PROCESS" have the correct replaced global_params, "COMPLEMENT_DATA" only have the same as process defined. "START_PROCESS": ![correct](https://user-images.githubusercontent.com/7680235/165491987-2757d3df-4635-42ce-9f94-4a302c4c6fdc.jpg) "COMPLEMENT_DATA": ![wrong](https://user-images.githubusercontent.com/7680235/165492073-bb7b581d-026e-4137-aa15-f6277a69079d.jpg) ### What you expected to happen Global params can be replaced correctly at "COMPLEMENT_DATA" mode. ### How to reproduce Create a new process, set some global params default blank. try run at START_PROCESS and COMPLEMENT_DATA mode, see different in t_ds_process_instance. ### Anything else _No response_ ### Version 2.0.3 ### Are you willing to submit PR? - [ ] Yes I am willing to submit a PR! ### Code of Conduct - [X] I agree to follow this project's [Code of Conduct](https://www.apache.org/foundation/policies/conduct)
https://github.com/apache/dolphinscheduler/issues/9811
https://github.com/apache/dolphinscheduler/pull/9952
bc1c15b142ea02cdbd9533e890f8f0af897d1cec
d4aeee16e5f3f67e37a31fa606acf0b313189655
2022-04-27T09:55:39Z
java
2022-05-11T10:37:03Z
dolphinscheduler-service/src/main/java/org/apache/dolphinscheduler/service/process/ProcessServiceImpl.java
* @param parentTask parentTask * @return process instance map */ private ProcessInstanceMap setProcessInstanceMap(ProcessInstance parentInstance, TaskInstance parentTask) { ProcessInstanceMap processMap = findWorkProcessMapByParent(parentInstance.getId(), parentTask.getId()); if (processMap != null) { return processMap; } if (parentInstance.getCommandType() == CommandType.REPEAT_RUNNING) { processMap = findPreviousTaskProcessMap(parentInstance, parentTask); if (processMap != null) { processMap.setParentTaskInstanceId(parentTask.getId()); updateWorkProcessInstanceMap(processMap); return processMap; } } processMap = new ProcessInstanceMap(); processMap.setParentProcessInstanceId(parentInstance.getId()); processMap.setParentTaskInstanceId(parentTask.getId()); createWorkProcessInstanceMap(processMap); return processMap; } /** * find previous task work process map. * * @param parentProcessInstance parentProcessInstance * @param parentTask parentTask * @return process instance map
closed
apache/dolphinscheduler
https://github.com/apache/dolphinscheduler
9,811
[Bug] [ProcessInstance] Replace default global params value failed at "COMPLEMENT_DATA" mode
### Search before asking - [X] I had searched in the [issues](https://github.com/apache/dolphinscheduler/issues?q=is%3Aissue) and found no similar issues. ### What happened <img width="822" alt="process_definition" src="https://user-images.githubusercontent.com/7680235/165489435-14b3f989-9c93-4ac6-be39-bc3561fc6622.png"> The process have several global params default blank. When I run the process at "START_PROCESS" mode, the global_params could be replaced correctly, but if I run the process at "COMPLEMENT_DATA" mode, the replace string all loss. In database, table t_ds_process_instance: Both two modes have the correct command_param, but only "START_PROCESS" have the correct replaced global_params, "COMPLEMENT_DATA" only have the same as process defined. "START_PROCESS": ![correct](https://user-images.githubusercontent.com/7680235/165491987-2757d3df-4635-42ce-9f94-4a302c4c6fdc.jpg) "COMPLEMENT_DATA": ![wrong](https://user-images.githubusercontent.com/7680235/165492073-bb7b581d-026e-4137-aa15-f6277a69079d.jpg) ### What you expected to happen Global params can be replaced correctly at "COMPLEMENT_DATA" mode. ### How to reproduce Create a new process, set some global params default blank. try run at START_PROCESS and COMPLEMENT_DATA mode, see different in t_ds_process_instance. ### Anything else _No response_ ### Version 2.0.3 ### Are you willing to submit PR? - [ ] Yes I am willing to submit a PR! ### Code of Conduct - [X] I agree to follow this project's [Code of Conduct](https://www.apache.org/foundation/policies/conduct)
https://github.com/apache/dolphinscheduler/issues/9811
https://github.com/apache/dolphinscheduler/pull/9952
bc1c15b142ea02cdbd9533e890f8f0af897d1cec
d4aeee16e5f3f67e37a31fa606acf0b313189655
2022-04-27T09:55:39Z
java
2022-05-11T10:37:03Z
dolphinscheduler-service/src/main/java/org/apache/dolphinscheduler/service/process/ProcessServiceImpl.java
*/ private ProcessInstanceMap findPreviousTaskProcessMap(ProcessInstance parentProcessInstance, TaskInstance parentTask) { Integer preTaskId = 0; List<TaskInstance> preTaskList = this.findPreviousTaskListByWorkProcessId(parentProcessInstance.getId()); for (TaskInstance task : preTaskList) { if (task.getName().equals(parentTask.getName())) { preTaskId = task.getId(); ProcessInstanceMap map = findWorkProcessMapByParent(parentProcessInstance.getId(), preTaskId); if (map != null) { return map; } } } logger.info("sub process instance is not found,parent task:{},parent instance:{}", parentTask.getId(), parentProcessInstance.getId()); return null; } /** * create sub work process command * * @param parentProcessInstance parentProcessInstance * @param task task */ @Override public void createSubWorkProcess(ProcessInstance parentProcessInstance, TaskInstance task) { if (!task.isSubProcess()) { return; }