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
unknown
language
stringclasses
5 values
commit_datetime
unknown
updated_file
stringlengths
7
188
chunk_content
stringlengths
1
1.03M
closed
apache/dolphinscheduler
https://github.com/apache/dolphinscheduler
6,194
[Bug] [Server] Master build dag error
### 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 Perform multi version tasks ![image](https://user-images.githubusercontent.com/42576980/133109069-2b465273-4ebb-4f83-b9b4-ae0f8bce473d.png) ### What you expected to happen Normal execution ### How to reproduce Perform multi version tasks ### Anything else _No response_ ### Are you willing to submit PR? - [X] 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/6194
https://github.com/apache/dolphinscheduler/pull/6195
7029062f4c2f247e9eac333e28e36e66b03fb435
71e2c8808b3a0871619af4968dfaaa423a90b4c6
"2021-09-13T15:09:21Z"
java
"2021-09-14T03:46:47Z"
dolphinscheduler-server/src/main/java/org/apache/dolphinscheduler/server/master/runner/WorkflowExecuteThread.java
taskInstance.setTaskParams(taskNode.getTaskParams()); 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(); 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;
closed
apache/dolphinscheduler
https://github.com/apache/dolphinscheduler
6,194
[Bug] [Server] Master build dag error
### 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 Perform multi version tasks ![image](https://user-images.githubusercontent.com/42576980/133109069-2b465273-4ebb-4f83-b9b4-ae0f8bce473d.png) ### What you expected to happen Normal execution ### How to reproduce Perform multi version tasks ### Anything else _No response_ ### Are you willing to submit PR? - [X] 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/6194
https://github.com/apache/dolphinscheduler/pull/6195
7029062f4c2f247e9eac333e28e36e66b03fb435
71e2c8808b3a0871619af4968dfaaa423a90b4c6
"2021-09-13T15:09:21Z"
java
"2021-09-14T03:46:47Z"
dolphinscheduler-server/src/main/java/org/apache/dolphinscheduler/server/master/runner/WorkflowExecuteThread.java
} 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 preTaskName : preTask) { TaskInstance preTaskInstance = completeTaskLst.get(preTaskName); f (preTaskInstance == null) { 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())); } } } 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)) {
closed
apache/dolphinscheduler
https://github.com/apache/dolphinscheduler
6,194
[Bug] [Server] Master build dag error
### 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 Perform multi version tasks ![image](https://user-images.githubusercontent.com/42576980/133109069-2b465273-4ebb-4f83-b9b4-ae0f8bce473d.png) ### What you expected to happen Normal execution ### How to reproduce Perform multi version tasks ### Anything else _No response_ ### Are you willing to submit PR? - [X] 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/6194
https://github.com/apache/dolphinscheduler/pull/6195
7029062f4c2f247e9eac333e28e36e66b03fb435
71e2c8808b3a0871619af4968dfaaa423a90b4c6
"2021-09-13T15:09:21Z"
java
"2021-09-14T03:46:47Z"
dolphinscheduler-server/src/main/java/org/apache/dolphinscheduler/server/master/runner/WorkflowExecuteThread.java
Property otherPro = allProperty.get(proName); f (StrngUtls.sEmpty(thsProperty.getValue())) { 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); } } prvate vod submtPostNode(Strng parentNodeName) { Set<Strng> submtTaskNodeLst = DagHelper.parsePostNodes(parentNodeName, skpTaskNodeLst, dag, completeTaskLst); Lst<TaskInstance> taskInstances = new ArrayLst<>(); for (Strng taskNode : submtTaskNodeLst) { TaskNode taskNodeObject = dag.getNode(taskNode); f (taskInstanceHashMap.contansColumn(taskNodeObject.getCode())) { contnue;
closed
apache/dolphinscheduler
https://github.com/apache/dolphinscheduler
6,194
[Bug] [Server] Master build dag error
### 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 Perform multi version tasks ![image](https://user-images.githubusercontent.com/42576980/133109069-2b465273-4ebb-4f83-b9b4-ae0f8bce473d.png) ### What you expected to happen Normal execution ### How to reproduce Perform multi version tasks ### Anything else _No response_ ### Are you willing to submit PR? - [X] 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/6194
https://github.com/apache/dolphinscheduler/pull/6195
7029062f4c2f247e9eac333e28e36e66b03fb435
71e2c8808b3a0871619af4968dfaaa423a90b4c6
"2021-09-13T15:09:21Z"
java
"2021-09-14T03:46:47Z"
dolphinscheduler-server/src/main/java/org/apache/dolphinscheduler/server/master/runner/WorkflowExecuteThread.java
} TaskInstance task = createTaskInstance(processInstance, taskNodeObject); taskInstances.add(task); } for (TaskInstance task : taskInstances) { f (readyToSubmtTaskQueue.contans(task)) { contnue; } f (completeTaskLst.contansKey(task.getName())) { 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()); } else { addTaskToStandByLst(task); } } submtStandByTask(); updateProcessInstanceState(); } /** * determne whether the dependences of the task node are complete * * @return DependResult */ prvate DependResult sTaskDepsComplete(Strng taskName) { Collecton<Strng> startNodes = dag.getBegnNode();
closed
apache/dolphinscheduler
https://github.com/apache/dolphinscheduler
6,194
[Bug] [Server] Master build dag error
### 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 Perform multi version tasks ![image](https://user-images.githubusercontent.com/42576980/133109069-2b465273-4ebb-4f83-b9b4-ae0f8bce473d.png) ### What you expected to happen Normal execution ### How to reproduce Perform multi version tasks ### Anything else _No response_ ### Are you willing to submit PR? - [X] 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/6194
https://github.com/apache/dolphinscheduler/pull/6195
7029062f4c2f247e9eac333e28e36e66b03fb435
71e2c8808b3a0871619af4968dfaaa423a90b4c6
"2021-09-13T15:09:21Z"
java
"2021-09-14T03:46:47Z"
dolphinscheduler-server/src/main/java/org/apache/dolphinscheduler/server/master/runner/WorkflowExecuteThread.java
f (startNodes.contans(taskName)) { return DependResult.SUCCESS; } TaskNode taskNode = dag.getNode(taskName); Lst<Strng> depNameLst = taskNode.getDepLst(); for (Strng depsNode : depNameLst) { f (!dag.contansNode(depsNode) || forbddenTaskLst.contansKey(depsNode) || skpTaskNodeLst.contansKey(depsNode)) { contnue; } f (!completeTaskLst.contansKey(depsNode)) { return DependResult.WAITING; } ExecutonStatus depTaskState = completeTaskLst.get(depsNode).getState(); f (depTaskState.typeIsPause() || depTaskState.typeIsCancel()) { return DependResult.NON_EXEC; } f (taskNode.sCondtonsTask()) { contnue; } f (!dependTaskSuccess(depsNode, taskName)) { return DependResult.FAILED; } } logger.nfo("taskName: {} completeDependTaskLst: {}", taskName, Arrays.toStrng(completeTaskLst.keySet().toArray())); return DependResult.SUCCESS; }
closed
apache/dolphinscheduler
https://github.com/apache/dolphinscheduler
6,194
[Bug] [Server] Master build dag error
### 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 Perform multi version tasks ![image](https://user-images.githubusercontent.com/42576980/133109069-2b465273-4ebb-4f83-b9b4-ae0f8bce473d.png) ### What you expected to happen Normal execution ### How to reproduce Perform multi version tasks ### Anything else _No response_ ### Are you willing to submit PR? - [X] 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/6194
https://github.com/apache/dolphinscheduler/pull/6195
7029062f4c2f247e9eac333e28e36e66b03fb435
71e2c8808b3a0871619af4968dfaaa423a90b4c6
"2021-09-13T15:09:21Z"
java
"2021-09-14T03:46:47Z"
dolphinscheduler-server/src/main/java/org/apache/dolphinscheduler/server/master/runner/WorkflowExecuteThread.java
/** * 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()) { Lst<Strng> nextTaskLst = DagHelper.parseCondtonTask(dependNodeName, skpTaskNodeLst, dag, completeTaskLst); f (!nextTaskLst.contans(nextNodeName)) { return false; } } else { ExecutonStatus depTaskState = completeTaskLst.get(dependNodeName).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 (Map.Entry<Strng, TaskInstance> entry : completeTaskLst.entrySet()) { f (entry.getValue().getState() == state) { resultLst.add(entry.getValue()); }
closed
apache/dolphinscheduler
https://github.com/apache/dolphinscheduler
6,194
[Bug] [Server] Master build dag error
### 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 Perform multi version tasks ![image](https://user-images.githubusercontent.com/42576980/133109069-2b465273-4ebb-4f83-b9b4-ae0f8bce473d.png) ### What you expected to happen Normal execution ### How to reproduce Perform multi version tasks ### Anything else _No response_ ### Are you willing to submit PR? - [X] 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/6194
https://github.com/apache/dolphinscheduler/pull/6195
7029062f4c2f247e9eac333e28e36e66b03fb435
71e2c8808b3a0871619af4968dfaaa423a90b4c6
"2021-09-13T15:09:21Z"
java
"2021-09-14T03:46:47Z"
dolphinscheduler-server/src/main/java/org/apache/dolphinscheduler/server/master/runner/WorkflowExecuteThread.java
} return resultLst; } /** * 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.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.errorTaskLst.sze() > 0) {
closed
apache/dolphinscheduler
https://github.com/apache/dolphinscheduler
6,194
[Bug] [Server] Master build dag error
### 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 Perform multi version tasks ![image](https://user-images.githubusercontent.com/42576980/133109069-2b465273-4ebb-4f83-b9b4-ae0f8bce473d.png) ### What you expected to happen Normal execution ### How to reproduce Perform multi version tasks ### Anything else _No response_ ### Are you willing to submit PR? - [X] 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/6194
https://github.com/apache/dolphinscheduler/pull/6195
7029062f4c2f247e9eac333e28e36e66b03fb435
71e2c8808b3a0871619af4968dfaaa423a90b4c6
"2021-09-13T15:09:21Z"
java
"2021-09-14T03:46:47Z"
dolphinscheduler-server/src/main/java/org/apache/dolphinscheduler/server/master/runner/WorkflowExecuteThread.java
return true; } return ths.dependFaledTask.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; } } 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
6,194
[Bug] [Server] Master build dag error
### 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 Perform multi version tasks ![image](https://user-images.githubusercontent.com/42576980/133109069-2b465273-4ebb-4f83-b9b4-ae0f8bce473d.png) ### What you expected to happen Normal execution ### How to reproduce Perform multi version tasks ### Anything else _No response_ ### Are you willing to submit PR? - [X] 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/6194
https://github.com/apache/dolphinscheduler/pull/6195
7029062f4c2f247e9eac333e28e36e66b03fb435
71e2c8808b3a0871619af4968dfaaa423a90b4c6
"2021-09-13T15:09:21Z"
java
"2021-09-14T03:46:47Z"
dolphinscheduler-server/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) || !sComplementEnd() || readyToSubmtTaskQueue.sze() > 0) { return ExecutonStatus.PAUSE; } else { return ExecutonStatus.SUCCESS; } } /** * generate the latest process nstance status by the tasks state * * @param nstance * @return process nstance executon status */ prvate ExecutonStatus getProcessInstanceState(ProcessInstance nstance) { ExecutonStatus state = nstance.getState(); f (actveTaskProcessorMaps.sze() > 0 || hasRetryTaskInStandBy()) { // actve
closed
apache/dolphinscheduler
https://github.com/apache/dolphinscheduler
6,194
[Bug] [Server] Master build dag error
### 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 Perform multi version tasks ![image](https://user-images.githubusercontent.com/42576980/133109069-2b465273-4ebb-4f83-b9b4-ae0f8bce473d.png) ### What you expected to happen Normal execution ### How to reproduce Perform multi version tasks ### Anything else _No response_ ### Are you willing to submit PR? - [X] 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/6194
https://github.com/apache/dolphinscheduler/pull/6195
7029062f4c2f247e9eac333e28e36e66b03fb435
71e2c8808b3a0871619af4968dfaaa423a90b4c6
"2021-09-13T15:09:21Z"
java
"2021-09-14T03:46:47Z"
dolphinscheduler-server/src/main/java/org/apache/dolphinscheduler/server/master/runner/WorkflowExecuteThread.java
return runnngState(state); } // process falure f (processFaled()) { return ExecutonStatus.FAILURE; } // 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); f (CollectonUtls.sNotEmpty(stopLst) || CollectonUtls.sNotEmpty(kllLst) || !sComplementEnd()) { return ExecutonStatus.STOP; } else { return ExecutonStatus.SUCCESS; } } // success f (state == ExecutonStatus.RUNNING_EXECUTION) { Lst<TaskInstance> kllTasks = getCompleteTaskByState(ExecutonStatus.KILL); f (readyToSubmtTaskQueue.sze() > 0) {
closed
apache/dolphinscheduler
https://github.com/apache/dolphinscheduler
6,194
[Bug] [Server] Master build dag error
### 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 Perform multi version tasks ![image](https://user-images.githubusercontent.com/42576980/133109069-2b465273-4ebb-4f83-b9b4-ae0f8bce473d.png) ### What you expected to happen Normal execution ### How to reproduce Perform multi version tasks ### Anything else _No response_ ### Are you willing to submit PR? - [X] 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/6194
https://github.com/apache/dolphinscheduler/pull/6195
7029062f4c2f247e9eac333e28e36e66b03fb435
71e2c8808b3a0871619af4968dfaaa423a90b4c6
"2021-09-13T15:09:21Z"
java
"2021-09-14T03:46:47Z"
dolphinscheduler-server/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
6,194
[Bug] [Server] Master build dag error
### 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 Perform multi version tasks ![image](https://user-images.githubusercontent.com/42576980/133109069-2b465273-4ebb-4f83-b9b4-ae0f8bce473d.png) ### What you expected to happen Normal execution ### How to reproduce Perform multi version tasks ### Anything else _No response_ ### Are you willing to submit PR? - [X] 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/6194
https://github.com/apache/dolphinscheduler/pull/6195
7029062f4c2f247e9eac333e28e36e66b03fb435
71e2c8808b3a0871619af4968dfaaa423a90b4c6
"2021-09-13T15:09:21Z"
java
"2021-09-14T03:46:47Z"
dolphinscheduler-server/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() { ProcessInstance nstance = processServce.fndProcessInstanceById(processInstance.getId()); ExecutonStatus state = getProcessInstanceState(nstance); 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()); nstance.setState(state); processServce.updateProcessInstance(nstance); processInstance = nstance; StateEvent stateEvent = new StateEvent(); stateEvent.setExecutonStatus(processInstance.getState()); stateEvent.setProcessInstanceId(ths.processInstance.getId()); stateEvent.setType(StateEventType.PROCESS_STATE_CHANGE); ths.processStateChangeHandler(stateEvent); } } /** * get task dependency result * * @param taskInstance task nstance * @return DependResult */ prvate DependResult getDependResultForTask(TaskInstance taskInstance) {
closed
apache/dolphinscheduler
https://github.com/apache/dolphinscheduler
6,194
[Bug] [Server] Master build dag error
### 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 Perform multi version tasks ![image](https://user-images.githubusercontent.com/42576980/133109069-2b465273-4ebb-4f83-b9b4-ae0f8bce473d.png) ### What you expected to happen Normal execution ### How to reproduce Perform multi version tasks ### Anything else _No response_ ### Are you willing to submit PR? - [X] 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/6194
https://github.com/apache/dolphinscheduler/pull/6195
7029062f4c2f247e9eac333e28e36e66b03fb435
71e2c8808b3a0871619af4968dfaaa423a90b4c6
"2021-09-13T15:09:21Z"
java
"2021-09-14T03:46:47Z"
dolphinscheduler-server/src/main/java/org/apache/dolphinscheduler/server/master/runner/WorkflowExecuteThread.java
return sTaskDepsComplete(taskInstance.getName()); } /** * add task to standby lst * * @param taskInstance task nstance */ prvate vod addTaskToStandByLst(TaskInstance taskInstance) { logger.nfo("add task to stand by lst: {}", taskInstance.getName()); try { readyToSubmtTaskQueue.put(taskInstance); } catch (Excepton e) { logger.error("add task nstance to readyToSubmtTaskQueue error, taskName: {}", taskInstance.getName(), 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);
closed
apache/dolphinscheduler
https://github.com/apache/dolphinscheduler
6,194
[Bug] [Server] Master build dag error
### 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 Perform multi version tasks ![image](https://user-images.githubusercontent.com/42576980/133109069-2b465273-4ebb-4f83-b9b4-ae0f8bce473d.png) ### What you expected to happen Normal execution ### How to reproduce Perform multi version tasks ### Anything else _No response_ ### Are you willing to submit PR? - [X] 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/6194
https://github.com/apache/dolphinscheduler/pull/6195
7029062f4c2f247e9eac333e28e36e66b03fb435
71e2c8808b3a0871619af4968dfaaa423a90b4c6
"2021-09-13T15:09:21Z"
java
"2021-09-14T03:46:47Z"
dolphinscheduler-server/src/main/java/org/apache/dolphinscheduler/server/master/runner/WorkflowExecuteThread.java
} } /** * has retry task n standby * * @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()); for (nt taskId : actveTaskProcessorMaps.keySet()) { TaskInstance taskInstance = processServce.fndTaskInstanceById(taskId); f (taskInstance == null || taskInstance.getState().typeIsFnshed()) { contnue; } ITaskProcessor taskProcessor = actveTaskProcessorMaps.get(taskId); taskProcessor.acton(TaskActon.STOP); f (taskProcessor.taskState().typeIsFnshed()) { StateEvent stateEvent = new StateEvent();
closed
apache/dolphinscheduler
https://github.com/apache/dolphinscheduler
6,194
[Bug] [Server] Master build dag error
### 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 Perform multi version tasks ![image](https://user-images.githubusercontent.com/42576980/133109069-2b465273-4ebb-4f83-b9b4-ae0f8bce473d.png) ### What you expected to happen Normal execution ### How to reproduce Perform multi version tasks ### Anything else _No response_ ### Are you willing to submit PR? - [X] 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/6194
https://github.com/apache/dolphinscheduler/pull/6195
7029062f4c2f247e9eac333e28e36e66b03fb435
71e2c8808b3a0871619af4968dfaaa423a90b4c6
"2021-09-13T15:09:21Z"
java
"2021-09-14T03:46:47Z"
dolphinscheduler-server/src/main/java/org/apache/dolphinscheduler/server/master/runner/WorkflowExecuteThread.java
stateEvent.setType(StateEventType.TASK_STATE_CHANGE); stateEvent.setProcessInstanceId(ths.processInstance.getId()); stateEvent.setTaskInstanceId(taskInstance.getId()); stateEvent.setExecutonStatus(taskProcessor.taskState()); ths.addStateEvent(stateEvent); } } } publc boolean workFlowFnsh() { return ths.processInstance.getState().typeIsFnshed(); } /** * whether the retry nterval s tmed out * * @param taskInstance task nstance * @return Boolean */ prvate boolean retryTaskIntervalOverTme(TaskInstance taskInstance) { f (taskInstance.getState() != ExecutonStatus.FAILURE) { return true; } f (taskInstance.getId() == 0 || taskInstance.getMaxRetryTmes() == 0 || taskInstance.getRetryInterval() == 0) { return true; } Date now = new Date(); long faledTmeInterval = DateUtls.dfferSec(now, taskInstance.getEndTme());
closed
apache/dolphinscheduler
https://github.com/apache/dolphinscheduler
6,194
[Bug] [Server] Master build dag error
### 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 Perform multi version tasks ![image](https://user-images.githubusercontent.com/42576980/133109069-2b465273-4ebb-4f83-b9b4-ae0f8bce473d.png) ### What you expected to happen Normal execution ### How to reproduce Perform multi version tasks ### Anything else _No response_ ### Are you willing to submit PR? - [X] 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/6194
https://github.com/apache/dolphinscheduler/pull/6195
7029062f4c2f247e9eac333e28e36e66b03fb435
71e2c8808b3a0871619af4968dfaaa423a90b4c6
"2021-09-13T15:09:21Z"
java
"2021-09-14T03:46:47Z"
dolphinscheduler-server/src/main/java/org/apache/dolphinscheduler/server/master/runner/WorkflowExecuteThread.java
// task retry does not over tme, return false return taskInstance.getRetryInterval() * SEC_2_MINUTES_TIME_UNIT < faledTmeInterval; } /** * 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()); logger.nfo("task: {} has been forced success, put t nto complete task lst and stop retryng", task.getName()); removeTaskFromStandbyLst(task); completeTaskLst.put(task.getName(), task); submtPostNode(task.getName()); contnue; } } //nt var f (task.sFrstRun()) { //get pre Set<Strng> preTask = dag.getPrevousNodes(task.getName());
closed
apache/dolphinscheduler
https://github.com/apache/dolphinscheduler
6,194
[Bug] [Server] Master build dag error
### 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 Perform multi version tasks ![image](https://user-images.githubusercontent.com/42576980/133109069-2b465273-4ebb-4f83-b9b4-ae0f8bce473d.png) ### What you expected to happen Normal execution ### How to reproduce Perform multi version tasks ### Anything else _No response_ ### Are you willing to submit PR? - [X] 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/6194
https://github.com/apache/dolphinscheduler/pull/6195
7029062f4c2f247e9eac333e28e36e66b03fb435
71e2c8808b3a0871619af4968dfaaa423a90b4c6
"2021-09-13T15:09:21Z"
java
"2021-09-14T03:46:47Z"
dolphinscheduler-server/src/main/java/org/apache/dolphinscheduler/server/master/runner/WorkflowExecuteThread.java
getPreVarPool(task, preTask); } DependResult dependResult = getDependResultForTask(task); f (DependResult.SUCCESS == dependResult) { f (retryTaskIntervalOverTme(task)) { TaskInstance taskInstance = submtTaskExec(task); f (taskInstance == null) { ths.taskFaledSubmt = true; } else { removeTaskFromStandbyLst(task); } } } else f (DependResult.FAILED == dependResult) { // f the dependFaledTask.put(task.getName(), task); 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 *
closed
apache/dolphinscheduler
https://github.com/apache/dolphinscheduler
6,194
[Bug] [Server] Master build dag error
### 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 Perform multi version tasks ![image](https://user-images.githubusercontent.com/42576980/133109069-2b465273-4ebb-4f83-b9b4-ae0f8bce473d.png) ### What you expected to happen Normal execution ### How to reproduce Perform multi version tasks ### Anything else _No response_ ### Are you willing to submit PR? - [X] 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/6194
https://github.com/apache/dolphinscheduler/pull/6195
7029062f4c2f247e9eac333e28e36e66b03fb435
71e2c8808b3a0871619af4968dfaaa423a90b4c6
"2021-09-13T15:09:21Z"
java
"2021-09-14T03:46:47Z"
dolphinscheduler-server/src/main/java/org/apache/dolphinscheduler/server/master/runner/WorkflowExecuteThread.java
* @param taskId task d * @return recovery task nstance */ prvate TaskInstance getRecoveryTaskInstance(Strng taskId) { f (!StrngUtls.sNotEmpty(taskId)) { return null; } try { Integer ntId = Integer.valueOf(taskId); TaskInstance task = processServce.fndTaskInstanceById(ntId); f (task == null) { logger.error("start node d cannot be found: {}", taskId); } else { return task; } } catch (Excepton e) { logger.error("get recovery task nstance faled ", e); } return null; } /** * 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)) {
closed
apache/dolphinscheduler
https://github.com/apache/dolphinscheduler
6,194
[Bug] [Server] Master build dag error
### 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 Perform multi version tasks ![image](https://user-images.githubusercontent.com/42576980/133109069-2b465273-4ebb-4f83-b9b4-ae0f8bce473d.png) ### What you expected to happen Normal execution ### How to reproduce Perform multi version tasks ### Anything else _No response_ ### Are you willing to submit PR? - [X] 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/6194
https://github.com/apache/dolphinscheduler/pull/6195
7029062f4c2f247e9eac333e28e36e66b03fb435
71e2c8808b3a0871619af4968dfaaa423a90b4c6
"2021-09-13T15:09:21Z"
java
"2021-09-14T03:46:47Z"
dolphinscheduler-server/src/main/java/org/apache/dolphinscheduler/server/master/runner/WorkflowExecuteThread.java
Strng[] dLst = paramMap.get(CMD_PARAM_RECOVERY_START_NODE_STRING).splt(Constants.COMMA); for (Strng nodeId : dLst) { TaskInstance task = getRecoveryTaskInstance(nodeId); f (task != null) { nstanceLst.add(task); } } } 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; } f (paramMap.contansKey(CMD_PARAM_START_NODE_NAMES)) { startNodeNameLst = Arrays.asLst(paramMap.get(CMD_PARAM_START_NODE_NAMES).splt(Constants.COMMA)); } return startNodeNameLst; } /** * generate start node name lst from parsng command param; * f "StartNodeIdLst" exsts n command param, return StartNodeIdLst
closed
apache/dolphinscheduler
https://github.com/apache/dolphinscheduler
6,194
[Bug] [Server] Master build dag error
### 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 Perform multi version tasks ![image](https://user-images.githubusercontent.com/42576980/133109069-2b465273-4ebb-4f83-b9b4-ae0f8bce473d.png) ### What you expected to happen Normal execution ### How to reproduce Perform multi version tasks ### Anything else _No response_ ### Are you willing to submit PR? - [X] 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/6194
https://github.com/apache/dolphinscheduler/pull/6195
7029062f4c2f247e9eac333e28e36e66b03fb435
71e2c8808b3a0871619af4968dfaaa423a90b4c6
"2021-09-13T15:09:21Z"
java
"2021-09-14T03:46:47Z"
dolphinscheduler-server/src/main/java/org/apache/dolphinscheduler/server/master/runner/WorkflowExecuteThread.java
* * @return recovery node name lst */ prvate Lst<Strng> getRecoveryNodeNameLst() { Lst<Strng> recoveryNodeNameLst = new ArrayLst<>(); f (CollectonUtls.sNotEmpty(recoverNodeIdLst)) { for (TaskInstance task : recoverNodeIdLst) { recoveryNodeNameLst.add(task.getName()); } } return recoveryNodeNameLst; } /** * generate flow dag * * @param totalTaskNodeLst total task node lst * @param startNodeNameLst start node name lst * @param recoveryNodeNameLst recovery node name lst * @param depNodeType depend node type * @return ProcessDag process dag * @throws Excepton excepton */ publc ProcessDag generateFlowDag(Lst<TaskNode> totalTaskNodeLst, Lst<Strng> startNodeNameLst, Lst<Strng> recoveryNodeNameLst, TaskDependType depNodeType) throws Excepton { return DagHelper.generateFlowDag(totalTaskNodeLst, startNodeNameLst, recoveryNodeNameLst, depNodeType); } }
closed
apache/dolphinscheduler
https://github.com/apache/dolphinscheduler
6,194
[Bug] [Server] Master build dag error
### 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 Perform multi version tasks ![image](https://user-images.githubusercontent.com/42576980/133109069-2b465273-4ebb-4f83-b9b4-ae0f8bce473d.png) ### What you expected to happen Normal execution ### How to reproduce Perform multi version tasks ### Anything else _No response_ ### Are you willing to submit PR? - [X] 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/6194
https://github.com/apache/dolphinscheduler/pull/6195
7029062f4c2f247e9eac333e28e36e66b03fb435
71e2c8808b3a0871619af4968dfaaa423a90b4c6
"2021-09-13T15:09:21Z"
java
"2021-09-14T03:46:47Z"
dolphinscheduler-service/src/main/java/org/apache/dolphinscheduler/service/process/ProcessService.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 * 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 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_ID; 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.common.Constants.YYYY_MM_DD_HH_MM_SS;
closed
apache/dolphinscheduler
https://github.com/apache/dolphinscheduler
6,194
[Bug] [Server] Master build dag error
### 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 Perform multi version tasks ![image](https://user-images.githubusercontent.com/42576980/133109069-2b465273-4ebb-4f83-b9b4-ae0f8bce473d.png) ### What you expected to happen Normal execution ### How to reproduce Perform multi version tasks ### Anything else _No response_ ### Are you willing to submit PR? - [X] 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/6194
https://github.com/apache/dolphinscheduler/pull/6195
7029062f4c2f247e9eac333e28e36e66b03fb435
71e2c8808b3a0871619af4968dfaaa423a90b4c6
"2021-09-13T15:09:21Z"
java
"2021-09-14T03:46:47Z"
dolphinscheduler-service/src/main/java/org/apache/dolphinscheduler/service/process/ProcessService.java
import static java.util.stream.Collectors.toSet; 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.Direct; import org.apache.dolphinscheduler.common.enums.ExecutionStatus; 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.ResourceType; import org.apache.dolphinscheduler.common.enums.TaskDependType; import org.apache.dolphinscheduler.common.enums.TimeoutFlag; import org.apache.dolphinscheduler.common.enums.WarningType; import org.apache.dolphinscheduler.common.graph.DAG; import org.apache.dolphinscheduler.common.model.DateInterval; import org.apache.dolphinscheduler.common.model.PreviousTaskNode; 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.process.Property; import org.apache.dolphinscheduler.common.process.ResourceInfo; import org.apache.dolphinscheduler.common.task.AbstractParameters; import org.apache.dolphinscheduler.common.task.TaskTimeoutParameter; import org.apache.dolphinscheduler.common.task.subprocess.SubProcessParameters; import org.apache.dolphinscheduler.common.utils.CollectionUtils; 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.common.utils.SnowFlakeUtils; import org.apache.dolphinscheduler.common.utils.SnowFlakeUtils.SnowFlakeException;
closed
apache/dolphinscheduler
https://github.com/apache/dolphinscheduler
6,194
[Bug] [Server] Master build dag error
### 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 Perform multi version tasks ![image](https://user-images.githubusercontent.com/42576980/133109069-2b465273-4ebb-4f83-b9b4-ae0f8bce473d.png) ### What you expected to happen Normal execution ### How to reproduce Perform multi version tasks ### Anything else _No response_ ### Are you willing to submit PR? - [X] 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/6194
https://github.com/apache/dolphinscheduler/pull/6195
7029062f4c2f247e9eac333e28e36e66b03fb435
71e2c8808b3a0871619af4968dfaaa423a90b4c6
"2021-09-13T15:09:21Z"
java
"2021-09-14T03:46:47Z"
dolphinscheduler-service/src/main/java/org/apache/dolphinscheduler/service/process/ProcessService.java
import org.apache.dolphinscheduler.common.utils.TaskParametersUtils; 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.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; import org.apache.dolphinscheduler.dao.entity.TaskDefinition; import org.apache.dolphinscheduler.dao.entity.TaskDefinitionLog; 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.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;
closed
apache/dolphinscheduler
https://github.com/apache/dolphinscheduler
6,194
[Bug] [Server] Master build dag error
### 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 Perform multi version tasks ![image](https://user-images.githubusercontent.com/42576980/133109069-2b465273-4ebb-4f83-b9b4-ae0f8bce473d.png) ### What you expected to happen Normal execution ### How to reproduce Perform multi version tasks ### Anything else _No response_ ### Are you willing to submit PR? - [X] 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/6194
https://github.com/apache/dolphinscheduler/pull/6195
7029062f4c2f247e9eac333e28e36e66b03fb435
71e2c8808b3a0871619af4968dfaaa423a90b4c6
"2021-09-13T15:09:21Z"
java
"2021-09-14T03:46:47Z"
dolphinscheduler-service/src/main/java/org/apache/dolphinscheduler/service/process/ProcessService.java
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; 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.utils.DagHelper; import org.apache.dolphinscheduler.remote.utils.Host; import org.apache.dolphinscheduler.service.log.LogClientService; import org.apache.commons.lang.StringUtils; 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;
closed
apache/dolphinscheduler
https://github.com/apache/dolphinscheduler
6,194
[Bug] [Server] Master build dag error
### 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 Perform multi version tasks ![image](https://user-images.githubusercontent.com/42576980/133109069-2b465273-4ebb-4f83-b9b4-ae0f8bce473d.png) ### What you expected to happen Normal execution ### How to reproduce Perform multi version tasks ### Anything else _No response_ ### Are you willing to submit PR? - [X] 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/6194
https://github.com/apache/dolphinscheduler/pull/6195
7029062f4c2f247e9eac333e28e36e66b03fb435
71e2c8808b3a0871619af4968dfaaa423a90b4c6
"2021-09-13T15:09:21Z"
java
"2021-09-14T03:46:47Z"
dolphinscheduler-service/src/main/java/org/apache/dolphinscheduler/service/process/ProcessService.java
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Component; import org.springframework.transaction.annotation.Transactional; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.facebook.presto.jdbc.internal.guava.collect.Lists; import com.fasterxml.jackson.databind.node.ObjectNode; /** * process relative dao that some mappers in this. */ @Component public class ProcessService { private final Logger logger = LoggerFactory.getLogger(getClass()); private final int[] stateArray = new int[]{ExecutionStatus.SUBMITTED_SUCCESS.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
closed
apache/dolphinscheduler
https://github.com/apache/dolphinscheduler
6,194
[Bug] [Server] Master build dag error
### 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 Perform multi version tasks ![image](https://user-images.githubusercontent.com/42576980/133109069-2b465273-4ebb-4f83-b9b4-ae0f8bce473d.png) ### What you expected to happen Normal execution ### How to reproduce Perform multi version tasks ### Anything else _No response_ ### Are you willing to submit PR? - [X] 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/6194
https://github.com/apache/dolphinscheduler/pull/6195
7029062f4c2f247e9eac333e28e36e66b03fb435
71e2c8808b3a0871619af4968dfaaa423a90b4c6
"2021-09-13T15:09:21Z"
java
"2021-09-14T03:46:47Z"
dolphinscheduler-service/src/main/java/org/apache/dolphinscheduler/service/process/ProcessService.java
private TaskInstanceMapper taskInstanceMapper; @Autowired private CommandMapper commandMapper; @Autowired private ScheduleMapper scheduleMapper; @Autowired private UdfFuncMapper udfFuncMapper; @Autowired private ResourceMapper resourceMapper; @Autowired private ResourceUserMapper resourceUserMapper; @Autowired private ErrorCommandMapper errorCommandMapper; @Autowired private TenantMapper tenantMapper; @Autowired private ProjectMapper projectMapper; @Autowired private TaskDefinitionMapper taskDefinitionMapper; @Autowired private TaskDefinitionLogMapper taskDefinitionLogMapper; @Autowired private ProcessTaskRelationMapper processTaskRelationMapper; @Autowired private ProcessTaskRelationLogMapper processTaskRelationLogMapper; @Autowired private EnvironmentMapper environmentMapper; /** * handle Command (construct ProcessInstance from Command) , wrapped in transaction *
closed
apache/dolphinscheduler
https://github.com/apache/dolphinscheduler
6,194
[Bug] [Server] Master build dag error
### 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 Perform multi version tasks ![image](https://user-images.githubusercontent.com/42576980/133109069-2b465273-4ebb-4f83-b9b4-ae0f8bce473d.png) ### What you expected to happen Normal execution ### How to reproduce Perform multi version tasks ### Anything else _No response_ ### Are you willing to submit PR? - [X] 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/6194
https://github.com/apache/dolphinscheduler/pull/6195
7029062f4c2f247e9eac333e28e36e66b03fb435
71e2c8808b3a0871619af4968dfaaa423a90b4c6
"2021-09-13T15:09:21Z"
java
"2021-09-14T03:46:47Z"
dolphinscheduler-service/src/main/java/org/apache/dolphinscheduler/service/process/ProcessService.java
* @param logger logger * @param host host * @param validThreadNum validThreadNum * @param command found command * @return process instance */ @Transactional(rollbackFor = Exception.class) public ProcessInstance handleCommand(Logger logger, String host, int validThreadNum, 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; } if (!checkThreadNum(command, validThreadNum)) { logger.info("there is not enough thread for this command: {}", command); return setWaitingThreadProcess(command, processInstance); } processInstance.setCommandType(command.getCommandType()); processInstance.addHistoryCmd(command.getCommandType()); saveProcessInstance(processInstance); this.setSubProcessParam(processInstance); this.commandMapper.deleteById(command.getId()); return processInstance; } /** * save error command, and delete original command * * @param command command
closed
apache/dolphinscheduler
https://github.com/apache/dolphinscheduler
6,194
[Bug] [Server] Master build dag error
### 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 Perform multi version tasks ![image](https://user-images.githubusercontent.com/42576980/133109069-2b465273-4ebb-4f83-b9b4-ae0f8bce473d.png) ### What you expected to happen Normal execution ### How to reproduce Perform multi version tasks ### Anything else _No response_ ### Are you willing to submit PR? - [X] 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/6194
https://github.com/apache/dolphinscheduler/pull/6195
7029062f4c2f247e9eac333e28e36e66b03fb435
71e2c8808b3a0871619af4968dfaaa423a90b4c6
"2021-09-13T15:09:21Z"
java
"2021-09-14T03:46:47Z"
dolphinscheduler-service/src/main/java/org/apache/dolphinscheduler/service/process/ProcessService.java
* @param message message */ @Transactional(rollbackFor = Exception.class) 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()); } saveProcessInstance(processInstance); this.setSubProcessParam(processInstance); createRecoveryWaitingThreadCommand(command, processInstance); return null; } /** * check thread num * * @param command command * @param validThreadNum validThreadNum
closed
apache/dolphinscheduler
https://github.com/apache/dolphinscheduler
6,194
[Bug] [Server] Master build dag error
### 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 Perform multi version tasks ![image](https://user-images.githubusercontent.com/42576980/133109069-2b465273-4ebb-4f83-b9b4-ae0f8bce473d.png) ### What you expected to happen Normal execution ### How to reproduce Perform multi version tasks ### Anything else _No response_ ### Are you willing to submit PR? - [X] 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/6194
https://github.com/apache/dolphinscheduler/pull/6195
7029062f4c2f247e9eac333e28e36e66b03fb435
71e2c8808b3a0871619af4968dfaaa423a90b4c6
"2021-09-13T15:09:21Z"
java
"2021-09-14T03:46:47Z"
dolphinscheduler-service/src/main/java/org/apache/dolphinscheduler/service/process/ProcessService.java
* @return if thread is enough */ private boolean checkThreadNum(Command command, int validThreadNum) { int commandThreadCount = this.workProcessThreadNumCount(command.getProcessDefinitionCode()); return validThreadNum >= commandThreadCount; } /** * insert one command * * @param command command * @return create result */ public int createCommand(Command command) { int result = 0; if (command != null) { result = commandMapper.insert(command); } return result; } /** * find one command from queue list * * @return command */ public Command findOneCommand() { return commandMapper.getOneToRun(); } /** * get command page *
closed
apache/dolphinscheduler
https://github.com/apache/dolphinscheduler
6,194
[Bug] [Server] Master build dag error
### 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 Perform multi version tasks ![image](https://user-images.githubusercontent.com/42576980/133109069-2b465273-4ebb-4f83-b9b4-ae0f8bce473d.png) ### What you expected to happen Normal execution ### How to reproduce Perform multi version tasks ### Anything else _No response_ ### Are you willing to submit PR? - [X] 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/6194
https://github.com/apache/dolphinscheduler/pull/6195
7029062f4c2f247e9eac333e28e36e66b03fb435
71e2c8808b3a0871619af4968dfaaa423a90b4c6
"2021-09-13T15:09:21Z"
java
"2021-09-14T03:46:47Z"
dolphinscheduler-service/src/main/java/org/apache/dolphinscheduler/service/process/ProcessService.java
* @param pageSize * @param pageNumber * @return */ public List<Command> findCommandPage(int pageSize, int pageNumber) { Page<Command> commandPage = new Page<>(pageNumber, pageSize); return commandMapper.queryCommandPage(commandPage).getRecords(); } /** * check the input command exists in queue list * * @param command command * @return create command result */ 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(); 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()) {
closed
apache/dolphinscheduler
https://github.com/apache/dolphinscheduler
6,194
[Bug] [Server] Master build dag error
### 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 Perform multi version tasks ![image](https://user-images.githubusercontent.com/42576980/133109069-2b465273-4ebb-4f83-b9b4-ae0f8bce473d.png) ### What you expected to happen Normal execution ### How to reproduce Perform multi version tasks ### Anything else _No response_ ### Are you willing to submit PR? - [X] 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/6194
https://github.com/apache/dolphinscheduler/pull/6195
7029062f4c2f247e9eac333e28e36e66b03fb435
71e2c8808b3a0871619af4968dfaaa423a90b4c6
"2021-09-13T15:09:21Z"
java
"2021-09-14T03:46:47Z"
dolphinscheduler-service/src/main/java/org/apache/dolphinscheduler/service/process/ProcessService.java
isNeedCreate = false; break; } } } } return isNeedCreate; } /** * find process instance detail by id * * @param processId processId * @return process instance */ public ProcessInstance findProcessInstanceDetailById(int processId) { return processInstanceMapper.queryDetailById(processId); } /** * get task node list by definitionId */ public List<TaskDefinition> getTaskNodeListByDefinitionId(Integer defineId) { ProcessDefinition processDefinition = processDefineMapper.selectById(defineId); if (processDefinition == null) { logger.error("process define not exists"); return new ArrayList<>(); } List<ProcessTaskRelationLog> processTaskRelations = processTaskRelationLogMapper.queryByProcessCodeAndVersion(processDefinition.getCode(), processDefinition.getVersion()); Set<TaskDefinition> taskDefinitionSet = new HashSet<>(); for (ProcessTaskRelationLog processTaskRelation : processTaskRelations) { if (processTaskRelation.getPostTaskCode() > 0) {
closed
apache/dolphinscheduler
https://github.com/apache/dolphinscheduler
6,194
[Bug] [Server] Master build dag error
### 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 Perform multi version tasks ![image](https://user-images.githubusercontent.com/42576980/133109069-2b465273-4ebb-4f83-b9b4-ae0f8bce473d.png) ### What you expected to happen Normal execution ### How to reproduce Perform multi version tasks ### Anything else _No response_ ### Are you willing to submit PR? - [X] 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/6194
https://github.com/apache/dolphinscheduler/pull/6195
7029062f4c2f247e9eac333e28e36e66b03fb435
71e2c8808b3a0871619af4968dfaaa423a90b4c6
"2021-09-13T15:09:21Z"
java
"2021-09-14T03:46:47Z"
dolphinscheduler-service/src/main/java/org/apache/dolphinscheduler/service/process/ProcessService.java
taskDefinitionSet.add(new TaskDefinition(processTaskRelation.getPostTaskCode(), processTaskRelation.getPostTaskVersion())); } } List<TaskDefinitionLog> taskDefinitionLogs = taskDefinitionLogMapper.queryByTaskDefinitions(taskDefinitionSet); return new ArrayList<>(taskDefinitionLogs); } /** * find process instance by id * * @param processId processId * @return process instance */ public ProcessInstance findProcessInstanceById(int processId) { return processInstanceMapper.selectById(processId); } /** * find process define by id. * * @param processDefinitionId processDefinitionId * @return process definition */ public ProcessDefinition findProcessDefineById(int processDefinitionId) { return processDefineMapper.selectById(processDefinitionId); } /** * find process define by code and version. * * @param processDefinitionCode processDefinitionCode * @return process definition */
closed
apache/dolphinscheduler
https://github.com/apache/dolphinscheduler
6,194
[Bug] [Server] Master build dag error
### 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 Perform multi version tasks ![image](https://user-images.githubusercontent.com/42576980/133109069-2b465273-4ebb-4f83-b9b4-ae0f8bce473d.png) ### What you expected to happen Normal execution ### How to reproduce Perform multi version tasks ### Anything else _No response_ ### Are you willing to submit PR? - [X] 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/6194
https://github.com/apache/dolphinscheduler/pull/6195
7029062f4c2f247e9eac333e28e36e66b03fb435
71e2c8808b3a0871619af4968dfaaa423a90b4c6
"2021-09-13T15:09:21Z"
java
"2021-09-14T03:46:47Z"
dolphinscheduler-service/src/main/java/org/apache/dolphinscheduler/service/process/ProcessService.java
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 */ public ProcessDefinition findProcessDefinitionByCode(Long processDefinitionCode) { return processDefineMapper.queryByCode(processDefinitionCode); } /** * delete work process instance by id * * @param processInstanceId processInstanceId * @return delete process instance result */ public int deleteWorkProcessInstanceById(int processInstanceId) { return processInstanceMapper.deleteById(processInstanceId); } /** * delete all sub process by parent instance id
closed
apache/dolphinscheduler
https://github.com/apache/dolphinscheduler
6,194
[Bug] [Server] Master build dag error
### 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 Perform multi version tasks ![image](https://user-images.githubusercontent.com/42576980/133109069-2b465273-4ebb-4f83-b9b4-ae0f8bce473d.png) ### What you expected to happen Normal execution ### How to reproduce Perform multi version tasks ### Anything else _No response_ ### Are you willing to submit PR? - [X] 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/6194
https://github.com/apache/dolphinscheduler/pull/6195
7029062f4c2f247e9eac333e28e36e66b03fb435
71e2c8808b3a0871619af4968dfaaa423a90b4c6
"2021-09-13T15:09:21Z"
java
"2021-09-14T03:46:47Z"
dolphinscheduler-service/src/main/java/org/apache/dolphinscheduler/service/process/ProcessService.java
* * @param processInstanceId processInstanceId * @return delete all sub process instance result */ 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; } /** * remove task log file * * @param processInstanceId processInstanceId */ 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; }
closed
apache/dolphinscheduler
https://github.com/apache/dolphinscheduler
6,194
[Bug] [Server] Master build dag error
### 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 Perform multi version tasks ![image](https://user-images.githubusercontent.com/42576980/133109069-2b465273-4ebb-4f83-b9b4-ae0f8bce473d.png) ### What you expected to happen Normal execution ### How to reproduce Perform multi version tasks ### Anything else _No response_ ### Are you willing to submit PR? - [X] 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/6194
https://github.com/apache/dolphinscheduler/pull/6195
7029062f4c2f247e9eac333e28e36e66b03fb435
71e2c8808b3a0871619af4968dfaaa423a90b4c6
"2021-09-13T15:09:21Z"
java
"2021-09-14T03:46:47Z"
dolphinscheduler-service/src/main/java/org/apache/dolphinscheduler/service/process/ProcessService.java
int port = Constants.RPC_PORT; String ip = ""; try { ip = Host.of(taskInstance.getHost()).getIp(); } catch (Exception e) { ip = taskInstance.getHost(); } logClient.removeTaskLog(ip, port, taskLogPath); } } } /** * calculate sub process number in the process define. * * @param processDefinitionCode processDefinitionCode * @return process thread num count */ private Integer workProcessThreadNumCount(long processDefinitionCode) { ProcessDefinition processDefinition = processDefineMapper.queryByCode(processDefinitionCode); List<Integer> ids = new ArrayList<>(); recurseFindSubProcessId(processDefinition.getId(), ids); return ids.size() + 1; } /** * recursive query sub process definition id by parent id. * * @param parentId parentId * @param ids ids
closed
apache/dolphinscheduler
https://github.com/apache/dolphinscheduler
6,194
[Bug] [Server] Master build dag error
### 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 Perform multi version tasks ![image](https://user-images.githubusercontent.com/42576980/133109069-2b465273-4ebb-4f83-b9b4-ae0f8bce473d.png) ### What you expected to happen Normal execution ### How to reproduce Perform multi version tasks ### Anything else _No response_ ### Are you willing to submit PR? - [X] 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/6194
https://github.com/apache/dolphinscheduler/pull/6195
7029062f4c2f247e9eac333e28e36e66b03fb435
71e2c8808b3a0871619af4968dfaaa423a90b4c6
"2021-09-13T15:09:21Z"
java
"2021-09-14T03:46:47Z"
dolphinscheduler-service/src/main/java/org/apache/dolphinscheduler/service/process/ProcessService.java
*/ public void recurseFindSubProcessId(int parentId, List<Integer> ids) { List<TaskDefinition> taskNodeList = this.getTaskNodeListByDefinitionId(parentId); 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_ID) != null) { SubProcessParameters subProcessParam = JSONUtils.parseObject(parameter, SubProcessParameters.class); ids.add(subProcessParam.getProcessDefinitionId()); recurseFindSubProcessId(subProcessParam.getProcessDefinitionId(), ids); } } } } /** * 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 */ public void createRecoveryWaitingThreadCommand(Command originCommand, ProcessInstance processInstance) { if (processInstance.getIsSubProcess() == Flag.YES) { if (originCommand != null) { commandMapper.deleteById(originCommand.getId()); }
closed
apache/dolphinscheduler
https://github.com/apache/dolphinscheduler
6,194
[Bug] [Server] Master build dag error
### 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 Perform multi version tasks ![image](https://user-images.githubusercontent.com/42576980/133109069-2b465273-4ebb-4f83-b9b4-ae0f8bce473d.png) ### What you expected to happen Normal execution ### How to reproduce Perform multi version tasks ### Anything else _No response_ ### Are you willing to submit PR? - [X] 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/6194
https://github.com/apache/dolphinscheduler/pull/6195
7029062f4c2f247e9eac333e28e36e66b03fb435
71e2c8808b3a0871619af4968dfaaa423a90b4c6
"2021-09-13T15:09:21Z"
java
"2021-09-14T03:46:47Z"
dolphinscheduler-service/src/main/java/org/apache/dolphinscheduler/service/process/ProcessService.java
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(), processInstance.getWarningGroupId(), processInstance.getScheduleTime(), processInstance.getWorkerGroup(), processInstance.getEnvironmentCode(), processInstance.getProcessInstancePriority() ); saveCommand(command); return; } if (originCommand.getCommandType() == CommandType.RECOVER_WAITING_THREAD) { originCommand.setUpdateTime(new Date()); saveCommand(originCommand); } else { commandMapper.deleteById(originCommand.getId());
closed
apache/dolphinscheduler
https://github.com/apache/dolphinscheduler
6,194
[Bug] [Server] Master build dag error
### 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 Perform multi version tasks ![image](https://user-images.githubusercontent.com/42576980/133109069-2b465273-4ebb-4f83-b9b4-ae0f8bce473d.png) ### What you expected to happen Normal execution ### How to reproduce Perform multi version tasks ### Anything else _No response_ ### Are you willing to submit PR? - [X] 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/6194
https://github.com/apache/dolphinscheduler/pull/6195
7029062f4c2f247e9eac333e28e36e66b03fb435
71e2c8808b3a0871619af4968dfaaa423a90b4c6
"2021-09-13T15:09:21Z"
java
"2021-09-14T03:46:47Z"
dolphinscheduler-service/src/main/java/org/apache/dolphinscheduler/service/process/ProcessService.java
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 * * @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)) { scheduleTime = DateUtils.stringToDate(cmdParam.get(CMDPARAM_COMPLEMENT_DATA_START_DATE)); } 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
6,194
[Bug] [Server] Master build dag error
### 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 Perform multi version tasks ![image](https://user-images.githubusercontent.com/42576980/133109069-2b465273-4ebb-4f83-b9b4-ae0f8bce473d.png) ### What you expected to happen Normal execution ### How to reproduce Perform multi version tasks ### Anything else _No response_ ### Are you willing to submit PR? - [X] 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/6194
https://github.com/apache/dolphinscheduler/pull/6195
7029062f4c2f247e9eac333e28e36e66b03fb435
71e2c8808b3a0871619af4968dfaaa423a90b4c6
"2021-09-13T15:09:21Z"
java
"2021-09-14T03:46:47Z"
dolphinscheduler-service/src/main/java/org/apache/dolphinscheduler/service/process/ProcessService.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.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); Date scheduleTime = getScheduleTime(command, cmdParam); if (scheduleTime != null) { processInstance.setScheduleTime(scheduleTime); } processInstance.setCommandStartTime(command.getStartTime()); processInstance.setLocations(processDefinition.getLocations());
closed
apache/dolphinscheduler
https://github.com/apache/dolphinscheduler
6,194
[Bug] [Server] Master build dag error
### 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 Perform multi version tasks ![image](https://user-images.githubusercontent.com/42576980/133109069-2b465273-4ebb-4f83-b9b4-ae0f8bce473d.png) ### What you expected to happen Normal execution ### How to reproduce Perform multi version tasks ### Anything else _No response_ ### Are you willing to submit PR? - [X] 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/6194
https://github.com/apache/dolphinscheduler/pull/6195
7029062f4c2f247e9eac333e28e36e66b03fb435
71e2c8808b3a0871619af4968dfaaa423a90b4c6
"2021-09-13T15:09:21Z"
java
"2021-09-14T03:46:47Z"
dolphinscheduler-service/src/main/java/org/apache/dolphinscheduler/service/process/ProcessService.java
setGlobalParamIfCommanded(processDefinition, cmdParam); processInstance.setGlobalParams(ParameterUtils.curingGlobalParams( processDefinition.getGlobalParamMap(), processDefinition.getGlobalParamList(), getCommandTypeIfComplement(processInstance, command), processInstance.getScheduleTime())); 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); fatherParamMap = JSONUtils.toMap(fatherParamJson); } startParamMap.putAll(fatherParamMap);
closed
apache/dolphinscheduler
https://github.com/apache/dolphinscheduler
6,194
[Bug] [Server] Master build dag error
### 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 Perform multi version tasks ![image](https://user-images.githubusercontent.com/42576980/133109069-2b465273-4ebb-4f83-b9b4-ae0f8bce473d.png) ### What you expected to happen Normal execution ### How to reproduce Perform multi version tasks ### Anything else _No response_ ### Are you willing to submit PR? - [X] 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/6194
https://github.com/apache/dolphinscheduler/pull/6195
7029062f4c2f247e9eac333e28e36e66b03fb435
71e2c8808b3a0871619af4968dfaaa423a90b4c6
"2021-09-13T15:09:21Z"
java
"2021-09-14T03:46:47Z"
dolphinscheduler-service/src/main/java/org/apache/dolphinscheduler/service/process/ProcessService.java
if (startParamMap.size() > 0 && processDefinition.getGlobalParamMap() != null) { for (Map.Entry<String, String> param : processDefinition.getGlobalParamMap().entrySet()) { String val = startParamMap.get(param.getKey()); if (val != null) { param.setValue(val); } } } } /** * 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 * @return tenant */ 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);
closed
apache/dolphinscheduler
https://github.com/apache/dolphinscheduler
6,194
[Bug] [Server] Master build dag error
### 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 Perform multi version tasks ![image](https://user-images.githubusercontent.com/42576980/133109069-2b465273-4ebb-4f83-b9b4-ae0f8bce473d.png) ### What you expected to happen Normal execution ### How to reproduce Perform multi version tasks ### Anything else _No response_ ### Are you willing to submit PR? - [X] 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/6194
https://github.com/apache/dolphinscheduler/pull/6195
7029062f4c2f247e9eac333e28e36e66b03fb435
71e2c8808b3a0871619af4968dfaaa423a90b4c6
"2021-09-13T15:09:21Z"
java
"2021-09-14T03:46:47Z"
dolphinscheduler-service/src/main/java/org/apache/dolphinscheduler/service/process/ProcessService.java
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 */ public Environment findEnvironmentByCode(Long environmentCode) { Environment environment = null; if (environmentCode >= 0) { environment = environmentMapper.queryByEnvironmentCode(environmentCode); } 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_NODE_NAMES) || cmdParam.get(Constants.CMD_PARAM_START_NODE_NAMES).isEmpty()) {
closed
apache/dolphinscheduler
https://github.com/apache/dolphinscheduler
6,194
[Bug] [Server] Master build dag error
### 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 Perform multi version tasks ![image](https://user-images.githubusercontent.com/42576980/133109069-2b465273-4ebb-4f83-b9b4-ae0f8bce473d.png) ### What you expected to happen Normal execution ### How to reproduce Perform multi version tasks ### Anything else _No response_ ### Are you willing to submit PR? - [X] 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/6194
https://github.com/apache/dolphinscheduler/pull/6195
7029062f4c2f247e9eac333e28e36e66b03fb435
71e2c8808b3a0871619af4968dfaaa423a90b4c6
"2021-09-13T15:09:21Z"
java
"2021-09-14T03:46:47Z"
dolphinscheduler-service/src/main/java/org/apache/dolphinscheduler/service/process/ProcessService.java
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 */ private ProcessInstance constructProcessInstance(Command command, String host) { ProcessInstance processInstance; CommandType commandType = command.getCommandType(); Map<String, String> cmdParam = JSONUtils.toMap(command.getCommandParam()); ProcessDefinition processDefinition = getProcessDefinitionByCommand(command.getProcessDefinitionCode(), cmdParam); if (processDefinition == null) { logger.error("cannot find the work process define! define code : {}", command.getProcessDefinitionCode()); return null; } if (cmdParam != null) { int processInstanceId = 0; if (cmdParam.containsKey(Constants.CMD_PARAM_RECOVER_PROCESS_ID_STRING)) { String processId = cmdParam.get(Constants.CMD_PARAM_RECOVER_PROCESS_ID_STRING); processInstanceId = Integer.parseInt(processId); if (processInstanceId == 0) { logger.error("command parameter is error, [ ProcessInstanceId ] is 0");
closed
apache/dolphinscheduler
https://github.com/apache/dolphinscheduler
6,194
[Bug] [Server] Master build dag error
### 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 Perform multi version tasks ![image](https://user-images.githubusercontent.com/42576980/133109069-2b465273-4ebb-4f83-b9b4-ae0f8bce473d.png) ### What you expected to happen Normal execution ### How to reproduce Perform multi version tasks ### Anything else _No response_ ### Are you willing to submit PR? - [X] 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/6194
https://github.com/apache/dolphinscheduler/pull/6195
7029062f4c2f247e9eac333e28e36e66b03fb435
71e2c8808b3a0871619af4968dfaaa423a90b4c6
"2021-09-13T15:09:21Z"
java
"2021-09-14T03:46:47Z"
dolphinscheduler-service/src/main/java/org/apache/dolphinscheduler/service/process/ProcessService.java
return null; } } else if (cmdParam.containsKey(Constants.CMD_PARAM_SUB_PROCESS)) { String pId = cmdParam.get(Constants.CMD_PARAM_SUB_PROCESS); processInstanceId = Integer.parseInt(pId); } else if (cmdParam.containsKey(Constants.CMD_PARAM_RECOVERY_WAITING_THREAD)) { String pId = cmdParam.get(Constants.CMD_PARAM_RECOVERY_WAITING_THREAD); processInstanceId = Integer.parseInt(pId); } if (processInstanceId == 0) { processInstance = generateNewProcessInstance(processDefinition, command, cmdParam); } else { processInstance = this.findProcessInstanceDetailById(processInstanceId); if (processInstance == null) { return processInstance; } CommandType commandTypeIfComplement = getCommandTypeIfComplement(processInstance, command); if (commandTypeIfComplement == CommandType.REPEAT_RUNNING) { setGlobalParamIfCommanded(processDefinition, cmdParam); } processInstance.setGlobalParams(ParameterUtils.curingGlobalParams( processDefinition.getGlobalParamMap(), processDefinition.getGlobalParamList(), commandTypeIfComplement, processInstance.getScheduleTime())); processInstance.setProcessDefinition(processDefinition);
closed
apache/dolphinscheduler
https://github.com/apache/dolphinscheduler
6,194
[Bug] [Server] Master build dag error
### 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 Perform multi version tasks ![image](https://user-images.githubusercontent.com/42576980/133109069-2b465273-4ebb-4f83-b9b4-ae0f8bce473d.png) ### What you expected to happen Normal execution ### How to reproduce Perform multi version tasks ### Anything else _No response_ ### Are you willing to submit PR? - [X] 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/6194
https://github.com/apache/dolphinscheduler/pull/6195
7029062f4c2f247e9eac333e28e36e66b03fb435
71e2c8808b3a0871619af4968dfaaa423a90b4c6
"2021-09-13T15:09:21Z"
java
"2021-09-14T03:46:47Z"
dolphinscheduler-service/src/main/java/org/apache/dolphinscheduler/service/process/ProcessService.java
} if (processInstance.getCommandParam() != null) { Map<String, String> processCmdParam = JSONUtils.toMap(processInstance.getCommandParam()); for (Map.Entry<String, String> entry : processCmdParam.entrySet()) { if (!cmdParam.containsKey(entry.getKey())) { cmdParam.put(entry.getKey(), entry.getValue()); } } } if (cmdParam.containsKey(Constants.CMD_PARAM_SUB_PROCESS)) { processInstance.setCommandParam(command.getCommandParam()); } } else { processInstance = generateNewProcessInstance(processDefinition, command, cmdParam); } 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); ExecutionStatus runStatus = ExecutionStatus.RUNNING_EXECUTION; int runTime = processInstance.getRunTimes(); switch (commandType) { case START_PROCESS:
closed
apache/dolphinscheduler
https://github.com/apache/dolphinscheduler
6,194
[Bug] [Server] Master build dag error
### 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 Perform multi version tasks ![image](https://user-images.githubusercontent.com/42576980/133109069-2b465273-4ebb-4f83-b9b4-ae0f8bce473d.png) ### What you expected to happen Normal execution ### How to reproduce Perform multi version tasks ### Anything else _No response_ ### Are you willing to submit PR? - [X] 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/6194
https://github.com/apache/dolphinscheduler/pull/6195
7029062f4c2f247e9eac333e28e36e66b03fb435
71e2c8808b3a0871619af4968dfaaa423a90b4c6
"2021-09-13T15:09:21Z"
java
"2021-09-14T03:46:47Z"
dolphinscheduler-service/src/main/java/org/apache/dolphinscheduler/service/process/ProcessService.java
break; case START_FAILURE_TASK_PROCESS: 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) {
closed
apache/dolphinscheduler
https://github.com/apache/dolphinscheduler
6,194
[Bug] [Server] Master build dag error
### 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 Perform multi version tasks ![image](https://user-images.githubusercontent.com/42576980/133109069-2b465273-4ebb-4f83-b9b4-ae0f8bce473d.png) ### What you expected to happen Normal execution ### How to reproduce Perform multi version tasks ### Anything else _No response_ ### Are you willing to submit PR? - [X] 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/6194
https://github.com/apache/dolphinscheduler/pull/6195
7029062f4c2f247e9eac333e28e36e66b03fb435
71e2c8808b3a0871619af4968dfaaa423a90b4c6
"2021-09-13T15:09:21Z"
java
"2021-09-14T03:46:47Z"
dolphinscheduler-service/src/main/java/org/apache/dolphinscheduler/service/process/ProcessService.java
initTaskInstance(this.findTaskInstanceById(taskId)); } 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: List<TaskInstance> taskInstanceList = this.findValidTaskListByProcessId(processInstance.getId()); for (TaskInstance taskInstance : taskInstanceList) { taskInstance.setFlag(Flag.NO); this.updateTaskInstance(taskInstance); } initComplementDataParam(processDefinition, processInstance, cmdParam); 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);
closed
apache/dolphinscheduler
https://github.com/apache/dolphinscheduler
6,194
[Bug] [Server] Master build dag error
### 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 Perform multi version tasks ![image](https://user-images.githubusercontent.com/42576980/133109069-2b465273-4ebb-4f83-b9b4-ae0f8bce473d.png) ### What you expected to happen Normal execution ### How to reproduce Perform multi version tasks ### Anything else _No response_ ### Are you willing to submit PR? - [X] 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/6194
https://github.com/apache/dolphinscheduler/pull/6195
7029062f4c2f247e9eac333e28e36e66b03fb435
71e2c8808b3a0871619af4968dfaaa423a90b4c6
"2021-09-13T15:09:21Z"
java
"2021-09-14T03:46:47Z"
dolphinscheduler-service/src/main/java/org/apache/dolphinscheduler/service/process/ProcessService.java
updateTaskInstance(taskInstance); } processInstance.setStartTime(new Date()); 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
6,194
[Bug] [Server] Master build dag error
### 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 Perform multi version tasks ![image](https://user-images.githubusercontent.com/42576980/133109069-2b465273-4ebb-4f83-b9b4-ae0f8bce473d.png) ### What you expected to happen Normal execution ### How to reproduce Perform multi version tasks ### Anything else _No response_ ### Are you willing to submit PR? - [X] 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/6194
https://github.com/apache/dolphinscheduler/pull/6195
7029062f4c2f247e9eac333e28e36e66b03fb435
71e2c8808b3a0871619af4968dfaaa423a90b4c6
"2021-09-13T15:09:21Z"
java
"2021-09-14T03:46:47Z"
dolphinscheduler-service/src/main/java/org/apache/dolphinscheduler/service/process/ProcessService.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
6,194
[Bug] [Server] Master build dag error
### 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 Perform multi version tasks ![image](https://user-images.githubusercontent.com/42576980/133109069-2b465273-4ebb-4f83-b9b4-ae0f8bce473d.png) ### What you expected to happen Normal execution ### How to reproduce Perform multi version tasks ### Anything else _No response_ ### Are you willing to submit PR? - [X] 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/6194
https://github.com/apache/dolphinscheduler/pull/6195
7029062f4c2f247e9eac333e28e36e66b03fb435
71e2c8808b3a0871619af4968dfaaa423a90b4c6
"2021-09-13T15:09:21Z"
java
"2021-09-14T03:46:47Z"
dolphinscheduler-service/src/main/java/org/apache/dolphinscheduler/service/process/ProcessService.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 startComplementTime = DateUtils.parse(cmdParam.get(CMDPARAM_COMPLEMENT_DATA_START_DATE), YYYY_MM_DD_HH_MM_SS); if (Flag.NO == processInstance.getIsSubProcess()) { processInstance.setScheduleTime(startComplementTime); } processInstance.setGlobalParams(ParameterUtils.curingGlobalParams( processDefinition.getGlobalParamMap(), processDefinition.getGlobalParamList(), CommandType.COMPLEMENT_DATA, processInstance.getScheduleTime())); } /** * 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 * * @param subProcessInstance subProcessInstance */ public void setSubProcessParam(ProcessInstance subProcessInstance) { String cmdParam = subProcessInstance.getCommandParam(); if (StringUtils.isEmpty(cmdParam)) {
closed
apache/dolphinscheduler
https://github.com/apache/dolphinscheduler
6,194
[Bug] [Server] Master build dag error
### 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 Perform multi version tasks ![image](https://user-images.githubusercontent.com/42576980/133109069-2b465273-4ebb-4f83-b9b4-ae0f8bce473d.png) ### What you expected to happen Normal execution ### How to reproduce Perform multi version tasks ### Anything else _No response_ ### Are you willing to submit PR? - [X] 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/6194
https://github.com/apache/dolphinscheduler/pull/6195
7029062f4c2f247e9eac333e28e36e66b03fb435
71e2c8808b3a0871619af4968dfaaa423a90b4c6
"2021-09-13T15:09:21Z"
java
"2021-09-14T03:46:47Z"
dolphinscheduler-service/src/main/java/org/apache/dolphinscheduler/service/process/ProcessService.java
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())); this.saveProcessInstance(subProcessInstance); } else { logger.error("sub process command params error, cannot find parent instance: {} ", cmdParam); } } ProcessInstanceMap processInstanceMap = JSONUtils.parseObject(cmdParam, ProcessInstanceMap.class); if (processInstanceMap == null || processInstanceMap.getParentProcessInstanceId() == 0) { return; } processInstanceMap.setProcessInstanceId(subProcessInstance.getId());
closed
apache/dolphinscheduler
https://github.com/apache/dolphinscheduler
6,194
[Bug] [Server] Master build dag error
### 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 Perform multi version tasks ![image](https://user-images.githubusercontent.com/42576980/133109069-2b465273-4ebb-4f83-b9b4-ae0f8bce473d.png) ### What you expected to happen Normal execution ### How to reproduce Perform multi version tasks ### Anything else _No response_ ### Are you willing to submit PR? - [X] 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/6194
https://github.com/apache/dolphinscheduler/pull/6195
7029062f4c2f247e9eac333e28e36e66b03fb435
71e2c8808b3a0871619af4968dfaaa423a90b4c6
"2021-09-13T15:09:21Z"
java
"2021-09-14T03:46:47Z"
dolphinscheduler-service/src/main/java/org/apache/dolphinscheduler/service/process/ProcessService.java
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> parentPropertyList = JSONUtils.toList(parentGlobalParams, Property.class); List<Property> subPropertyList = JSONUtils.toList(subGlobalParams, Property.class); Map<String, String> subMap = subPropertyList.stream().collect(Collectors.toMap(Property::getProp, Property::getValue)); for (Property parent : parentPropertyList) { if (!subMap.containsKey(parent.getProp())) { subPropertyList.add(parent); } } return JSONUtils.toJsonString(subPropertyList); } /** * initialize task instance * * @param taskInstance taskInstance */ private void initTaskInstance(TaskInstance taskInstance) { if (!taskInstance.isSubProcess() && (taskInstance.getState().typeIsCancel() || taskInstance.getState().typeIsFailure())) { taskInstance.setFlag(Flag.NO);
closed
apache/dolphinscheduler
https://github.com/apache/dolphinscheduler
6,194
[Bug] [Server] Master build dag error
### 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 Perform multi version tasks ![image](https://user-images.githubusercontent.com/42576980/133109069-2b465273-4ebb-4f83-b9b4-ae0f8bce473d.png) ### What you expected to happen Normal execution ### How to reproduce Perform multi version tasks ### Anything else _No response_ ### Are you willing to submit PR? - [X] 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/6194
https://github.com/apache/dolphinscheduler/pull/6195
7029062f4c2f247e9eac333e28e36e66b03fb435
71e2c8808b3a0871619af4968dfaaa423a90b4c6
"2021-09-13T15:09:21Z"
java
"2021-09-14T03:46:47Z"
dolphinscheduler-service/src/main/java/org/apache/dolphinscheduler/service/process/ProcessService.java
updateTaskInstance(taskInstance); return; } taskInstance.setState(ExecutionStatus.SUBMITTED_SUCCESS); updateTaskInstance(taskInstance); } /** * retry submit task to db * * @param taskInstance * @param commitRetryTimes * @param commitInterval * @return */ public TaskInstance submitTask(TaskInstance taskInstance, int commitRetryTimes, int commitInterval) { int retryTimes = 1; boolean submitDB = false; TaskInstance task = null; while (retryTimes <= commitRetryTimes) { try { if (!submitDB) { task = submitTask(taskInstance); if (task != null && task.getId() != 0) { submitDB = true; } } if (!submitDB) { logger.error("task commit to db failed , taskId {} has already retry {} times, please check the database", taskInstance.getId(), retryTimes); }
closed
apache/dolphinscheduler
https://github.com/apache/dolphinscheduler
6,194
[Bug] [Server] Master build dag error
### 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 Perform multi version tasks ![image](https://user-images.githubusercontent.com/42576980/133109069-2b465273-4ebb-4f83-b9b4-ae0f8bce473d.png) ### What you expected to happen Normal execution ### How to reproduce Perform multi version tasks ### Anything else _No response_ ### Are you willing to submit PR? - [X] 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/6194
https://github.com/apache/dolphinscheduler/pull/6195
7029062f4c2f247e9eac333e28e36e66b03fb435
71e2c8808b3a0871619af4968dfaaa423a90b4c6
"2021-09-13T15:09:21Z"
java
"2021-09-14T03:46:47Z"
dolphinscheduler-service/src/main/java/org/apache/dolphinscheduler/service/process/ProcessService.java
Thread.sleep(commitInterval); } catch (Exception e) { logger.error("task commit to mysql failed", e); } retryTimes += 1; } return task; } /** * submit task to db * submit sub process to command * * @param taskInstance taskInstance * @return task instance */ @Transactional(rollbackFor = Exception.class) public TaskInstance submitTask(TaskInstance taskInstance) { ProcessInstance processInstance = this.findProcessInstanceDetailById(taskInstance.getProcessInstanceId()); 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 task; } if (!task.getState().typeIsFinished()) { createSubWorkProcess(processInstance, task); }
closed
apache/dolphinscheduler
https://github.com/apache/dolphinscheduler
6,194
[Bug] [Server] Master build dag error
### 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 Perform multi version tasks ![image](https://user-images.githubusercontent.com/42576980/133109069-2b465273-4ebb-4f83-b9b4-ae0f8bce473d.png) ### What you expected to happen Normal execution ### How to reproduce Perform multi version tasks ### Anything else _No response_ ### Are you willing to submit PR? - [X] 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/6194
https://github.com/apache/dolphinscheduler/pull/6195
7029062f4c2f247e9eac333e28e36e66b03fb435
71e2c8808b3a0871619af4968dfaaa423a90b4c6
"2021-09-13T15:09:21Z"
java
"2021-09-14T03:46:47Z"
dolphinscheduler-service/src/main/java/org/apache/dolphinscheduler/service/process/ProcessService.java
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 * @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();
closed
apache/dolphinscheduler
https://github.com/apache/dolphinscheduler
6,194
[Bug] [Server] Master build dag error
### 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 Perform multi version tasks ![image](https://user-images.githubusercontent.com/42576980/133109069-2b465273-4ebb-4f83-b9b4-ae0f8bce473d.png) ### What you expected to happen Normal execution ### How to reproduce Perform multi version tasks ### Anything else _No response_ ### Are you willing to submit PR? - [X] 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/6194
https://github.com/apache/dolphinscheduler/pull/6195
7029062f4c2f247e9eac333e28e36e66b03fb435
71e2c8808b3a0871619af4968dfaaa423a90b4c6
"2021-09-13T15:09:21Z"
java
"2021-09-14T03:46:47Z"
dolphinscheduler-service/src/main/java/org/apache/dolphinscheduler/service/process/ProcessService.java
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 */ 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; } /**
closed
apache/dolphinscheduler
https://github.com/apache/dolphinscheduler
6,194
[Bug] [Server] Master build dag error
### 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 Perform multi version tasks ![image](https://user-images.githubusercontent.com/42576980/133109069-2b465273-4ebb-4f83-b9b4-ae0f8bce473d.png) ### What you expected to happen Normal execution ### How to reproduce Perform multi version tasks ### Anything else _No response_ ### Are you willing to submit PR? - [X] 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/6194
https://github.com/apache/dolphinscheduler/pull/6195
7029062f4c2f247e9eac333e28e36e66b03fb435
71e2c8808b3a0871619af4968dfaaa423a90b4c6
"2021-09-13T15:09:21Z"
java
"2021-09-14T03:46:47Z"
dolphinscheduler-service/src/main/java/org/apache/dolphinscheduler/service/process/ProcessService.java
* create sub work process command * * @param parentProcessInstance parentProcessInstance * @param task task */ public void createSubWorkProcess(ProcessInstance parentProcessInstance, TaskInstance task) { if (!task.isSubProcess()) { return; } ProcessInstanceMap instanceMap = findWorkProcessMapByParent(parentProcessInstance.getId(), task.getId()); if (null != instanceMap && CommandType.RECOVER_TOLERANCE_FAULT_PROCESS == parentProcessInstance.getCommandType()) { return; } instanceMap = setProcessInstanceMap(parentProcessInstance, task); ProcessInstance childInstance = null; if (instanceMap.getProcessInstanceId() != 0) { childInstance = findProcessInstanceById(instanceMap.getProcessInstanceId()); } Command subProcessCommand = createSubProcessCommand(parentProcessInstance, childInstance, instanceMap, task); updateSubProcessDefinitionByParent(parentProcessInstance, subProcessCommand.getProcessDefinitionCode()); initSubInstanceState(childInstance); createCommand(subProcessCommand); logger.info("sub process command created: {} ", subProcessCommand); } /** * complement data needs transform parent parameter to child. */ private String getSubWorkFlowParam(ProcessInstanceMap instanceMap, ProcessInstance parentProcessInstance, Map<String, String> fatherParams) {
closed
apache/dolphinscheduler
https://github.com/apache/dolphinscheduler
6,194
[Bug] [Server] Master build dag error
### 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 Perform multi version tasks ![image](https://user-images.githubusercontent.com/42576980/133109069-2b465273-4ebb-4f83-b9b4-ae0f8bce473d.png) ### What you expected to happen Normal execution ### How to reproduce Perform multi version tasks ### Anything else _No response_ ### Are you willing to submit PR? - [X] 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/6194
https://github.com/apache/dolphinscheduler/pull/6195
7029062f4c2f247e9eac333e28e36e66b03fb435
71e2c8808b3a0871619af4968dfaaa423a90b4c6
"2021-09-13T15:09:21Z"
java
"2021-09-14T03:46:47Z"
dolphinscheduler-service/src/main/java/org/apache/dolphinscheduler/service/process/ProcessService.java
String processMapStr = JSONUtils.toJsonString(instanceMap); Map<String, String> cmdParam = JSONUtils.toMap(processMapStr); if (parentProcessInstance.isComplementData()) { Map<String, String> parentParam = JSONUtils.toMap(parentProcessInstance.getCommandParam()); String endTime = parentParam.get(CMDPARAM_COMPLEMENT_DATA_END_DATE); String startTime = parentParam.get(CMDPARAM_COMPLEMENT_DATA_START_DATE); cmdParam.put(CMDPARAM_COMPLEMENT_DATA_END_DATE, endTime); cmdParam.put(CMDPARAM_COMPLEMENT_DATA_START_DATE, startTime); processMapStr = JSONUtils.toJsonString(cmdParam); } if (fatherParams.size() != 0) { cmdParam.put(CMD_PARAM_FATHER_PARAMS, JSONUtils.toJsonString(fatherParams)); processMapStr = JSONUtils.toJsonString(cmdParam); } return processMapStr; } public Map<String, String> getGlobalParamMap(String globalParams) { List<Property> propList; Map<String, String> globalParamMap = new HashMap<>(); if (StringUtils.isNotEmpty(globalParams)) { propList = JSONUtils.toList(globalParams, Property.class); globalParamMap = propList.stream().collect(Collectors.toMap(Property::getProp, Property::getValue)); } return globalParamMap; } /** * create sub work process command */ public Command createSubProcessCommand(ProcessInstance parentProcessInstance,
closed
apache/dolphinscheduler
https://github.com/apache/dolphinscheduler
6,194
[Bug] [Server] Master build dag error
### 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 Perform multi version tasks ![image](https://user-images.githubusercontent.com/42576980/133109069-2b465273-4ebb-4f83-b9b4-ae0f8bce473d.png) ### What you expected to happen Normal execution ### How to reproduce Perform multi version tasks ### Anything else _No response_ ### Are you willing to submit PR? - [X] 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/6194
https://github.com/apache/dolphinscheduler/pull/6195
7029062f4c2f247e9eac333e28e36e66b03fb435
71e2c8808b3a0871619af4968dfaaa423a90b4c6
"2021-09-13T15:09:21Z"
java
"2021-09-14T03:46:47Z"
dolphinscheduler-service/src/main/java/org/apache/dolphinscheduler/service/process/ProcessService.java
ProcessInstance childInstance, ProcessInstanceMap instanceMap, TaskInstance task) { CommandType commandType = getSubCommandType(parentProcessInstance, childInstance); Map<String, String> subProcessParam = JSONUtils.toMap(task.getTaskParams()); int childDefineId = Integer.parseInt(subProcessParam.get(Constants.CMD_PARAM_SUB_PROCESS_DEFINE_ID)); ProcessDefinition processDefinition = processDefineMapper.queryByDefineId(childDefineId); Object localParams = subProcessParam.get(Constants.LOCAL_PARAMS); List<Property> allParam = JSONUtils.toList(JSONUtils.toJsonString(localParams), Property.class); Map<String, String> globalMap = this.getGlobalParamMap(parentProcessInstance.getGlobalParams()); Map<String, String> fatherParams = new HashMap<>(); if (CollectionUtils.isNotEmpty(allParam)) { for (Property info : allParam) { fatherParams.put(info.getProp(), globalMap.get(info.getProp())); } } String processParam = getSubWorkFlowParam(instanceMap, parentProcessInstance, fatherParams); return new Command( commandType, TaskDependType.TASK_POST, parentProcessInstance.getFailureStrategy(), parentProcessInstance.getExecutorId(), processDefinition.getCode(), processParam, parentProcessInstance.getWarningType(), parentProcessInstance.getWarningGroupId(), parentProcessInstance.getScheduleTime(), task.getWorkerGroup(), task.getEnvironmentCode(), parentProcessInstance.getProcessInstancePriority()
closed
apache/dolphinscheduler
https://github.com/apache/dolphinscheduler
6,194
[Bug] [Server] Master build dag error
### 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 Perform multi version tasks ![image](https://user-images.githubusercontent.com/42576980/133109069-2b465273-4ebb-4f83-b9b4-ae0f8bce473d.png) ### What you expected to happen Normal execution ### How to reproduce Perform multi version tasks ### Anything else _No response_ ### Are you willing to submit PR? - [X] 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/6194
https://github.com/apache/dolphinscheduler/pull/6195
7029062f4c2f247e9eac333e28e36e66b03fb435
71e2c8808b3a0871619af4968dfaaa423a90b4c6
"2021-09-13T15:09:21Z"
java
"2021-09-14T03:46:47Z"
dolphinscheduler-service/src/main/java/org/apache/dolphinscheduler/service/process/ProcessService.java
); } /** * initialize sub work flow state * child instance state would be initialized when 'recovery from pause/stop/failure' */ private void initSubInstanceState(ProcessInstance childInstance) { if (childInstance != null) { childInstance.setState(ExecutionStatus.RUNNING_EXECUTION); updateProcessInstance(childInstance); } } /** * get sub work flow command type * child instance exist: child command = fatherCommand * child instance not exists: child command = fatherCommand[0] */ private CommandType getSubCommandType(ProcessInstance parentProcessInstance, ProcessInstance childInstance) { CommandType commandType = parentProcessInstance.getCommandType(); if (childInstance == null) { String fatherHistoryCommand = parentProcessInstance.getHistoryCmd(); commandType = CommandType.valueOf(fatherHistoryCommand.split(Constants.COMMA)[0]); } return commandType; } /** * update sub process definition * * @param parentProcessInstance parentProcessInstance * @param childDefinitionCode childDefinitionId
closed
apache/dolphinscheduler
https://github.com/apache/dolphinscheduler
6,194
[Bug] [Server] Master build dag error
### 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 Perform multi version tasks ![image](https://user-images.githubusercontent.com/42576980/133109069-2b465273-4ebb-4f83-b9b4-ae0f8bce473d.png) ### What you expected to happen Normal execution ### How to reproduce Perform multi version tasks ### Anything else _No response_ ### Are you willing to submit PR? - [X] 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/6194
https://github.com/apache/dolphinscheduler/pull/6195
7029062f4c2f247e9eac333e28e36e66b03fb435
71e2c8808b3a0871619af4968dfaaa423a90b4c6
"2021-09-13T15:09:21Z"
java
"2021-09-14T03:46:47Z"
dolphinscheduler-service/src/main/java/org/apache/dolphinscheduler/service/process/ProcessService.java
*/ private void updateSubProcessDefinitionByParent(ProcessInstance parentProcessInstance, long childDefinitionCode) { ProcessDefinition fatherDefinition = this.findProcessDefinition(parentProcessInstance.getProcessDefinitionCode(), parentProcessInstance.getProcessDefinitionVersion()); ProcessDefinition childDefinition = this.findProcessDefinitionByCode(childDefinitionCode); if (childDefinition != null && fatherDefinition != null) { childDefinition.setWarningGroupId(fatherDefinition.getWarningGroupId()); processDefineMapper.updateById(childDefinition); } } /** * submit task to mysql * * @param taskInstance taskInstance * @param processInstance processInstance * @return task instance */ public TaskInstance submitTaskInstanceToDB(TaskInstance taskInstance, ProcessInstance processInstance) { ExecutionStatus processInstanceState = processInstance.getState(); if (taskInstance.getState().typeIsFailure()) { if (taskInstance.isSubProcess()) { taskInstance.setRetryTimes(taskInstance.getRetryTimes() + 1); } else { if (processInstanceState != ExecutionStatus.READY_STOP && processInstanceState != ExecutionStatus.READY_PAUSE) { taskInstance.setFlag(Flag.NO); updateTaskInstance(taskInstance); if (taskInstance.getState() != ExecutionStatus.NEED_FAULT_TOLERANCE) {
closed
apache/dolphinscheduler
https://github.com/apache/dolphinscheduler
6,194
[Bug] [Server] Master build dag error
### 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 Perform multi version tasks ![image](https://user-images.githubusercontent.com/42576980/133109069-2b465273-4ebb-4f83-b9b4-ae0f8bce473d.png) ### What you expected to happen Normal execution ### How to reproduce Perform multi version tasks ### Anything else _No response_ ### Are you willing to submit PR? - [X] 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/6194
https://github.com/apache/dolphinscheduler/pull/6195
7029062f4c2f247e9eac333e28e36e66b03fb435
71e2c8808b3a0871619af4968dfaaa423a90b4c6
"2021-09-13T15:09:21Z"
java
"2021-09-14T03:46:47Z"
dolphinscheduler-service/src/main/java/org/apache/dolphinscheduler/service/process/ProcessService.java
taskInstance.setRetryTimes(taskInstance.getRetryTimes() + 1); } taskInstance.setSubmitTime(null); taskInstance.setStartTime(null); taskInstance.setEndTime(null); taskInstance.setFlag(Flag.YES); taskInstance.setHost(null); taskInstance.setId(0); } } } taskInstance.setExecutorId(processInstance.getExecutorId()); taskInstance.setProcessInstancePriority(processInstance.getProcessInstancePriority()); taskInstance.setState(getSubmitTaskState(taskInstance, processInstanceState)); if (taskInstance.getSubmitTime() == null) { taskInstance.setSubmitTime(new Date()); } if (taskInstance.getFirstSubmitTime() == null) { taskInstance.setFirstSubmitTime(taskInstance.getSubmitTime()); } boolean saveResult = saveTaskInstance(taskInstance); if (!saveResult) { return null; } return taskInstance; } /** * get submit task instance state by the work process state * cannot modify the task state when running/kill/submit success, or this * task instance is already exists in task queue .
closed
apache/dolphinscheduler
https://github.com/apache/dolphinscheduler
6,194
[Bug] [Server] Master build dag error
### 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 Perform multi version tasks ![image](https://user-images.githubusercontent.com/42576980/133109069-2b465273-4ebb-4f83-b9b4-ae0f8bce473d.png) ### What you expected to happen Normal execution ### How to reproduce Perform multi version tasks ### Anything else _No response_ ### Are you willing to submit PR? - [X] 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/6194
https://github.com/apache/dolphinscheduler/pull/6195
7029062f4c2f247e9eac333e28e36e66b03fb435
71e2c8808b3a0871619af4968dfaaa423a90b4c6
"2021-09-13T15:09:21Z"
java
"2021-09-14T03:46:47Z"
dolphinscheduler-service/src/main/java/org/apache/dolphinscheduler/service/process/ProcessService.java
* return pause if work process state is ready pause * return stop if work process state is ready stop * if all of above are not satisfied, return submit success * * @param taskInstance taskInstance * @param processInstanceState processInstanceState * @return process instance state */ public ExecutionStatus getSubmitTaskState(TaskInstance taskInstance, ExecutionStatus processInstanceState) { ExecutionStatus state = taskInstance.getState(); if ( state == ExecutionStatus.RUNNING_EXECUTION || state == ExecutionStatus.DELAY_EXECUTION || state == ExecutionStatus.KILL ) { return state; } if (processInstanceState == ExecutionStatus.READY_PAUSE) { state = ExecutionStatus.PAUSE; } else if (processInstanceState == ExecutionStatus.READY_STOP || !checkProcessStrategy(taskInstance)) { state = ExecutionStatus.KILL; } else { state = ExecutionStatus.SUBMITTED_SUCCESS; }
closed
apache/dolphinscheduler
https://github.com/apache/dolphinscheduler
6,194
[Bug] [Server] Master build dag error
### 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 Perform multi version tasks ![image](https://user-images.githubusercontent.com/42576980/133109069-2b465273-4ebb-4f83-b9b4-ae0f8bce473d.png) ### What you expected to happen Normal execution ### How to reproduce Perform multi version tasks ### Anything else _No response_ ### Are you willing to submit PR? - [X] 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/6194
https://github.com/apache/dolphinscheduler/pull/6195
7029062f4c2f247e9eac333e28e36e66b03fb435
71e2c8808b3a0871619af4968dfaaa423a90b4c6
"2021-09-13T15:09:21Z"
java
"2021-09-14T03:46:47Z"
dolphinscheduler-service/src/main/java/org/apache/dolphinscheduler/service/process/ProcessService.java
return state; } /** * check process instance strategy * * @param taskInstance taskInstance * @return check strategy result */ private boolean checkProcessStrategy(TaskInstance taskInstance) { ProcessInstance processInstance = this.findProcessInstanceById(taskInstance.getProcessInstanceId()); FailureStrategy failureStrategy = processInstance.getFailureStrategy(); if (failureStrategy == FailureStrategy.CONTINUE) { return true; } List<TaskInstance> taskInstances = this.findValidTaskListByProcessId(taskInstance.getProcessInstanceId()); for (TaskInstance task : taskInstances) { if (task.getState() == ExecutionStatus.FAILURE && task.getRetryTimes() >= task.getMaxRetryTimes()) { return false; } } return true; } /** * insert or update work process instance to data base * * @param processInstance processInstance */ public void saveProcessInstance(ProcessInstance processInstance) { if (processInstance == null) {
closed
apache/dolphinscheduler
https://github.com/apache/dolphinscheduler
6,194
[Bug] [Server] Master build dag error
### 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 Perform multi version tasks ![image](https://user-images.githubusercontent.com/42576980/133109069-2b465273-4ebb-4f83-b9b4-ae0f8bce473d.png) ### What you expected to happen Normal execution ### How to reproduce Perform multi version tasks ### Anything else _No response_ ### Are you willing to submit PR? - [X] 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/6194
https://github.com/apache/dolphinscheduler/pull/6195
7029062f4c2f247e9eac333e28e36e66b03fb435
71e2c8808b3a0871619af4968dfaaa423a90b4c6
"2021-09-13T15:09:21Z"
java
"2021-09-14T03:46:47Z"
dolphinscheduler-service/src/main/java/org/apache/dolphinscheduler/service/process/ProcessService.java
logger.error("save error, process instance is null!"); return; } if (processInstance.getId() != 0) { processInstanceMapper.updateById(processInstance); } else { processInstanceMapper.insert(processInstance); } } /** * insert or update command * * @param command command * @return save command result */ public int saveCommand(Command command) { if (command.getId() != 0) { return commandMapper.updateById(command); } else { return commandMapper.insert(command); } } /** * insert or update task instance * * @param taskInstance taskInstance * @return save task instance result */ public boolean saveTaskInstance(TaskInstance taskInstance) { if (taskInstance.getId() != 0) {
closed
apache/dolphinscheduler
https://github.com/apache/dolphinscheduler
6,194
[Bug] [Server] Master build dag error
### 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 Perform multi version tasks ![image](https://user-images.githubusercontent.com/42576980/133109069-2b465273-4ebb-4f83-b9b4-ae0f8bce473d.png) ### What you expected to happen Normal execution ### How to reproduce Perform multi version tasks ### Anything else _No response_ ### Are you willing to submit PR? - [X] 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/6194
https://github.com/apache/dolphinscheduler/pull/6195
7029062f4c2f247e9eac333e28e36e66b03fb435
71e2c8808b3a0871619af4968dfaaa423a90b4c6
"2021-09-13T15:09:21Z"
java
"2021-09-14T03:46:47Z"
dolphinscheduler-service/src/main/java/org/apache/dolphinscheduler/service/process/ProcessService.java
return updateTaskInstance(taskInstance); } else { return createTaskInstance(taskInstance); } } /** * insert task instance * * @param taskInstance taskInstance * @return create task instance result */ public boolean createTaskInstance(TaskInstance taskInstance) { int count = taskInstanceMapper.insert(taskInstance); return count > 0; } /** * update task instance * * @param taskInstance taskInstance * @return update task instance result */ public boolean updateTaskInstance(TaskInstance taskInstance) { int count = taskInstanceMapper.updateById(taskInstance); return count > 0; } /** * find task instance by id * * @param taskId task id * @return task intance
closed
apache/dolphinscheduler
https://github.com/apache/dolphinscheduler
6,194
[Bug] [Server] Master build dag error
### 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 Perform multi version tasks ![image](https://user-images.githubusercontent.com/42576980/133109069-2b465273-4ebb-4f83-b9b4-ae0f8bce473d.png) ### What you expected to happen Normal execution ### How to reproduce Perform multi version tasks ### Anything else _No response_ ### Are you willing to submit PR? - [X] 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/6194
https://github.com/apache/dolphinscheduler/pull/6195
7029062f4c2f247e9eac333e28e36e66b03fb435
71e2c8808b3a0871619af4968dfaaa423a90b4c6
"2021-09-13T15:09:21Z"
java
"2021-09-14T03:46:47Z"
dolphinscheduler-service/src/main/java/org/apache/dolphinscheduler/service/process/ProcessService.java
*/ public TaskInstance findTaskInstanceById(Integer taskId) { return taskInstanceMapper.selectById(taskId); } /** * package task instance,associate processInstance and processDefine * * @param taskInstId taskInstId * @return task instance */ public TaskInstance getTaskInstanceDetailByTaskId(int taskInstId) { // TaskInstance taskInstance = findTaskInstanceById(taskInstId); if (taskInstance == null) { return null; } // ProcessInstance processInstance = findProcessInstanceDetailById(taskInstance.getProcessInstanceId()); // ProcessDefinition processDefine = findProcessDefinition(processInstance.getProcessDefinitionCode(), processInstance.getProcessDefinitionVersion()); taskInstance.setProcessInstance(processInstance); taskInstance.setProcessDefine(processDefine); TaskDefinition taskDefinition = taskDefinitionLogMapper.queryByDefinitionCodeAndVersion( taskInstance.getTaskCode(), taskInstance.getTaskDefinitionVersion()); taskInstance.setTaskDefine(taskDefinition); return taskInstance; } /**
closed
apache/dolphinscheduler
https://github.com/apache/dolphinscheduler
6,194
[Bug] [Server] Master build dag error
### 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 Perform multi version tasks ![image](https://user-images.githubusercontent.com/42576980/133109069-2b465273-4ebb-4f83-b9b4-ae0f8bce473d.png) ### What you expected to happen Normal execution ### How to reproduce Perform multi version tasks ### Anything else _No response_ ### Are you willing to submit PR? - [X] 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/6194
https://github.com/apache/dolphinscheduler/pull/6195
7029062f4c2f247e9eac333e28e36e66b03fb435
71e2c8808b3a0871619af4968dfaaa423a90b4c6
"2021-09-13T15:09:21Z"
java
"2021-09-14T03:46:47Z"
dolphinscheduler-service/src/main/java/org/apache/dolphinscheduler/service/process/ProcessService.java
* get id list by task state * * @param instanceId instanceId * @param state state * @return task instance states */ public List<Integer> findTaskIdByInstanceState(int instanceId, ExecutionStatus state) { return taskInstanceMapper.queryTaskByProcessIdAndState(instanceId, state.ordinal()); } /** * find valid task list by process definition id * * @param processInstanceId processInstanceId * @return task instance list */ public List<TaskInstance> findValidTaskListByProcessId(Integer processInstanceId) { return taskInstanceMapper.findValidTaskListByProcessId(processInstanceId, Flag.YES); } /** * find previous task list by work process id * * @param processInstanceId processInstanceId * @return task instance list */ public List<TaskInstance> findPreviousTaskListByWorkProcessId(Integer processInstanceId) { return taskInstanceMapper.findValidTaskListByProcessId(processInstanceId, Flag.NO); } /** * update work process instance map *
closed
apache/dolphinscheduler
https://github.com/apache/dolphinscheduler
6,194
[Bug] [Server] Master build dag error
### 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 Perform multi version tasks ![image](https://user-images.githubusercontent.com/42576980/133109069-2b465273-4ebb-4f83-b9b4-ae0f8bce473d.png) ### What you expected to happen Normal execution ### How to reproduce Perform multi version tasks ### Anything else _No response_ ### Are you willing to submit PR? - [X] 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/6194
https://github.com/apache/dolphinscheduler/pull/6195
7029062f4c2f247e9eac333e28e36e66b03fb435
71e2c8808b3a0871619af4968dfaaa423a90b4c6
"2021-09-13T15:09:21Z"
java
"2021-09-14T03:46:47Z"
dolphinscheduler-service/src/main/java/org/apache/dolphinscheduler/service/process/ProcessService.java
* @param processInstanceMap processInstanceMap * @return update process instance result */ public int updateWorkProcessInstanceMap(ProcessInstanceMap processInstanceMap) { return processInstanceMapMapper.updateById(processInstanceMap); } /** * create work process instance map * * @param processInstanceMap processInstanceMap * @return create process instance result */ public int createWorkProcessInstanceMap(ProcessInstanceMap processInstanceMap) { int count = 0; if (processInstanceMap != null) { return processInstanceMapMapper.insert(processInstanceMap); } return count; } /** * find work process map by parent process id and parent task id. * * @param parentWorkProcessId parentWorkProcessId * @param parentTaskId parentTaskId * @return process instance map */ public ProcessInstanceMap findWorkProcessMapByParent(Integer parentWorkProcessId, Integer parentTaskId) { return processInstanceMapMapper.queryByParentId(parentWorkProcessId, parentTaskId); } /**
closed
apache/dolphinscheduler
https://github.com/apache/dolphinscheduler
6,194
[Bug] [Server] Master build dag error
### 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 Perform multi version tasks ![image](https://user-images.githubusercontent.com/42576980/133109069-2b465273-4ebb-4f83-b9b4-ae0f8bce473d.png) ### What you expected to happen Normal execution ### How to reproduce Perform multi version tasks ### Anything else _No response_ ### Are you willing to submit PR? - [X] 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/6194
https://github.com/apache/dolphinscheduler/pull/6195
7029062f4c2f247e9eac333e28e36e66b03fb435
71e2c8808b3a0871619af4968dfaaa423a90b4c6
"2021-09-13T15:09:21Z"
java
"2021-09-14T03:46:47Z"
dolphinscheduler-service/src/main/java/org/apache/dolphinscheduler/service/process/ProcessService.java
* delete work process map by parent process id * * @param parentWorkProcessId parentWorkProcessId * @return delete process map result */ public int deleteWorkProcessMapByParentId(int parentWorkProcessId) { return processInstanceMapMapper.deleteByParentProcessId(parentWorkProcessId); } /** * find sub process instance * * @param parentProcessId parentProcessId * @param parentTaskId parentTaskId * @return process instance */ public ProcessInstance findSubProcessInstance(Integer parentProcessId, Integer parentTaskId) { ProcessInstance processInstance = null; ProcessInstanceMap processInstanceMap = processInstanceMapMapper.queryByParentId(parentProcessId, parentTaskId); if (processInstanceMap == null || processInstanceMap.getProcessInstanceId() == 0) { return processInstance; } processInstance = findProcessInstanceById(processInstanceMap.getProcessInstanceId()); return processInstance; } /** * find parent process instance * * @param subProcessId subProcessId * @return process instance */
closed
apache/dolphinscheduler
https://github.com/apache/dolphinscheduler
6,194
[Bug] [Server] Master build dag error
### 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 Perform multi version tasks ![image](https://user-images.githubusercontent.com/42576980/133109069-2b465273-4ebb-4f83-b9b4-ae0f8bce473d.png) ### What you expected to happen Normal execution ### How to reproduce Perform multi version tasks ### Anything else _No response_ ### Are you willing to submit PR? - [X] 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/6194
https://github.com/apache/dolphinscheduler/pull/6195
7029062f4c2f247e9eac333e28e36e66b03fb435
71e2c8808b3a0871619af4968dfaaa423a90b4c6
"2021-09-13T15:09:21Z"
java
"2021-09-14T03:46:47Z"
dolphinscheduler-service/src/main/java/org/apache/dolphinscheduler/service/process/ProcessService.java
public ProcessInstance findParentProcessInstance(Integer subProcessId) { ProcessInstance processInstance = null; ProcessInstanceMap processInstanceMap = processInstanceMapMapper.queryBySubProcessId(subProcessId); if (processInstanceMap == null || processInstanceMap.getProcessInstanceId() == 0) { return processInstance; } processInstance = findProcessInstanceById(processInstanceMap.getParentProcessInstanceId()); return processInstance; } /** * change task state * * @param state state * @param startTime startTime * @param host host * @param executePath executePath * @param logPath logPath * @param taskInstId taskInstId */ public void changeTaskState(TaskInstance taskInstance, ExecutionStatus state, Date startTime, String host, String executePath, String logPath, int taskInstId) { taskInstance.setState(state); taskInstance.setStartTime(startTime); taskInstance.setHost(host); taskInstance.setExecutePath(executePath); taskInstance.setLogPath(logPath); saveTaskInstance(taskInstance); }
closed
apache/dolphinscheduler
https://github.com/apache/dolphinscheduler
6,194
[Bug] [Server] Master build dag error
### 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 Perform multi version tasks ![image](https://user-images.githubusercontent.com/42576980/133109069-2b465273-4ebb-4f83-b9b4-ae0f8bce473d.png) ### What you expected to happen Normal execution ### How to reproduce Perform multi version tasks ### Anything else _No response_ ### Are you willing to submit PR? - [X] 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/6194
https://github.com/apache/dolphinscheduler/pull/6195
7029062f4c2f247e9eac333e28e36e66b03fb435
71e2c8808b3a0871619af4968dfaaa423a90b4c6
"2021-09-13T15:09:21Z"
java
"2021-09-14T03:46:47Z"
dolphinscheduler-service/src/main/java/org/apache/dolphinscheduler/service/process/ProcessService.java
/** * update process instance * * @param processInstance processInstance * @return update process instance result */ public int updateProcessInstance(ProcessInstance processInstance) { return processInstanceMapper.updateById(processInstance); } /** * change task state * * @param state state * @param endTime endTime * @param taskInstId taskInstId * @param varPool varPool */ public void changeTaskState(TaskInstance taskInstance, ExecutionStatus state, Date endTime, int processId, String appIds, int taskInstId, String varPool) { taskInstance.setPid(processId); taskInstance.setAppLink(appIds); taskInstance.setState(state); taskInstance.setEndTime(endTime); taskInstance.setVarPool(varPool); changeOutParam(taskInstance); saveTaskInstance(taskInstance);
closed
apache/dolphinscheduler
https://github.com/apache/dolphinscheduler
6,194
[Bug] [Server] Master build dag error
### 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 Perform multi version tasks ![image](https://user-images.githubusercontent.com/42576980/133109069-2b465273-4ebb-4f83-b9b4-ae0f8bce473d.png) ### What you expected to happen Normal execution ### How to reproduce Perform multi version tasks ### Anything else _No response_ ### Are you willing to submit PR? - [X] 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/6194
https://github.com/apache/dolphinscheduler/pull/6195
7029062f4c2f247e9eac333e28e36e66b03fb435
71e2c8808b3a0871619af4968dfaaa423a90b4c6
"2021-09-13T15:09:21Z"
java
"2021-09-14T03:46:47Z"
dolphinscheduler-service/src/main/java/org/apache/dolphinscheduler/service/process/ProcessService.java
} /** * for show in page of taskInstance * * @param taskInstance */ public void changeOutParam(TaskInstance taskInstance) { if (StringUtils.isEmpty(taskInstance.getVarPool())) { return; } List<Property> properties = JSONUtils.toList(taskInstance.getVarPool(), Property.class); if (CollectionUtils.isEmpty(properties)) { return; } // Map<String, Object> taskParams = JSONUtils.toMap(taskInstance.getTaskParams(), String.class, Object.class); Object localParams = taskParams.get(LOCAL_PARAMS); if (localParams == null) { return; } List<Property> allParam = JSONUtils.toList(JSONUtils.toJsonString(localParams), Property.class); Map<String, String> outProperty = new HashMap<>(); for (Property info : properties) { if (info.getDirect() == Direct.OUT) { outProperty.put(info.getProp(), info.getValue()); } } for (Property info : allParam) { if (info.getDirect() == Direct.OUT) { String paramName = info.getProp();
closed
apache/dolphinscheduler
https://github.com/apache/dolphinscheduler
6,194
[Bug] [Server] Master build dag error
### 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 Perform multi version tasks ![image](https://user-images.githubusercontent.com/42576980/133109069-2b465273-4ebb-4f83-b9b4-ae0f8bce473d.png) ### What you expected to happen Normal execution ### How to reproduce Perform multi version tasks ### Anything else _No response_ ### Are you willing to submit PR? - [X] 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/6194
https://github.com/apache/dolphinscheduler/pull/6195
7029062f4c2f247e9eac333e28e36e66b03fb435
71e2c8808b3a0871619af4968dfaaa423a90b4c6
"2021-09-13T15:09:21Z"
java
"2021-09-14T03:46:47Z"
dolphinscheduler-service/src/main/java/org/apache/dolphinscheduler/service/process/ProcessService.java
info.setValue(outProperty.get(paramName)); } } taskParams.put(LOCAL_PARAMS, allParam); taskInstance.setTaskParams(JSONUtils.toJsonString(taskParams)); } /** * convert integer list to string list * * @param intList intList * @return string list */ public List<String> convertIntListToString(List<Integer> intList) { if (intList == null) { return new ArrayList<>(); } List<String> result = new ArrayList<>(intList.size()); for (Integer intVar : intList) { result.add(String.valueOf(intVar)); } return result; } /** * query schedule by id * * @param id id * @return schedule */ public Schedule querySchedule(int id) { return scheduleMapper.selectById(id);
closed
apache/dolphinscheduler
https://github.com/apache/dolphinscheduler
6,194
[Bug] [Server] Master build dag error
### 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 Perform multi version tasks ![image](https://user-images.githubusercontent.com/42576980/133109069-2b465273-4ebb-4f83-b9b4-ae0f8bce473d.png) ### What you expected to happen Normal execution ### How to reproduce Perform multi version tasks ### Anything else _No response_ ### Are you willing to submit PR? - [X] 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/6194
https://github.com/apache/dolphinscheduler/pull/6195
7029062f4c2f247e9eac333e28e36e66b03fb435
71e2c8808b3a0871619af4968dfaaa423a90b4c6
"2021-09-13T15:09:21Z"
java
"2021-09-14T03:46:47Z"
dolphinscheduler-service/src/main/java/org/apache/dolphinscheduler/service/process/ProcessService.java
} /** * query Schedule by processDefinitionCode * * @param processDefinitionCode processDefinitionCode * @see Schedule */ public List<Schedule> queryReleaseSchedulerListByProcessDefinitionCode(long processDefinitionCode) { return scheduleMapper.queryReleaseSchedulerListByProcessDefinitionCode(processDefinitionCode); } /** * query need failover process instance * * @param host host * @return process instance list */ public List<ProcessInstance> queryNeedFailoverProcessInstances(String host) { return processInstanceMapper.queryByHostAndStatus(host, stateArray); } /** * process need failover process instance * * @param processInstance processInstance */ @Transactional(rollbackFor = RuntimeException.class) public void processNeedFailoverProcessInstances(ProcessInstance processInstance) { // processInstance.setHost(Constants.NULL); processInstanceMapper.updateById(processInstance); ProcessDefinition processDefinition = findProcessDefinition(processInstance.getProcessDefinitionCode(), processInstance.getProcessDefinitionVersion());
closed
apache/dolphinscheduler
https://github.com/apache/dolphinscheduler
6,194
[Bug] [Server] Master build dag error
### 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 Perform multi version tasks ![image](https://user-images.githubusercontent.com/42576980/133109069-2b465273-4ebb-4f83-b9b4-ae0f8bce473d.png) ### What you expected to happen Normal execution ### How to reproduce Perform multi version tasks ### Anything else _No response_ ### Are you willing to submit PR? - [X] 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/6194
https://github.com/apache/dolphinscheduler/pull/6195
7029062f4c2f247e9eac333e28e36e66b03fb435
71e2c8808b3a0871619af4968dfaaa423a90b4c6
"2021-09-13T15:09:21Z"
java
"2021-09-14T03:46:47Z"
dolphinscheduler-service/src/main/java/org/apache/dolphinscheduler/service/process/ProcessService.java
// Command cmd = new Command(); cmd.setProcessDefinitionCode(processDefinition.getCode()); cmd.setCommandParam(String.format("{\"%s\":%d}", Constants.CMD_PARAM_RECOVER_PROCESS_ID_STRING, processInstance.getId())); cmd.setExecutorId(processInstance.getExecutorId()); cmd.setCommandType(CommandType.RECOVER_TOLERANCE_FAULT_PROCESS); createCommand(cmd); } /** * query all need failover task instances by host * * @param host host * @return task instance list */ public List<TaskInstance> queryNeedFailoverTaskInstances(String host) { return taskInstanceMapper.queryByHostAndStatus(host, stateArray); } /** * find data source by id * * @param id id * @return datasource */ public DataSource findDataSourceById(int id) { return dataSourceMapper.selectById(id); } /** * update process instance state by id *
closed
apache/dolphinscheduler
https://github.com/apache/dolphinscheduler
6,194
[Bug] [Server] Master build dag error
### 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 Perform multi version tasks ![image](https://user-images.githubusercontent.com/42576980/133109069-2b465273-4ebb-4f83-b9b4-ae0f8bce473d.png) ### What you expected to happen Normal execution ### How to reproduce Perform multi version tasks ### Anything else _No response_ ### Are you willing to submit PR? - [X] 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/6194
https://github.com/apache/dolphinscheduler/pull/6195
7029062f4c2f247e9eac333e28e36e66b03fb435
71e2c8808b3a0871619af4968dfaaa423a90b4c6
"2021-09-13T15:09:21Z"
java
"2021-09-14T03:46:47Z"
dolphinscheduler-service/src/main/java/org/apache/dolphinscheduler/service/process/ProcessService.java
* @param processInstanceId processInstanceId * @param executionStatus executionStatus * @return update process result */ public int updateProcessInstanceState(Integer processInstanceId, ExecutionStatus executionStatus) { ProcessInstance instance = processInstanceMapper.selectById(processInstanceId); instance.setState(executionStatus); return processInstanceMapper.updateById(instance); } /** * find process instance by the task id * * @param taskId taskId * @return process instance */ public ProcessInstance findProcessInstanceByTaskId(int taskId) { TaskInstance taskInstance = taskInstanceMapper.selectById(taskId); if (taskInstance != null) { return processInstanceMapper.selectById(taskInstance.getProcessInstanceId()); } return null; } /** * find udf function list by id list string * * @param ids ids * @return udf function list */ public List<UdfFunc> queryUdfFunListByIds(int[] ids) { return udfFuncMapper.queryUdfByIdStr(ids, null);
closed
apache/dolphinscheduler
https://github.com/apache/dolphinscheduler
6,194
[Bug] [Server] Master build dag error
### 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 Perform multi version tasks ![image](https://user-images.githubusercontent.com/42576980/133109069-2b465273-4ebb-4f83-b9b4-ae0f8bce473d.png) ### What you expected to happen Normal execution ### How to reproduce Perform multi version tasks ### Anything else _No response_ ### Are you willing to submit PR? - [X] 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/6194
https://github.com/apache/dolphinscheduler/pull/6195
7029062f4c2f247e9eac333e28e36e66b03fb435
71e2c8808b3a0871619af4968dfaaa423a90b4c6
"2021-09-13T15:09:21Z"
java
"2021-09-14T03:46:47Z"
dolphinscheduler-service/src/main/java/org/apache/dolphinscheduler/service/process/ProcessService.java
} /** * find tenant code by resource name * * @param resName resource name * @param resourceType resource type * @return tenant code */ public String queryTenantCodeByResName(String resName, ResourceType resourceType) { // String fullName = resName.startsWith("/") ? resName : String.format("/%s", resName); List<Resource> resourceList = resourceMapper.queryResource(fullName, resourceType.ordinal()); if (CollectionUtils.isEmpty(resourceList)) { return StringUtils.EMPTY; } int userId = resourceList.get(0).getUserId(); User user = userMapper.selectById(userId); if (Objects.isNull(user)) { return StringUtils.EMPTY; } Tenant tenant = tenantMapper.selectById(user.getTenantId()); if (Objects.isNull(tenant)) { return StringUtils.EMPTY; } return tenant.getTenantCode(); } /** * find schedule list by process define codes. * * @param codes codes
closed
apache/dolphinscheduler
https://github.com/apache/dolphinscheduler
6,194
[Bug] [Server] Master build dag error
### 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 Perform multi version tasks ![image](https://user-images.githubusercontent.com/42576980/133109069-2b465273-4ebb-4f83-b9b4-ae0f8bce473d.png) ### What you expected to happen Normal execution ### How to reproduce Perform multi version tasks ### Anything else _No response_ ### Are you willing to submit PR? - [X] 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/6194
https://github.com/apache/dolphinscheduler/pull/6195
7029062f4c2f247e9eac333e28e36e66b03fb435
71e2c8808b3a0871619af4968dfaaa423a90b4c6
"2021-09-13T15:09:21Z"
java
"2021-09-14T03:46:47Z"
dolphinscheduler-service/src/main/java/org/apache/dolphinscheduler/service/process/ProcessService.java
* @return schedule list */ public List<Schedule> selectAllByProcessDefineCode(long[] codes) { return scheduleMapper.selectAllByProcessDefineArray(codes); } /** * find last scheduler process instance in the date interval * * @param definitionCode definitionCode * @param dateInterval dateInterval * @return process instance */ public ProcessInstance findLastSchedulerProcessInterval(Long definitionCode, DateInterval dateInterval) { return processInstanceMapper.queryLastSchedulerProcess(definitionCode, dateInterval.getStartTime(), dateInterval.getEndTime()); } /** * find last manual process instance interval * * @param definitionCode process definition code * @param dateInterval dateInterval * @return process instance */ public ProcessInstance findLastManualProcessInterval(Long definitionCode, DateInterval dateInterval) { return processInstanceMapper.queryLastManualProcess(definitionCode, dateInterval.getStartTime(), dateInterval.getEndTime()); } /**
closed
apache/dolphinscheduler
https://github.com/apache/dolphinscheduler
6,194
[Bug] [Server] Master build dag error
### 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 Perform multi version tasks ![image](https://user-images.githubusercontent.com/42576980/133109069-2b465273-4ebb-4f83-b9b4-ae0f8bce473d.png) ### What you expected to happen Normal execution ### How to reproduce Perform multi version tasks ### Anything else _No response_ ### Are you willing to submit PR? - [X] 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/6194
https://github.com/apache/dolphinscheduler/pull/6195
7029062f4c2f247e9eac333e28e36e66b03fb435
71e2c8808b3a0871619af4968dfaaa423a90b4c6
"2021-09-13T15:09:21Z"
java
"2021-09-14T03:46:47Z"
dolphinscheduler-service/src/main/java/org/apache/dolphinscheduler/service/process/ProcessService.java
* find last running process instance * * @param definitionCode process definition code * @param startTime start time * @param endTime end time * @return process instance */ public ProcessInstance findLastRunningProcess(Long definitionCode, Date startTime, Date endTime) { return processInstanceMapper.queryLastRunningProcess(definitionCode, startTime, endTime, stateArray); } /** * query user queue by process instance id * * @param processInstanceId processInstanceId * @return queue */ public String queryUserQueueByProcessInstanceId(int processInstanceId) { String queue = ""; ProcessInstance processInstance = processInstanceMapper.selectById(processInstanceId); if (processInstance == null) { return queue; } User executor = userMapper.selectById(processInstance.getExecutorId()); if (executor != null) { queue = executor.getQueue(); } return queue;
closed
apache/dolphinscheduler
https://github.com/apache/dolphinscheduler
6,194
[Bug] [Server] Master build dag error
### 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 Perform multi version tasks ![image](https://user-images.githubusercontent.com/42576980/133109069-2b465273-4ebb-4f83-b9b4-ae0f8bce473d.png) ### What you expected to happen Normal execution ### How to reproduce Perform multi version tasks ### Anything else _No response_ ### Are you willing to submit PR? - [X] 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/6194
https://github.com/apache/dolphinscheduler/pull/6195
7029062f4c2f247e9eac333e28e36e66b03fb435
71e2c8808b3a0871619af4968dfaaa423a90b4c6
"2021-09-13T15:09:21Z"
java
"2021-09-14T03:46:47Z"
dolphinscheduler-service/src/main/java/org/apache/dolphinscheduler/service/process/ProcessService.java
} /** * query project name and user name by processInstanceId. * * @param processInstanceId processInstanceId * @return projectName and userName */ public ProjectUser queryProjectWithUserByProcessInstanceId(int processInstanceId) { return projectMapper.queryProjectWithUserByProcessInstanceId(processInstanceId); } /** * get task worker group * * @param taskInstance taskInstance * @return workerGroupId */ public String getTaskWorkerGroup(TaskInstance taskInstance) { String workerGroup = taskInstance.getWorkerGroup(); if (StringUtils.isNotBlank(workerGroup)) { return workerGroup; } int processInstanceId = taskInstance.getProcessInstanceId(); ProcessInstance processInstance = findProcessInstanceById(processInstanceId); if (processInstance != null) { return processInstance.getWorkerGroup(); } logger.info("task : {} will use default worker group", taskInstance.getId()); return Constants.DEFAULT_WORKER_GROUP; } /**
closed
apache/dolphinscheduler
https://github.com/apache/dolphinscheduler
6,194
[Bug] [Server] Master build dag error
### 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 Perform multi version tasks ![image](https://user-images.githubusercontent.com/42576980/133109069-2b465273-4ebb-4f83-b9b4-ae0f8bce473d.png) ### What you expected to happen Normal execution ### How to reproduce Perform multi version tasks ### Anything else _No response_ ### Are you willing to submit PR? - [X] 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/6194
https://github.com/apache/dolphinscheduler/pull/6195
7029062f4c2f247e9eac333e28e36e66b03fb435
71e2c8808b3a0871619af4968dfaaa423a90b4c6
"2021-09-13T15:09:21Z"
java
"2021-09-14T03:46:47Z"
dolphinscheduler-service/src/main/java/org/apache/dolphinscheduler/service/process/ProcessService.java
* get have perm project list * * @param userId userId * @return project list */ public List<Project> getProjectListHavePerm(int userId) { List<Project> createProjects = projectMapper.queryProjectCreatedByUser(userId); List<Project> authedProjects = projectMapper.queryAuthedProjectListByUserId(userId); if (createProjects == null) { createProjects = new ArrayList<>(); } if (authedProjects != null) { createProjects.addAll(authedProjects); } return createProjects; } /** * list unauthorized udf function * * @param userId user id * @param needChecks data source id array * @return unauthorized udf function list */ public <T> List<T> listUnauthorized(int userId, T[] needChecks, AuthorizationType authorizationType) { List<T> resultList = new ArrayList<>(); if (Objects.nonNull(needChecks) && needChecks.length > 0) { Set<T> originResSet = new HashSet<>(Arrays.asList(needChecks)); switch (authorizationType) { case RESOURCE_FILE_ID: case UDF_FILE:
closed
apache/dolphinscheduler
https://github.com/apache/dolphinscheduler
6,194
[Bug] [Server] Master build dag error
### 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 Perform multi version tasks ![image](https://user-images.githubusercontent.com/42576980/133109069-2b465273-4ebb-4f83-b9b4-ae0f8bce473d.png) ### What you expected to happen Normal execution ### How to reproduce Perform multi version tasks ### Anything else _No response_ ### Are you willing to submit PR? - [X] 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/6194
https://github.com/apache/dolphinscheduler/pull/6195
7029062f4c2f247e9eac333e28e36e66b03fb435
71e2c8808b3a0871619af4968dfaaa423a90b4c6
"2021-09-13T15:09:21Z"
java
"2021-09-14T03:46:47Z"
dolphinscheduler-service/src/main/java/org/apache/dolphinscheduler/service/process/ProcessService.java
List<Resource> ownUdfResources = resourceMapper.listAuthorizedResourceById(userId, needChecks); addAuthorizedResources(ownUdfResources, userId); Set<Integer> authorizedResourceFiles = ownUdfResources.stream().map(Resource::getId).collect(toSet()); originResSet.removeAll(authorizedResourceFiles); break; case RESOURCE_FILE_NAME: List<Resource> ownResources = resourceMapper.listAuthorizedResource(userId, needChecks); addAuthorizedResources(ownResources, userId); Set<String> authorizedResources = ownResources.stream().map(Resource::getFullName).collect(toSet()); originResSet.removeAll(authorizedResources); break; case DATASOURCE: Set<Integer> authorizedDatasources = dataSourceMapper.listAuthorizedDataSource(userId, needChecks).stream().map(DataSource::getId).collect(toSet()); originResSet.removeAll(authorizedDatasources); break; case UDF: Set<Integer> authorizedUdfs = udfFuncMapper.listAuthorizedUdfFunc(userId, needChecks).stream().map(UdfFunc::getId).collect(toSet()); originResSet.removeAll(authorizedUdfs); break; default: break; } resultList.addAll(originResSet); } return resultList; } /** * get user by user id * * @param userId user id
closed
apache/dolphinscheduler
https://github.com/apache/dolphinscheduler
6,194
[Bug] [Server] Master build dag error
### 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 Perform multi version tasks ![image](https://user-images.githubusercontent.com/42576980/133109069-2b465273-4ebb-4f83-b9b4-ae0f8bce473d.png) ### What you expected to happen Normal execution ### How to reproduce Perform multi version tasks ### Anything else _No response_ ### Are you willing to submit PR? - [X] 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/6194
https://github.com/apache/dolphinscheduler/pull/6195
7029062f4c2f247e9eac333e28e36e66b03fb435
71e2c8808b3a0871619af4968dfaaa423a90b4c6
"2021-09-13T15:09:21Z"
java
"2021-09-14T03:46:47Z"
dolphinscheduler-service/src/main/java/org/apache/dolphinscheduler/service/process/ProcessService.java
* @return User */ public User getUserById(int userId) { return userMapper.selectById(userId); } /** * get resource by resource id * * @param resourceId resource id * @return Resource */ public Resource getResourceById(int resourceId) { return resourceMapper.selectById(resourceId); } /** * list resources by ids * * @param resIds resIds * @return resource list */ public List<Resource> listResourceByIds(Integer[] resIds) { return resourceMapper.listResourceByIds(resIds); } /** * format task app id in task instance */ public String formatTaskAppId(TaskInstance taskInstance) { ProcessInstance processInstance = findProcessInstanceById(taskInstance.getProcessInstanceId()); if (processInstance == null) { return "";
closed
apache/dolphinscheduler
https://github.com/apache/dolphinscheduler
6,194
[Bug] [Server] Master build dag error
### 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 Perform multi version tasks ![image](https://user-images.githubusercontent.com/42576980/133109069-2b465273-4ebb-4f83-b9b4-ae0f8bce473d.png) ### What you expected to happen Normal execution ### How to reproduce Perform multi version tasks ### Anything else _No response_ ### Are you willing to submit PR? - [X] 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/6194
https://github.com/apache/dolphinscheduler/pull/6195
7029062f4c2f247e9eac333e28e36e66b03fb435
71e2c8808b3a0871619af4968dfaaa423a90b4c6
"2021-09-13T15:09:21Z"
java
"2021-09-14T03:46:47Z"
dolphinscheduler-service/src/main/java/org/apache/dolphinscheduler/service/process/ProcessService.java
} ProcessDefinition definition = findProcessDefinition(processInstance.getProcessDefinitionCode(), processInstance.getProcessDefinitionVersion()); if (definition == null) { return ""; } return String.format("%s_%s_%s", definition.getId(), processInstance.getId(), taskInstance.getId()); } /** * switch process definition version to process definition log version */ public int processDefinitionToDB(ProcessDefinition processDefinition, ProcessDefinitionLog processDefinitionLog, Boolean isFromProcessDefine) { if (null == processDefinition || null == processDefinitionLog) { return Constants.DEFINITION_FAILURE; } processDefinitionLog.setId(processDefinition.getId()); processDefinitionLog.setReleaseState(isFromProcessDefine ? ReleaseState.OFFLINE : ReleaseState.ONLINE); processDefinitionLog.setFlag(Flag.YES); int result; if (0 == processDefinition.getId()) { result = processDefineMapper.insert(processDefinitionLog); } else { result = processDefineMapper.updateById(processDefinitionLog); } return result; } /** * switch process definition version to process definition log version */ public int switchVersion(ProcessDefinition processDefinition, ProcessDefinitionLog processDefinitionLog) { int switchResult = processDefinitionToDB(processDefinition, processDefinitionLog, true);
closed
apache/dolphinscheduler
https://github.com/apache/dolphinscheduler
6,194
[Bug] [Server] Master build dag error
### 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 Perform multi version tasks ![image](https://user-images.githubusercontent.com/42576980/133109069-2b465273-4ebb-4f83-b9b4-ae0f8bce473d.png) ### What you expected to happen Normal execution ### How to reproduce Perform multi version tasks ### Anything else _No response_ ### Are you willing to submit PR? - [X] 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/6194
https://github.com/apache/dolphinscheduler/pull/6195
7029062f4c2f247e9eac333e28e36e66b03fb435
71e2c8808b3a0871619af4968dfaaa423a90b4c6
"2021-09-13T15:09:21Z"
java
"2021-09-14T03:46:47Z"
dolphinscheduler-service/src/main/java/org/apache/dolphinscheduler/service/process/ProcessService.java
if (switchResult != Constants.DEFINITION_FAILURE) { switchResult = switchProcessTaskRelationVersion(processDefinition); } return switchResult; } public int switchProcessTaskRelationVersion(ProcessDefinition processDefinition) { List<ProcessTaskRelation> processTaskRelationList = processTaskRelationMapper.queryByProcessCode(processDefinition.getProjectCode(), processDefinition.getCode()); if (!processTaskRelationList.isEmpty()) { processTaskRelationMapper.deleteByCode(processDefinition.getProjectCode(), processDefinition.getCode()); } int result = 0; List<ProcessTaskRelationLog> processTaskRelationLogList = processTaskRelationLogMapper.queryByProcessCodeAndVersion(processDefinition.getCode(), processDefinition.getVersion()); for (ProcessTaskRelationLog processTaskRelationLog : processTaskRelationLogList) { result += processTaskRelationMapper.insert(processTaskRelationLog); } return result; } /** * update task definition */ public int updateTaskDefinition(User operator, Long projectCode, TaskNode taskNode, TaskDefinition taskDefinition) { Integer version = taskDefinitionLogMapper.queryMaxVersionForDefinition(taskDefinition.getCode()); Date now = new Date(); taskDefinition.setProjectCode(projectCode); taskDefinition.setUserId(operator.getId()); taskDefinition.setVersion(version == null || version == 0 ? 1 : version + 1); taskDefinition.setUpdateTime(now); setTaskFromTaskNode(taskNode, taskDefinition); int update = taskDefinitionMapper.updateById(taskDefinition); //
closed
apache/dolphinscheduler
https://github.com/apache/dolphinscheduler
6,194
[Bug] [Server] Master build dag error
### 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 Perform multi version tasks ![image](https://user-images.githubusercontent.com/42576980/133109069-2b465273-4ebb-4f83-b9b4-ae0f8bce473d.png) ### What you expected to happen Normal execution ### How to reproduce Perform multi version tasks ### Anything else _No response_ ### Are you willing to submit PR? - [X] 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/6194
https://github.com/apache/dolphinscheduler/pull/6195
7029062f4c2f247e9eac333e28e36e66b03fb435
71e2c8808b3a0871619af4968dfaaa423a90b4c6
"2021-09-13T15:09:21Z"
java
"2021-09-14T03:46:47Z"
dolphinscheduler-service/src/main/java/org/apache/dolphinscheduler/service/process/ProcessService.java
TaskDefinitionLog taskDefinitionLog = new TaskDefinitionLog(taskDefinition); taskDefinitionLog.setOperator(operator.getId()); taskDefinitionLog.setOperateTime(now); int insert = taskDefinitionLogMapper.insert(taskDefinitionLog); return insert & update; } private void setTaskFromTaskNode(TaskNode taskNode, TaskDefinition taskDefinition) { taskDefinition.setName(taskNode.getName()); taskDefinition.setDescription(taskNode.getDesc()); taskDefinition.setTaskType(taskNode.getType().toUpperCase()); taskDefinition.setTaskParams(taskNode.getTaskParams()); taskDefinition.setFlag(taskNode.isForbidden() ? Flag.NO : Flag.YES); taskDefinition.setTaskPriority(taskNode.getTaskInstancePriority()); taskDefinition.setWorkerGroup(taskNode.getWorkerGroup()); taskDefinition.setEnvironmentCode(Objects.isNull(taskNode.getEnvironmentCode()) ? -1 : taskNode.getEnvironmentCode()); taskDefinition.setFailRetryTimes(taskNode.getMaxRetryTimes()); taskDefinition.setFailRetryInterval(taskNode.getRetryInterval()); taskDefinition.setTimeoutFlag(taskNode.getTaskTimeoutParameter().getEnable() ? TimeoutFlag.OPEN : TimeoutFlag.CLOSE); taskDefinition.setTimeoutNotifyStrategy(taskNode.getTaskTimeoutParameter().getStrategy()); taskDefinition.setTimeout(taskNode.getTaskTimeoutParameter().getInterval()); taskDefinition.setDelayTime(taskNode.getDelayTime()); taskDefinition.setResourceIds(getResourceIds(taskDefinition)); } /** * get resource ids * * @param taskDefinition taskDefinition * @return resource ids */ public String getResourceIds(TaskDefinition taskDefinition) {
closed
apache/dolphinscheduler
https://github.com/apache/dolphinscheduler
6,194
[Bug] [Server] Master build dag error
### 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 Perform multi version tasks ![image](https://user-images.githubusercontent.com/42576980/133109069-2b465273-4ebb-4f83-b9b4-ae0f8bce473d.png) ### What you expected to happen Normal execution ### How to reproduce Perform multi version tasks ### Anything else _No response_ ### Are you willing to submit PR? - [X] 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/6194
https://github.com/apache/dolphinscheduler/pull/6195
7029062f4c2f247e9eac333e28e36e66b03fb435
71e2c8808b3a0871619af4968dfaaa423a90b4c6
"2021-09-13T15:09:21Z"
java
"2021-09-14T03:46:47Z"
dolphinscheduler-service/src/main/java/org/apache/dolphinscheduler/service/process/ProcessService.java
Set<Integer> resourceIds = null; AbstractParameters params = TaskParametersUtils.getParameters(taskDefinition.getTaskType(), taskDefinition.getTaskParams()); if (params != null && CollectionUtils.isNotEmpty(params.getResourceFilesList())) { resourceIds = params.getResourceFilesList(). stream() .filter(t -> t.getId() != 0) .map(ResourceInfo::getId) .collect(Collectors.toSet()); } if (CollectionUtils.isEmpty(resourceIds)) { return StringUtils.EMPTY; } return StringUtils.join(resourceIds, ","); } public boolean saveTaskDefine(User operator, long projectCode, List<TaskDefinitionLog> taskDefinitionLogs) { Date now = new Date(); List<TaskDefinitionLog> newTaskDefinitionLogs = new ArrayList<>(); List<TaskDefinitionLog> updateTaskDefinitionLogs = new ArrayList<>(); for (TaskDefinitionLog taskDefinitionLog : taskDefinitionLogs) { taskDefinitionLog.setProjectCode(projectCode); taskDefinitionLog.setUpdateTime(now); taskDefinitionLog.setOperateTime(now); taskDefinitionLog.setOperator(operator.getId()); taskDefinitionLog.setResourceIds(getResourceIds(taskDefinitionLog)); if (taskDefinitionLog.getCode() > 0 && taskDefinitionLog.getVersion() > 0) { TaskDefinitionLog definitionCodeAndVersion = taskDefinitionLogMapper .queryByDefinitionCodeAndVersion(taskDefinitionLog.getCode(), taskDefinitionLog.getVersion()); if (definitionCodeAndVersion != null) { if (!taskDefinitionLog.equals(definitionCodeAndVersion)) { taskDefinitionLog.setUserId(definitionCodeAndVersion.getUserId());
closed
apache/dolphinscheduler
https://github.com/apache/dolphinscheduler
6,194
[Bug] [Server] Master build dag error
### 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 Perform multi version tasks ![image](https://user-images.githubusercontent.com/42576980/133109069-2b465273-4ebb-4f83-b9b4-ae0f8bce473d.png) ### What you expected to happen Normal execution ### How to reproduce Perform multi version tasks ### Anything else _No response_ ### Are you willing to submit PR? - [X] 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/6194
https://github.com/apache/dolphinscheduler/pull/6195
7029062f4c2f247e9eac333e28e36e66b03fb435
71e2c8808b3a0871619af4968dfaaa423a90b4c6
"2021-09-13T15:09:21Z"
java
"2021-09-14T03:46:47Z"
dolphinscheduler-service/src/main/java/org/apache/dolphinscheduler/service/process/ProcessService.java
Integer version = taskDefinitionLogMapper.queryMaxVersionForDefinition(taskDefinitionLog.getCode()); taskDefinitionLog.setVersion(version + 1); taskDefinitionLog.setCreateTime(definitionCodeAndVersion.getCreateTime()); updateTaskDefinitionLogs.add(taskDefinitionLog); } continue; } } taskDefinitionLog.setUserId(operator.getId()); taskDefinitionLog.setVersion(Constants.VERSION_FIRST); taskDefinitionLog.setCreateTime(now); if (taskDefinitionLog.getCode() == 0) { try { taskDefinitionLog.setCode(SnowFlakeUtils.getInstance().nextId()); } catch (SnowFlakeException e) { logger.error("Task code get error, ", e); return false; } } newTaskDefinitionLogs.add(taskDefinitionLog); } for (TaskDefinitionLog taskDefinitionToUpdate : updateTaskDefinitionLogs) { TaskDefinition task = taskDefinitionMapper.queryByCode(taskDefinitionToUpdate.getCode()); if (task == null) { newTaskDefinitionLogs.add(taskDefinitionToUpdate); } else { int insert = taskDefinitionLogMapper.insert(taskDefinitionToUpdate); taskDefinitionToUpdate.setId(task.getId()); int update = taskDefinitionMapper.updateById(taskDefinitionToUpdate); if ((update & insert) != 1) {
closed
apache/dolphinscheduler
https://github.com/apache/dolphinscheduler
6,194
[Bug] [Server] Master build dag error
### 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 Perform multi version tasks ![image](https://user-images.githubusercontent.com/42576980/133109069-2b465273-4ebb-4f83-b9b4-ae0f8bce473d.png) ### What you expected to happen Normal execution ### How to reproduce Perform multi version tasks ### Anything else _No response_ ### Are you willing to submit PR? - [X] 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/6194
https://github.com/apache/dolphinscheduler/pull/6195
7029062f4c2f247e9eac333e28e36e66b03fb435
71e2c8808b3a0871619af4968dfaaa423a90b4c6
"2021-09-13T15:09:21Z"
java
"2021-09-14T03:46:47Z"
dolphinscheduler-service/src/main/java/org/apache/dolphinscheduler/service/process/ProcessService.java
return false; } } } if (!newTaskDefinitionLogs.isEmpty()) { int insert = taskDefinitionMapper.batchInsert(newTaskDefinitionLogs); int logInsert = taskDefinitionLogMapper.batchInsert(newTaskDefinitionLogs); return (logInsert & insert) != 0; } return true; } /** * save processDefinition (including create or update processDefinition) */ public int saveProcessDefine(User operator, ProcessDefinition processDefinition, Boolean isFromProcessDefine) { ProcessDefinitionLog processDefinitionLog = new ProcessDefinitionLog(processDefinition); Integer version = processDefineLogMapper.queryMaxVersionForDefinition(processDefinition.getCode()); int insertVersion = version == null || version == 0 ? Constants.VERSION_FIRST : version + 1; processDefinitionLog.setVersion(insertVersion); processDefinitionLog.setReleaseState(isFromProcessDefine ? ReleaseState.OFFLINE : ReleaseState.ONLINE); processDefinitionLog.setOperator(operator.getId()); processDefinitionLog.setOperateTime(processDefinition.getUpdateTime()); int insertLog = processDefineLogMapper.insert(processDefinitionLog); int result; if (0 == processDefinition.getId()) { result = processDefineMapper.insert(processDefinitionLog); } else { processDefinitionLog.setId(processDefinition.getId()); result = processDefineMapper.updateById(processDefinitionLog); }
closed
apache/dolphinscheduler
https://github.com/apache/dolphinscheduler
6,194
[Bug] [Server] Master build dag error
### 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 Perform multi version tasks ![image](https://user-images.githubusercontent.com/42576980/133109069-2b465273-4ebb-4f83-b9b4-ae0f8bce473d.png) ### What you expected to happen Normal execution ### How to reproduce Perform multi version tasks ### Anything else _No response_ ### Are you willing to submit PR? - [X] 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/6194
https://github.com/apache/dolphinscheduler/pull/6195
7029062f4c2f247e9eac333e28e36e66b03fb435
71e2c8808b3a0871619af4968dfaaa423a90b4c6
"2021-09-13T15:09:21Z"
java
"2021-09-14T03:46:47Z"
dolphinscheduler-service/src/main/java/org/apache/dolphinscheduler/service/process/ProcessService.java
return (insertLog & result) > 0 ? insertVersion : 0; } /** * save task relations */ public int saveTaskRelation(User operator, long projectCode, long processDefinitionCode, int processDefinitionVersion, List<ProcessTaskRelationLog> taskRelationList, List<TaskDefinitionLog> taskDefinitionLogs) { Map<Long, TaskDefinitionLog> taskDefinitionLogMap = null; if (CollectionUtils.isNotEmpty(taskDefinitionLogs)) { taskDefinitionLogMap = taskDefinitionLogs.stream() .collect(Collectors.toMap(TaskDefinition::getCode, taskDefinitionLog -> taskDefinitionLog)); } Date now = new Date(); for (ProcessTaskRelationLog processTaskRelationLog : taskRelationList) { processTaskRelationLog.setProjectCode(projectCode); processTaskRelationLog.setProcessDefinitionCode(processDefinitionCode); processTaskRelationLog.setProcessDefinitionVersion(processDefinitionVersion); if (taskDefinitionLogMap != null) { TaskDefinitionLog taskDefinitionLog = taskDefinitionLogMap.get(processTaskRelationLog.getPreTaskCode()); if (taskDefinitionLog != null) { processTaskRelationLog.setPreTaskVersion(taskDefinitionLog.getVersion()); } processTaskRelationLog.setPostTaskVersion(taskDefinitionLogMap.get(processTaskRelationLog.getPostTaskCode()).getVersion()); } processTaskRelationLog.setCreateTime(now); processTaskRelationLog.setUpdateTime(now); processTaskRelationLog.setOperator(operator.getId()); processTaskRelationLog.setOperateTime(now); } List<ProcessTaskRelation> processTaskRelationList = processTaskRelationMapper.queryByProcessCode(projectCode, processDefinitionCode);
closed
apache/dolphinscheduler
https://github.com/apache/dolphinscheduler
6,194
[Bug] [Server] Master build dag error
### 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 Perform multi version tasks ![image](https://user-images.githubusercontent.com/42576980/133109069-2b465273-4ebb-4f83-b9b4-ae0f8bce473d.png) ### What you expected to happen Normal execution ### How to reproduce Perform multi version tasks ### Anything else _No response_ ### Are you willing to submit PR? - [X] 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/6194
https://github.com/apache/dolphinscheduler/pull/6195
7029062f4c2f247e9eac333e28e36e66b03fb435
71e2c8808b3a0871619af4968dfaaa423a90b4c6
"2021-09-13T15:09:21Z"
java
"2021-09-14T03:46:47Z"
dolphinscheduler-service/src/main/java/org/apache/dolphinscheduler/service/process/ProcessService.java
if (!processTaskRelationList.isEmpty()) { Set<Integer> processTaskRelationSet = processTaskRelationList.stream().map(ProcessTaskRelation::hashCode).collect(toSet()); Set<Integer> taskRelationSet = taskRelationList.stream().map(ProcessTaskRelationLog::hashCode).collect(toSet()); if (CollectionUtils.isEqualCollection(processTaskRelationSet, taskRelationSet)) { return Constants.EXIT_CODE_SUCCESS; } processTaskRelationMapper.deleteByCode(projectCode, processDefinitionCode); } int result = processTaskRelationMapper.batchInsert(taskRelationList); int resultLog = processTaskRelationLogMapper.batchInsert(taskRelationList); return (result & resultLog) > 0 ? Constants.EXIT_CODE_SUCCESS : Constants.EXIT_CODE_FAILURE; } public boolean isTaskOnline(long taskCode) { List<ProcessTaskRelation> processTaskRelationList = processTaskRelationMapper.queryByTaskCode(taskCode); if (!processTaskRelationList.isEmpty()) { Set<Long> processDefinitionCodes = processTaskRelationList .stream() .map(ProcessTaskRelation::getProcessDefinitionCode) .collect(Collectors.toSet()); List<ProcessDefinition> processDefinitionList = processDefineMapper.queryByCodes(processDefinitionCodes); // for (ProcessDefinition processDefinition : processDefinitionList) { if (processDefinition.getReleaseState() == ReleaseState.ONLINE) { return true; } } } return false; } /**
closed
apache/dolphinscheduler
https://github.com/apache/dolphinscheduler
6,194
[Bug] [Server] Master build dag error
### 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 Perform multi version tasks ![image](https://user-images.githubusercontent.com/42576980/133109069-2b465273-4ebb-4f83-b9b4-ae0f8bce473d.png) ### What you expected to happen Normal execution ### How to reproduce Perform multi version tasks ### Anything else _No response_ ### Are you willing to submit PR? - [X] 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/6194
https://github.com/apache/dolphinscheduler/pull/6195
7029062f4c2f247e9eac333e28e36e66b03fb435
71e2c8808b3a0871619af4968dfaaa423a90b4c6
"2021-09-13T15:09:21Z"
java
"2021-09-14T03:46:47Z"
dolphinscheduler-service/src/main/java/org/apache/dolphinscheduler/service/process/ProcessService.java
* Generate the DAG Graph based on the process definition id * * @param processDefinition process definition * @return dag graph */ public DAG<String, TaskNode, TaskNodeRelation> genDagGraph(ProcessDefinition processDefinition) { List<ProcessTaskRelation> processTaskRelations = processTaskRelationMapper.queryByProcessCode(processDefinition.getProjectCode(), processDefinition.getCode()); List<TaskNode> taskNodeList = transformTask(processTaskRelations, Lists.newArrayList()); ProcessDag processDag = DagHelper.getProcessDag(taskNodeList, new ArrayList<>(processTaskRelations)); // return DagHelper.buildDagGraph(processDag); } /** * generate DagData */ public DagData genDagData(ProcessDefinition processDefinition) { List<ProcessTaskRelation> processTaskRelations = processTaskRelationMapper.queryByProcessCode(processDefinition.getProjectCode(), processDefinition.getCode()); List<TaskDefinitionLog> taskDefinitionLogList = genTaskDefineList(processTaskRelations); List<TaskDefinition> taskDefinitions = taskDefinitionLogList.stream() .map(taskDefinitionLog -> JSONUtils.parseObject(JSONUtils.toJsonString(taskDefinitionLog), TaskDefinition.class)) .collect(Collectors.toList()); return new DagData(processDefinition, processTaskRelations, taskDefinitions); } public List<TaskDefinitionLog> genTaskDefineList(List<ProcessTaskRelation> processTaskRelations) { Set<TaskDefinition> taskDefinitionSet = new HashSet<>(); for (ProcessTaskRelation processTaskRelation : processTaskRelations) { if (processTaskRelation.getPreTaskCode() > 0) { taskDefinitionSet.add(new TaskDefinition(processTaskRelation.getPreTaskCode(), processTaskRelation.getPreTaskVersion())); } if (processTaskRelation.getPostTaskCode() > 0) {
closed
apache/dolphinscheduler
https://github.com/apache/dolphinscheduler
6,194
[Bug] [Server] Master build dag error
### 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 Perform multi version tasks ![image](https://user-images.githubusercontent.com/42576980/133109069-2b465273-4ebb-4f83-b9b4-ae0f8bce473d.png) ### What you expected to happen Normal execution ### How to reproduce Perform multi version tasks ### Anything else _No response_ ### Are you willing to submit PR? - [X] 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/6194
https://github.com/apache/dolphinscheduler/pull/6195
7029062f4c2f247e9eac333e28e36e66b03fb435
71e2c8808b3a0871619af4968dfaaa423a90b4c6
"2021-09-13T15:09:21Z"
java
"2021-09-14T03:46:47Z"
dolphinscheduler-service/src/main/java/org/apache/dolphinscheduler/service/process/ProcessService.java
taskDefinitionSet.add(new TaskDefinition(processTaskRelation.getPostTaskCode(), processTaskRelation.getPostTaskVersion())); } } return taskDefinitionLogMapper.queryByTaskDefinitions(taskDefinitionSet); } @Deprecated public List<TaskNode> genTaskNodeList(Long processCode, int processVersion, Map<String, String> locationMap) { List<ProcessTaskRelationLog> processTaskRelations = processTaskRelationLogMapper.queryByProcessCodeAndVersion(processCode, processVersion); Set<TaskDefinition> taskDefinitionSet = new HashSet<>(); Map<Long, TaskNode> taskNodeMap = new HashMap<>(); for (ProcessTaskRelationLog processTaskRelation : processTaskRelations) { if (processTaskRelation.getPreTaskCode() > 0) { taskDefinitionSet.add(new TaskDefinition(processTaskRelation.getPreTaskCode(), processTaskRelation.getPreTaskVersion())); } if (processTaskRelation.getPostTaskCode() > 0) { taskDefinitionSet.add(new TaskDefinition(processTaskRelation.getPostTaskCode(), processTaskRelation.getPostTaskVersion())); } taskNodeMap.compute(processTaskRelation.getPostTaskCode(), (k, v) -> { if (v == null) { v = new TaskNode(); v.setCode(processTaskRelation.getPostTaskCode()); v.setVersion(processTaskRelation.getPostTaskVersion()); List<PreviousTaskNode> preTaskNodeList = new ArrayList<>(); if (processTaskRelation.getPreTaskCode() > 0) { preTaskNodeList.add(new PreviousTaskNode(processTaskRelation.getPreTaskCode(), "", processTaskRelation.getPreTaskVersion())); } v.setPreTaskNodeList(preTaskNodeList); } else { List<PreviousTaskNode> preTaskDefinitionList = v.getPreTaskNodeList(); preTaskDefinitionList.add(new PreviousTaskNode(processTaskRelation.getPreTaskCode(), "", processTaskRelation.getPreTaskVersion()));
closed
apache/dolphinscheduler
https://github.com/apache/dolphinscheduler
6,194
[Bug] [Server] Master build dag error
### 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 Perform multi version tasks ![image](https://user-images.githubusercontent.com/42576980/133109069-2b465273-4ebb-4f83-b9b4-ae0f8bce473d.png) ### What you expected to happen Normal execution ### How to reproduce Perform multi version tasks ### Anything else _No response_ ### Are you willing to submit PR? - [X] 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/6194
https://github.com/apache/dolphinscheduler/pull/6195
7029062f4c2f247e9eac333e28e36e66b03fb435
71e2c8808b3a0871619af4968dfaaa423a90b4c6
"2021-09-13T15:09:21Z"
java
"2021-09-14T03:46:47Z"
dolphinscheduler-service/src/main/java/org/apache/dolphinscheduler/service/process/ProcessService.java
} return v; }); } List<TaskDefinitionLog> taskDefinitionLogs = taskDefinitionLogMapper.queryByTaskDefinitions(taskDefinitionSet); Map<Long, TaskDefinitionLog> taskDefinitionLogMap = taskDefinitionLogs.stream().collect(Collectors.toMap(TaskDefinitionLog::getCode, log -> log)); taskNodeMap.forEach((k, v) -> { TaskDefinitionLog taskDefinitionLog = taskDefinitionLogMap.get(k); v.setId(locationMap.get(taskDefinitionLog.getName())); v.setCode(taskDefinitionLog.getCode()); v.setName(taskDefinitionLog.getName()); v.setDesc(taskDefinitionLog.getDescription()); v.setType(taskDefinitionLog.getTaskType().toUpperCase()); v.setRunFlag(taskDefinitionLog.getFlag() == Flag.YES ? Constants.FLOWNODE_RUN_FLAG_NORMAL : Constants.FLOWNODE_RUN_FLAG_FORBIDDEN); v.setMaxRetryTimes(taskDefinitionLog.getFailRetryTimes()); v.setRetryInterval(taskDefinitionLog.getFailRetryInterval()); Map<String, Object> taskParamsMap = v.taskParamsToJsonObj(taskDefinitionLog.getTaskParams()); v.setConditionResult(JSONUtils.toJsonString(taskParamsMap.get(Constants.CONDITION_RESULT))); v.setSwitchResult(JSONUtils.toJsonString(taskParamsMap.get(Constants.SWITCH_RESULT))); v.setDependence(JSONUtils.toJsonString(taskParamsMap.get(Constants.DEPENDENCE))); taskParamsMap.remove(Constants.CONDITION_RESULT); taskParamsMap.remove(Constants.DEPENDENCE); v.setParams(JSONUtils.toJsonString(taskParamsMap)); v.setTaskInstancePriority(taskDefinitionLog.getTaskPriority()); v.setWorkerGroup(taskDefinitionLog.getWorkerGroup()); v.setEnvironmentCode(taskDefinitionLog.getEnvironmentCode()); v.setTimeout(JSONUtils.toJsonString(new TaskTimeoutParameter(taskDefinitionLog.getTimeoutFlag() == TimeoutFlag.OPEN, taskDefinitionLog.getTimeoutNotifyStrategy(), taskDefinitionLog.getTimeout()))); v.setDelayTime(taskDefinitionLog.getDelayTime());
closed
apache/dolphinscheduler
https://github.com/apache/dolphinscheduler
6,194
[Bug] [Server] Master build dag error
### 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 Perform multi version tasks ![image](https://user-images.githubusercontent.com/42576980/133109069-2b465273-4ebb-4f83-b9b4-ae0f8bce473d.png) ### What you expected to happen Normal execution ### How to reproduce Perform multi version tasks ### Anything else _No response_ ### Are you willing to submit PR? - [X] 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/6194
https://github.com/apache/dolphinscheduler/pull/6195
7029062f4c2f247e9eac333e28e36e66b03fb435
71e2c8808b3a0871619af4968dfaaa423a90b4c6
"2021-09-13T15:09:21Z"
java
"2021-09-14T03:46:47Z"
dolphinscheduler-service/src/main/java/org/apache/dolphinscheduler/service/process/ProcessService.java
v.getPreTaskNodeList().forEach(task -> task.setName(taskDefinitionLogMap.get(task.getCode()).getName())); v.setPreTasks(JSONUtils.toJsonString(v.getPreTaskNodeList().stream().map(PreviousTaskNode::getName).collect(Collectors.toList()))); }); return new ArrayList<>(taskNodeMap.values()); } /** * find task definition by code and version */ public TaskDefinition findTaskDefinition(long taskCode, int taskDefinitionVersion) { return taskDefinitionLogMapper.queryByDefinitionCodeAndVersion(taskCode, taskDefinitionVersion); } /** * add authorized resources * * @param ownResources own resources * @param userId userId */ private void addAuthorizedResources(List<Resource> ownResources, int userId) { List<Integer> relationResourceIds = resourceUserMapper.queryResourcesIdListByUserIdAndPerm(userId, 7); List<Resource> relationResources = CollectionUtils.isNotEmpty(relationResourceIds) ? resourceMapper.queryResourceListById(relationResourceIds) : new ArrayList<>(); ownResources.addAll(relationResources); } /** * Use temporarily before refactoring taskNode */ public List<TaskNode> transformTask(List<ProcessTaskRelation> taskRelationList, List<TaskDefinitionLog> taskDefinitionLogs) { Map<Long, List<Long>> taskCodeMap = new HashMap<>(); for (ProcessTaskRelation processTaskRelation : taskRelationList) { taskCodeMap.compute(processTaskRelation.getPostTaskCode(), (k, v) -> { if (v == null) {
closed
apache/dolphinscheduler
https://github.com/apache/dolphinscheduler
6,194
[Bug] [Server] Master build dag error
### 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 Perform multi version tasks ![image](https://user-images.githubusercontent.com/42576980/133109069-2b465273-4ebb-4f83-b9b4-ae0f8bce473d.png) ### What you expected to happen Normal execution ### How to reproduce Perform multi version tasks ### Anything else _No response_ ### Are you willing to submit PR? - [X] 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/6194
https://github.com/apache/dolphinscheduler/pull/6195
7029062f4c2f247e9eac333e28e36e66b03fb435
71e2c8808b3a0871619af4968dfaaa423a90b4c6
"2021-09-13T15:09:21Z"
java
"2021-09-14T03:46:47Z"
dolphinscheduler-service/src/main/java/org/apache/dolphinscheduler/service/process/ProcessService.java
v = new ArrayList<>(); } if (processTaskRelation.getPreTaskCode() != 0L) { v.add(processTaskRelation.getPreTaskCode()); } return v; }); } if (CollectionUtils.isEmpty(taskDefinitionLogs)) { taskDefinitionLogs = genTaskDefineList(taskRelationList); } Map<Long, TaskDefinitionLog> taskDefinitionLogMap = taskDefinitionLogs.stream() .collect(Collectors.toMap(TaskDefinitionLog::getCode, taskDefinitionLog -> taskDefinitionLog)); List<TaskNode> taskNodeList = new ArrayList<>(); for (Entry<Long, List<Long>> code : taskCodeMap.entrySet()) { TaskDefinitionLog taskDefinitionLog = taskDefinitionLogMap.get(code.getKey()); if (taskDefinitionLog != null) { TaskNode taskNode = new TaskNode(); taskNode.setCode(taskDefinitionLog.getCode()); taskNode.setVersion(taskDefinitionLog.getVersion()); taskNode.setName(taskDefinitionLog.getName()); taskNode.setDesc(taskDefinitionLog.getDescription()); taskNode.setType(taskDefinitionLog.getTaskType().toUpperCase()); taskNode.setRunFlag(taskDefinitionLog.getFlag() == Flag.YES ? Constants.FLOWNODE_RUN_FLAG_NORMAL : Constants.FLOWNODE_RUN_FLAG_FORBIDDEN); taskNode.setMaxRetryTimes(taskDefinitionLog.getFailRetryTimes()); taskNode.setRetryInterval(taskDefinitionLog.getFailRetryInterval()); Map<String, Object> taskParamsMap = taskNode.taskParamsToJsonObj(taskDefinitionLog.getTaskParams()); taskNode.setConditionResult(JSONUtils.toJsonString(taskParamsMap.get(Constants.CONDITION_RESULT))); taskNode.setDependence(JSONUtils.toJsonString(taskParamsMap.get(Constants.DEPENDENCE))); taskParamsMap.remove(Constants.CONDITION_RESULT);
closed
apache/dolphinscheduler
https://github.com/apache/dolphinscheduler
6,194
[Bug] [Server] Master build dag error
### 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 Perform multi version tasks ![image](https://user-images.githubusercontent.com/42576980/133109069-2b465273-4ebb-4f83-b9b4-ae0f8bce473d.png) ### What you expected to happen Normal execution ### How to reproduce Perform multi version tasks ### Anything else _No response_ ### Are you willing to submit PR? - [X] 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/6194
https://github.com/apache/dolphinscheduler/pull/6195
7029062f4c2f247e9eac333e28e36e66b03fb435
71e2c8808b3a0871619af4968dfaaa423a90b4c6
"2021-09-13T15:09:21Z"
java
"2021-09-14T03:46:47Z"
dolphinscheduler-service/src/main/java/org/apache/dolphinscheduler/service/process/ProcessService.java
taskParamsMap.remove(Constants.DEPENDENCE); taskNode.setParams(JSONUtils.toJsonString(taskParamsMap)); taskNode.setTaskInstancePriority(taskDefinitionLog.getTaskPriority()); taskNode.setWorkerGroup(taskDefinitionLog.getWorkerGroup()); taskNode.setTimeout(JSONUtils.toJsonString(new TaskTimeoutParameter(taskDefinitionLog.getTimeoutFlag() == TimeoutFlag.OPEN, taskDefinitionLog.getTimeoutNotifyStrategy(), taskDefinitionLog.getTimeout()))); taskNode.setDelayTime(taskDefinitionLog.getDelayTime()); taskNode.setPreTasks(JSONUtils.toJsonString(code.getValue().stream().map(taskDefinitionLogMap::get).map(TaskDefinition::getName).collect(Collectors.toList()))); taskNodeList.add(taskNode); } } return taskNodeList; } public Map<ProcessInstance, TaskInstance> notifyProcessList(int processId, int taskId) { HashMap<ProcessInstance, TaskInstance> processTaskMap = new HashMap<>(); // ProcessInstanceMap processInstanceMap = processInstanceMapMapper.queryBySubProcessId(processId); if (processInstanceMap == null) { return processTaskMap; } ProcessInstance fatherProcess = this.findProcessInstanceById(processInstanceMap.getParentProcessInstanceId()); TaskInstance fatherTask = this.findTaskInstanceById(processInstanceMap.getParentTaskInstanceId()); if (fatherProcess != null) { processTaskMap.put(fatherProcess, fatherTask); } return processTaskMap; } }
closed
apache/dolphinscheduler
https://github.com/apache/dolphinscheduler
6,208
[Bug] [Master] json parse error in sub process
### 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 branch : dev running a sub process, json parse error in sub process ![image](https://user-images.githubusercontent.com/29528966/133248693-467afe92-1310-441d-b929-2bc4b25810b7.png) ### What you expected to happen sub process run successfully. ### How to reproduce run a sub process. ### Anything else _No response_ ### Are you willing to submit PR? - [X] 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/6208
https://github.com/apache/dolphinscheduler/pull/6211
ac943bca6a3146ea23bdbfe85a09eac68da73945
8694b9c8f989eb5c6b0792e5901cba2a207cdcf0
"2021-09-14T11:24:11Z"
java
"2021-09-15T02:29:26Z"
dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/Constants.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 * 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.common; import org.apache.dolphinscheduler.common.enums.ExecutionStatus; import org.apache.dolphinscheduler.common.utils.OSUtils; import org.apache.commons.lang.StringUtils; import java.util.regex.Pattern; /** * Constants */ public final class Constants {
closed
apache/dolphinscheduler
https://github.com/apache/dolphinscheduler
6,208
[Bug] [Master] json parse error in sub process
### 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 branch : dev running a sub process, json parse error in sub process ![image](https://user-images.githubusercontent.com/29528966/133248693-467afe92-1310-441d-b929-2bc4b25810b7.png) ### What you expected to happen sub process run successfully. ### How to reproduce run a sub process. ### Anything else _No response_ ### Are you willing to submit PR? - [X] 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/6208
https://github.com/apache/dolphinscheduler/pull/6211
ac943bca6a3146ea23bdbfe85a09eac68da73945
8694b9c8f989eb5c6b0792e5901cba2a207cdcf0
"2021-09-14T11:24:11Z"
java
"2021-09-15T02:29:26Z"
dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/Constants.java
private Constants() { throw new UnsupportedOperationException("Construct Constants"); } /** * quartz config */ public static final String ORG_QUARTZ_JOBSTORE_DRIVERDELEGATECLASS = "org.quartz.jobStore.driverDelegateClass"; public static final String ORG_QUARTZ_SCHEDULER_INSTANCENAME = "org.quartz.scheduler.instanceName";