status
stringclasses 1
value | repo_name
stringclasses 31
values | repo_url
stringclasses 31
values | issue_id
int64 1
104k
| title
stringlengths 4
233
| body
stringlengths 0
186k
⌀ | issue_url
stringlengths 38
56
| pull_url
stringlengths 37
54
| before_fix_sha
stringlengths 40
40
| after_fix_sha
stringlengths 40
40
| report_datetime
timestamp[us, tz=UTC] | language
stringclasses 5
values | commit_datetime
timestamp[us, tz=UTC] | updated_file
stringlengths 7
188
| chunk_content
stringlengths 1
1.03M
|
|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|
closed | apache/dolphinscheduler | https://github.com/apache/dolphinscheduler | 7,753 | [Bug] [Master] Failed to pass global parameters between parent and 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
When the parent process has global parameters, but the sub process does not have global parameters, a null pointer error will be triggered
`[ERROR] 2021-12-31 14:06:44.898 org.apache.dolphinscheduler.server.master.runner.MasterSchedulerService:[215] - scan command error
java.lang.UnsupportedOperationException: null
at java.util.AbstractList.add(AbstractList.java:148)
at java.util.AbstractList.add(AbstractList.java:108)
at org.apache.dolphinscheduler.service.process.ProcessService.joinGlobalParams(ProcessService.java:1025)
at org.apache.dolphinscheduler.service.process.ProcessService.setSubProcessParam(ProcessService.java:992)
at org.apache.dolphinscheduler.service.process.ProcessService.handleCommand(ProcessService.java:226)
at org.apache.dolphinscheduler.service.process.ProcessService$$FastClassBySpringCGLIB$$ed138739.invoke(<generated>)
`
### What you expected to happen
Global parameters are passed normally
### How to reproduce
Configure two processes, where the sub process has no global parameters, and the parent process has global parameters
### Anything else
_No response_
### Version
2.0.0
### Are you willing to submit PR?
- [ ] Yes I am willing to submit a PR!
### Code of Conduct
- [X] I agree to follow this project's [Code of Conduct](https://www.apache.org/foundation/policies/conduct)
| https://github.com/apache/dolphinscheduler/issues/7753 | https://github.com/apache/dolphinscheduler/pull/7755 | 4203304b08847d57218f9e9cb4edf7447f6eab8b | fa906e7d01ac5e4222bc068bd1e908297cfd7b57 | 2021-12-31T06:47:13Z | java | 2022-01-01T07:23:50Z | dolphinscheduler-service/src/main/java/org/apache/dolphinscheduler/service/process/ProcessService.java | taskInstance.setRetryTimes(taskInstance.getRetryTimes() + 1);
}
taskInstance.setSubmitTime(null);
taskInstance.setLogPath(null);
taskInstance.setExecutePath(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, processInstance));
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 |
closed | apache/dolphinscheduler | https://github.com/apache/dolphinscheduler | 7,753 | [Bug] [Master] Failed to pass global parameters between parent and 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
When the parent process has global parameters, but the sub process does not have global parameters, a null pointer error will be triggered
`[ERROR] 2021-12-31 14:06:44.898 org.apache.dolphinscheduler.server.master.runner.MasterSchedulerService:[215] - scan command error
java.lang.UnsupportedOperationException: null
at java.util.AbstractList.add(AbstractList.java:148)
at java.util.AbstractList.add(AbstractList.java:108)
at org.apache.dolphinscheduler.service.process.ProcessService.joinGlobalParams(ProcessService.java:1025)
at org.apache.dolphinscheduler.service.process.ProcessService.setSubProcessParam(ProcessService.java:992)
at org.apache.dolphinscheduler.service.process.ProcessService.handleCommand(ProcessService.java:226)
at org.apache.dolphinscheduler.service.process.ProcessService$$FastClassBySpringCGLIB$$ed138739.invoke(<generated>)
`
### What you expected to happen
Global parameters are passed normally
### How to reproduce
Configure two processes, where the sub process has no global parameters, and the parent process has global parameters
### Anything else
_No response_
### Version
2.0.0
### Are you willing to submit PR?
- [ ] Yes I am willing to submit a PR!
### Code of Conduct
- [X] I agree to follow this project's [Code of Conduct](https://www.apache.org/foundation/policies/conduct)
| https://github.com/apache/dolphinscheduler/issues/7753 | https://github.com/apache/dolphinscheduler/pull/7755 | 4203304b08847d57218f9e9cb4edf7447f6eab8b | fa906e7d01ac5e4222bc068bd1e908297cfd7b57 | 2021-12-31T06:47:13Z | java | 2022-01-01T07:23:50Z | dolphinscheduler-service/src/main/java/org/apache/dolphinscheduler/service/process/ProcessService.java | * cannot modify the task state when running/kill/submit success, or this
* task instance is already exists in task queue .
* 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 processInstance processInstance
* @return process instance state
*/
public ExecutionStatus getSubmitTaskState(TaskInstance taskInstance, ProcessInstance processInstance) {
ExecutionStatus state = taskInstance.getState();
if (
state == ExecutionStatus.RUNNING_EXECUTION
|| state == ExecutionStatus.DELAY_EXECUTION
|| state == ExecutionStatus.KILL
) {
return state;
}
if (processInstance.getState() == ExecutionStatus.READY_PAUSE) {
state = ExecutionStatus.PAUSE;
} else if (processInstance.getState() == ExecutionStatus.READY_STOP
|| !checkProcessStrategy(taskInstance, processInstance)) {
state = ExecutionStatus.KILL;
} else { |
closed | apache/dolphinscheduler | https://github.com/apache/dolphinscheduler | 7,753 | [Bug] [Master] Failed to pass global parameters between parent and 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
When the parent process has global parameters, but the sub process does not have global parameters, a null pointer error will be triggered
`[ERROR] 2021-12-31 14:06:44.898 org.apache.dolphinscheduler.server.master.runner.MasterSchedulerService:[215] - scan command error
java.lang.UnsupportedOperationException: null
at java.util.AbstractList.add(AbstractList.java:148)
at java.util.AbstractList.add(AbstractList.java:108)
at org.apache.dolphinscheduler.service.process.ProcessService.joinGlobalParams(ProcessService.java:1025)
at org.apache.dolphinscheduler.service.process.ProcessService.setSubProcessParam(ProcessService.java:992)
at org.apache.dolphinscheduler.service.process.ProcessService.handleCommand(ProcessService.java:226)
at org.apache.dolphinscheduler.service.process.ProcessService$$FastClassBySpringCGLIB$$ed138739.invoke(<generated>)
`
### What you expected to happen
Global parameters are passed normally
### How to reproduce
Configure two processes, where the sub process has no global parameters, and the parent process has global parameters
### Anything else
_No response_
### Version
2.0.0
### Are you willing to submit PR?
- [ ] Yes I am willing to submit a PR!
### Code of Conduct
- [X] I agree to follow this project's [Code of Conduct](https://www.apache.org/foundation/policies/conduct)
| https://github.com/apache/dolphinscheduler/issues/7753 | https://github.com/apache/dolphinscheduler/pull/7755 | 4203304b08847d57218f9e9cb4edf7447f6eab8b | fa906e7d01ac5e4222bc068bd1e908297cfd7b57 | 2021-12-31T06:47:13Z | java | 2022-01-01T07:23:50Z | dolphinscheduler-service/src/main/java/org/apache/dolphinscheduler/service/process/ProcessService.java | state = ExecutionStatus.SUBMITTED_SUCCESS;
}
return state;
}
/**
* check process instance strategy
*
* @param taskInstance taskInstance
* @return check strategy result
*/
private boolean checkProcessStrategy(TaskInstance taskInstance, ProcessInstance processInstance) {
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) { |
closed | apache/dolphinscheduler | https://github.com/apache/dolphinscheduler | 7,753 | [Bug] [Master] Failed to pass global parameters between parent and 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
When the parent process has global parameters, but the sub process does not have global parameters, a null pointer error will be triggered
`[ERROR] 2021-12-31 14:06:44.898 org.apache.dolphinscheduler.server.master.runner.MasterSchedulerService:[215] - scan command error
java.lang.UnsupportedOperationException: null
at java.util.AbstractList.add(AbstractList.java:148)
at java.util.AbstractList.add(AbstractList.java:108)
at org.apache.dolphinscheduler.service.process.ProcessService.joinGlobalParams(ProcessService.java:1025)
at org.apache.dolphinscheduler.service.process.ProcessService.setSubProcessParam(ProcessService.java:992)
at org.apache.dolphinscheduler.service.process.ProcessService.handleCommand(ProcessService.java:226)
at org.apache.dolphinscheduler.service.process.ProcessService$$FastClassBySpringCGLIB$$ed138739.invoke(<generated>)
`
### What you expected to happen
Global parameters are passed normally
### How to reproduce
Configure two processes, where the sub process has no global parameters, and the parent process has global parameters
### Anything else
_No response_
### Version
2.0.0
### Are you willing to submit PR?
- [ ] Yes I am willing to submit a PR!
### Code of Conduct
- [X] I agree to follow this project's [Code of Conduct](https://www.apache.org/foundation/policies/conduct)
| https://github.com/apache/dolphinscheduler/issues/7753 | https://github.com/apache/dolphinscheduler/pull/7755 | 4203304b08847d57218f9e9cb4edf7447f6eab8b | fa906e7d01ac5e4222bc068bd1e908297cfd7b57 | 2021-12-31T06:47:13Z | java | 2022-01-01T07:23:50Z | dolphinscheduler-service/src/main/java/org/apache/dolphinscheduler/service/process/ProcessService.java | if (processInstance == null) {
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) { |
closed | apache/dolphinscheduler | https://github.com/apache/dolphinscheduler | 7,753 | [Bug] [Master] Failed to pass global parameters between parent and 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
When the parent process has global parameters, but the sub process does not have global parameters, a null pointer error will be triggered
`[ERROR] 2021-12-31 14:06:44.898 org.apache.dolphinscheduler.server.master.runner.MasterSchedulerService:[215] - scan command error
java.lang.UnsupportedOperationException: null
at java.util.AbstractList.add(AbstractList.java:148)
at java.util.AbstractList.add(AbstractList.java:108)
at org.apache.dolphinscheduler.service.process.ProcessService.joinGlobalParams(ProcessService.java:1025)
at org.apache.dolphinscheduler.service.process.ProcessService.setSubProcessParam(ProcessService.java:992)
at org.apache.dolphinscheduler.service.process.ProcessService.handleCommand(ProcessService.java:226)
at org.apache.dolphinscheduler.service.process.ProcessService$$FastClassBySpringCGLIB$$ed138739.invoke(<generated>)
`
### What you expected to happen
Global parameters are passed normally
### How to reproduce
Configure two processes, where the sub process has no global parameters, and the parent process has global parameters
### Anything else
_No response_
### Version
2.0.0
### Are you willing to submit PR?
- [ ] Yes I am willing to submit a PR!
### Code of Conduct
- [X] I agree to follow this project's [Code of Conduct](https://www.apache.org/foundation/policies/conduct)
| https://github.com/apache/dolphinscheduler/issues/7753 | https://github.com/apache/dolphinscheduler/pull/7755 | 4203304b08847d57218f9e9cb4edf7447f6eab8b | fa906e7d01ac5e4222bc068bd1e908297cfd7b57 | 2021-12-31T06:47:13Z | java | 2022-01-01T07:23:50Z | dolphinscheduler-service/src/main/java/org/apache/dolphinscheduler/service/process/ProcessService.java | if (taskInstance.getId() != 0) {
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 |
closed | apache/dolphinscheduler | https://github.com/apache/dolphinscheduler | 7,753 | [Bug] [Master] Failed to pass global parameters between parent and 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
When the parent process has global parameters, but the sub process does not have global parameters, a null pointer error will be triggered
`[ERROR] 2021-12-31 14:06:44.898 org.apache.dolphinscheduler.server.master.runner.MasterSchedulerService:[215] - scan command error
java.lang.UnsupportedOperationException: null
at java.util.AbstractList.add(AbstractList.java:148)
at java.util.AbstractList.add(AbstractList.java:108)
at org.apache.dolphinscheduler.service.process.ProcessService.joinGlobalParams(ProcessService.java:1025)
at org.apache.dolphinscheduler.service.process.ProcessService.setSubProcessParam(ProcessService.java:992)
at org.apache.dolphinscheduler.service.process.ProcessService.handleCommand(ProcessService.java:226)
at org.apache.dolphinscheduler.service.process.ProcessService$$FastClassBySpringCGLIB$$ed138739.invoke(<generated>)
`
### What you expected to happen
Global parameters are passed normally
### How to reproduce
Configure two processes, where the sub process has no global parameters, and the parent process has global parameters
### Anything else
_No response_
### Version
2.0.0
### Are you willing to submit PR?
- [ ] Yes I am willing to submit a PR!
### Code of Conduct
- [X] I agree to follow this project's [Code of Conduct](https://www.apache.org/foundation/policies/conduct)
| https://github.com/apache/dolphinscheduler/issues/7753 | https://github.com/apache/dolphinscheduler/pull/7755 | 4203304b08847d57218f9e9cb4edf7447f6eab8b | fa906e7d01ac5e4222bc068bd1e908297cfd7b57 | 2021-12-31T06:47:13Z | java | 2022-01-01T07:23:50Z | dolphinscheduler-service/src/main/java/org/apache/dolphinscheduler/service/process/ProcessService.java | * @return task intance
*/
public TaskInstance findTaskInstanceById(Integer taskId) {
return taskInstanceMapper.selectById(taskId);
}
/**
* package task instance
*/
public void packageTaskInstance(TaskInstance taskInstance, ProcessInstance processInstance) {
taskInstance.setProcessInstance(processInstance);
taskInstance.setProcessDefine(processInstance.getProcessDefinition());
TaskDefinition taskDefinition = this.findTaskDefinition(
taskInstance.getTaskCode(),
taskInstance.getTaskDefinitionVersion());
this.updateTaskDefinitionResources(taskDefinition);
taskInstance.setTaskDefine(taskDefinition);
}
/**
* Update {@link ResourceInfo} information in {@link TaskDefinition}
*
* @param taskDefinition the given {@link TaskDefinition}
*/
public void updateTaskDefinitionResources(TaskDefinition taskDefinition) {
Map<String, Object> taskParameters = JSONUtils.parseObject(
taskDefinition.getTaskParams(),
new TypeReference<Map<String, Object>>() {
});
if (taskParameters != null) { |
closed | apache/dolphinscheduler | https://github.com/apache/dolphinscheduler | 7,753 | [Bug] [Master] Failed to pass global parameters between parent and 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
When the parent process has global parameters, but the sub process does not have global parameters, a null pointer error will be triggered
`[ERROR] 2021-12-31 14:06:44.898 org.apache.dolphinscheduler.server.master.runner.MasterSchedulerService:[215] - scan command error
java.lang.UnsupportedOperationException: null
at java.util.AbstractList.add(AbstractList.java:148)
at java.util.AbstractList.add(AbstractList.java:108)
at org.apache.dolphinscheduler.service.process.ProcessService.joinGlobalParams(ProcessService.java:1025)
at org.apache.dolphinscheduler.service.process.ProcessService.setSubProcessParam(ProcessService.java:992)
at org.apache.dolphinscheduler.service.process.ProcessService.handleCommand(ProcessService.java:226)
at org.apache.dolphinscheduler.service.process.ProcessService$$FastClassBySpringCGLIB$$ed138739.invoke(<generated>)
`
### What you expected to happen
Global parameters are passed normally
### How to reproduce
Configure two processes, where the sub process has no global parameters, and the parent process has global parameters
### Anything else
_No response_
### Version
2.0.0
### Are you willing to submit PR?
- [ ] Yes I am willing to submit a PR!
### Code of Conduct
- [X] I agree to follow this project's [Code of Conduct](https://www.apache.org/foundation/policies/conduct)
| https://github.com/apache/dolphinscheduler/issues/7753 | https://github.com/apache/dolphinscheduler/pull/7755 | 4203304b08847d57218f9e9cb4edf7447f6eab8b | fa906e7d01ac5e4222bc068bd1e908297cfd7b57 | 2021-12-31T06:47:13Z | java | 2022-01-01T07:23:50Z | dolphinscheduler-service/src/main/java/org/apache/dolphinscheduler/service/process/ProcessService.java | if (taskParameters.containsKey("mainJar")) {
Object mainJarObj = taskParameters.get("mainJar");
ResourceInfo mainJar = JSONUtils.parseObject(
JSONUtils.toJsonString(mainJarObj),
ResourceInfo.class);
ResourceInfo resourceInfo = updateResourceInfo(mainJar);
if (resourceInfo != null) {
taskParameters.put("mainJar", resourceInfo);
}
}
if (taskParameters.containsKey("resourceList")) {
String resourceListStr = JSONUtils.toJsonString(taskParameters.get("resourceList"));
List<ResourceInfo> resourceInfos = JSONUtils.toList(resourceListStr, ResourceInfo.class);
List<ResourceInfo> updatedResourceInfos = resourceInfos
.stream()
.map(this::updateResourceInfo)
.filter(Objects::nonNull)
.collect(Collectors.toList());
taskParameters.put("resourceList", updatedResourceInfos);
}
taskDefinition.setTaskParams(JSONUtils.toJsonString(taskParameters));
}
}
/**
* update {@link ResourceInfo} by given original ResourceInfo
*
* @param res origin resource info
* @return {@link ResourceInfo} |
closed | apache/dolphinscheduler | https://github.com/apache/dolphinscheduler | 7,753 | [Bug] [Master] Failed to pass global parameters between parent and 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
When the parent process has global parameters, but the sub process does not have global parameters, a null pointer error will be triggered
`[ERROR] 2021-12-31 14:06:44.898 org.apache.dolphinscheduler.server.master.runner.MasterSchedulerService:[215] - scan command error
java.lang.UnsupportedOperationException: null
at java.util.AbstractList.add(AbstractList.java:148)
at java.util.AbstractList.add(AbstractList.java:108)
at org.apache.dolphinscheduler.service.process.ProcessService.joinGlobalParams(ProcessService.java:1025)
at org.apache.dolphinscheduler.service.process.ProcessService.setSubProcessParam(ProcessService.java:992)
at org.apache.dolphinscheduler.service.process.ProcessService.handleCommand(ProcessService.java:226)
at org.apache.dolphinscheduler.service.process.ProcessService$$FastClassBySpringCGLIB$$ed138739.invoke(<generated>)
`
### What you expected to happen
Global parameters are passed normally
### How to reproduce
Configure two processes, where the sub process has no global parameters, and the parent process has global parameters
### Anything else
_No response_
### Version
2.0.0
### Are you willing to submit PR?
- [ ] Yes I am willing to submit a PR!
### Code of Conduct
- [X] I agree to follow this project's [Code of Conduct](https://www.apache.org/foundation/policies/conduct)
| https://github.com/apache/dolphinscheduler/issues/7753 | https://github.com/apache/dolphinscheduler/pull/7755 | 4203304b08847d57218f9e9cb4edf7447f6eab8b | fa906e7d01ac5e4222bc068bd1e908297cfd7b57 | 2021-12-31T06:47:13Z | java | 2022-01-01T07:23:50Z | dolphinscheduler-service/src/main/java/org/apache/dolphinscheduler/service/process/ProcessService.java | */
private ResourceInfo updateResourceInfo(ResourceInfo res) {
ResourceInfo resourceInfo = null;
if (res != null) {
int resourceId = res.getId();
if (resourceId <= 0) {
logger.error("invalid resourceId, {}", resourceId);
return null;
}
resourceInfo = new ResourceInfo();
Resource resource = getResourceById(resourceId);
resourceInfo.setId(resourceId);
resourceInfo.setRes(resource.getFileName());
resourceInfo.setResourceName(resource.getFullName());
if (logger.isInfoEnabled()) {
logger.info("updated resource info {}",
JSONUtils.toJsonString(resourceInfo));
}
}
return resourceInfo;
}
/**
* get id list by task state
*
* @param instanceId instanceId
* @param state state
* @return task instance states
*/ |
closed | apache/dolphinscheduler | https://github.com/apache/dolphinscheduler | 7,753 | [Bug] [Master] Failed to pass global parameters between parent and 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
When the parent process has global parameters, but the sub process does not have global parameters, a null pointer error will be triggered
`[ERROR] 2021-12-31 14:06:44.898 org.apache.dolphinscheduler.server.master.runner.MasterSchedulerService:[215] - scan command error
java.lang.UnsupportedOperationException: null
at java.util.AbstractList.add(AbstractList.java:148)
at java.util.AbstractList.add(AbstractList.java:108)
at org.apache.dolphinscheduler.service.process.ProcessService.joinGlobalParams(ProcessService.java:1025)
at org.apache.dolphinscheduler.service.process.ProcessService.setSubProcessParam(ProcessService.java:992)
at org.apache.dolphinscheduler.service.process.ProcessService.handleCommand(ProcessService.java:226)
at org.apache.dolphinscheduler.service.process.ProcessService$$FastClassBySpringCGLIB$$ed138739.invoke(<generated>)
`
### What you expected to happen
Global parameters are passed normally
### How to reproduce
Configure two processes, where the sub process has no global parameters, and the parent process has global parameters
### Anything else
_No response_
### Version
2.0.0
### Are you willing to submit PR?
- [ ] Yes I am willing to submit a PR!
### Code of Conduct
- [X] I agree to follow this project's [Code of Conduct](https://www.apache.org/foundation/policies/conduct)
| https://github.com/apache/dolphinscheduler/issues/7753 | https://github.com/apache/dolphinscheduler/pull/7755 | 4203304b08847d57218f9e9cb4edf7447f6eab8b | fa906e7d01ac5e4222bc068bd1e908297cfd7b57 | 2021-12-31T06:47:13Z | java | 2022-01-01T07:23:50Z | dolphinscheduler-service/src/main/java/org/apache/dolphinscheduler/service/process/ProcessService.java | 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
*
* @param processInstanceMap processInstanceMap
* @return update process instance result
*/
public int updateWorkProcessInstanceMap(ProcessInstanceMap processInstanceMap) {
return processInstanceMapMapper.updateById(processInstanceMap);
} |
closed | apache/dolphinscheduler | https://github.com/apache/dolphinscheduler | 7,753 | [Bug] [Master] Failed to pass global parameters between parent and 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
When the parent process has global parameters, but the sub process does not have global parameters, a null pointer error will be triggered
`[ERROR] 2021-12-31 14:06:44.898 org.apache.dolphinscheduler.server.master.runner.MasterSchedulerService:[215] - scan command error
java.lang.UnsupportedOperationException: null
at java.util.AbstractList.add(AbstractList.java:148)
at java.util.AbstractList.add(AbstractList.java:108)
at org.apache.dolphinscheduler.service.process.ProcessService.joinGlobalParams(ProcessService.java:1025)
at org.apache.dolphinscheduler.service.process.ProcessService.setSubProcessParam(ProcessService.java:992)
at org.apache.dolphinscheduler.service.process.ProcessService.handleCommand(ProcessService.java:226)
at org.apache.dolphinscheduler.service.process.ProcessService$$FastClassBySpringCGLIB$$ed138739.invoke(<generated>)
`
### What you expected to happen
Global parameters are passed normally
### How to reproduce
Configure two processes, where the sub process has no global parameters, and the parent process has global parameters
### Anything else
_No response_
### Version
2.0.0
### Are you willing to submit PR?
- [ ] Yes I am willing to submit a PR!
### Code of Conduct
- [X] I agree to follow this project's [Code of Conduct](https://www.apache.org/foundation/policies/conduct)
| https://github.com/apache/dolphinscheduler/issues/7753 | https://github.com/apache/dolphinscheduler/pull/7755 | 4203304b08847d57218f9e9cb4edf7447f6eab8b | fa906e7d01ac5e4222bc068bd1e908297cfd7b57 | 2021-12-31T06:47:13Z | java | 2022-01-01T07:23:50Z | dolphinscheduler-service/src/main/java/org/apache/dolphinscheduler/service/process/ProcessService.java | /**
* 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);
}
/**
* delete work process map by parent process id
*
* @param parentWorkProcessId parentWorkProcessId
* @return delete process map result
*/
public int deleteWorkProcessMapByParentId(int parentWorkProcessId) { |
closed | apache/dolphinscheduler | https://github.com/apache/dolphinscheduler | 7,753 | [Bug] [Master] Failed to pass global parameters between parent and 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
When the parent process has global parameters, but the sub process does not have global parameters, a null pointer error will be triggered
`[ERROR] 2021-12-31 14:06:44.898 org.apache.dolphinscheduler.server.master.runner.MasterSchedulerService:[215] - scan command error
java.lang.UnsupportedOperationException: null
at java.util.AbstractList.add(AbstractList.java:148)
at java.util.AbstractList.add(AbstractList.java:108)
at org.apache.dolphinscheduler.service.process.ProcessService.joinGlobalParams(ProcessService.java:1025)
at org.apache.dolphinscheduler.service.process.ProcessService.setSubProcessParam(ProcessService.java:992)
at org.apache.dolphinscheduler.service.process.ProcessService.handleCommand(ProcessService.java:226)
at org.apache.dolphinscheduler.service.process.ProcessService$$FastClassBySpringCGLIB$$ed138739.invoke(<generated>)
`
### What you expected to happen
Global parameters are passed normally
### How to reproduce
Configure two processes, where the sub process has no global parameters, and the parent process has global parameters
### Anything else
_No response_
### Version
2.0.0
### Are you willing to submit PR?
- [ ] Yes I am willing to submit a PR!
### Code of Conduct
- [X] I agree to follow this project's [Code of Conduct](https://www.apache.org/foundation/policies/conduct)
| https://github.com/apache/dolphinscheduler/issues/7753 | https://github.com/apache/dolphinscheduler/pull/7755 | 4203304b08847d57218f9e9cb4edf7447f6eab8b | fa906e7d01ac5e4222bc068bd1e908297cfd7b57 | 2021-12-31T06:47:13Z | java | 2022-01-01T07:23:50Z | dolphinscheduler-service/src/main/java/org/apache/dolphinscheduler/service/process/ProcessService.java | 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
*/
public ProcessInstance findParentProcessInstance(Integer subProcessId) {
ProcessInstance processInstance = null;
ProcessInstanceMap processInstanceMap = processInstanceMapMapper.queryBySubProcessId(subProcessId);
if (processInstanceMap == null || processInstanceMap.getProcessInstanceId() == 0) {
return processInstance;
} |
closed | apache/dolphinscheduler | https://github.com/apache/dolphinscheduler | 7,753 | [Bug] [Master] Failed to pass global parameters between parent and 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
When the parent process has global parameters, but the sub process does not have global parameters, a null pointer error will be triggered
`[ERROR] 2021-12-31 14:06:44.898 org.apache.dolphinscheduler.server.master.runner.MasterSchedulerService:[215] - scan command error
java.lang.UnsupportedOperationException: null
at java.util.AbstractList.add(AbstractList.java:148)
at java.util.AbstractList.add(AbstractList.java:108)
at org.apache.dolphinscheduler.service.process.ProcessService.joinGlobalParams(ProcessService.java:1025)
at org.apache.dolphinscheduler.service.process.ProcessService.setSubProcessParam(ProcessService.java:992)
at org.apache.dolphinscheduler.service.process.ProcessService.handleCommand(ProcessService.java:226)
at org.apache.dolphinscheduler.service.process.ProcessService$$FastClassBySpringCGLIB$$ed138739.invoke(<generated>)
`
### What you expected to happen
Global parameters are passed normally
### How to reproduce
Configure two processes, where the sub process has no global parameters, and the parent process has global parameters
### Anything else
_No response_
### Version
2.0.0
### Are you willing to submit PR?
- [ ] Yes I am willing to submit a PR!
### Code of Conduct
- [X] I agree to follow this project's [Code of Conduct](https://www.apache.org/foundation/policies/conduct)
| https://github.com/apache/dolphinscheduler/issues/7753 | https://github.com/apache/dolphinscheduler/pull/7755 | 4203304b08847d57218f9e9cb4edf7447f6eab8b | fa906e7d01ac5e4222bc068bd1e908297cfd7b57 | 2021-12-31T06:47:13Z | java | 2022-01-01T07:23:50Z | dolphinscheduler-service/src/main/java/org/apache/dolphinscheduler/service/process/ProcessService.java | processInstance = findProcessInstanceById(processInstanceMap.getParentProcessInstanceId());
return processInstance;
}
/**
* change task state
*
* @param state state
* @param startTime startTime
* @param host host
* @param executePath executePath
* @param logPath logPath
*/
public void changeTaskState(TaskInstance taskInstance, ExecutionStatus state, Date startTime, String host,
String executePath,
String logPath) {
taskInstance.setState(state);
taskInstance.setStartTime(startTime);
taskInstance.setHost(host);
taskInstance.setExecutePath(executePath);
taskInstance.setLogPath(logPath);
saveTaskInstance(taskInstance);
}
/**
* update process instance
*
* @param processInstance processInstance
* @return update process instance result
*/
public int updateProcessInstance(ProcessInstance processInstance) {
return processInstanceMapper.updateById(processInstance); |
closed | apache/dolphinscheduler | https://github.com/apache/dolphinscheduler | 7,753 | [Bug] [Master] Failed to pass global parameters between parent and 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
When the parent process has global parameters, but the sub process does not have global parameters, a null pointer error will be triggered
`[ERROR] 2021-12-31 14:06:44.898 org.apache.dolphinscheduler.server.master.runner.MasterSchedulerService:[215] - scan command error
java.lang.UnsupportedOperationException: null
at java.util.AbstractList.add(AbstractList.java:148)
at java.util.AbstractList.add(AbstractList.java:108)
at org.apache.dolphinscheduler.service.process.ProcessService.joinGlobalParams(ProcessService.java:1025)
at org.apache.dolphinscheduler.service.process.ProcessService.setSubProcessParam(ProcessService.java:992)
at org.apache.dolphinscheduler.service.process.ProcessService.handleCommand(ProcessService.java:226)
at org.apache.dolphinscheduler.service.process.ProcessService$$FastClassBySpringCGLIB$$ed138739.invoke(<generated>)
`
### What you expected to happen
Global parameters are passed normally
### How to reproduce
Configure two processes, where the sub process has no global parameters, and the parent process has global parameters
### Anything else
_No response_
### Version
2.0.0
### Are you willing to submit PR?
- [ ] Yes I am willing to submit a PR!
### Code of Conduct
- [X] I agree to follow this project's [Code of Conduct](https://www.apache.org/foundation/policies/conduct)
| https://github.com/apache/dolphinscheduler/issues/7753 | https://github.com/apache/dolphinscheduler/pull/7755 | 4203304b08847d57218f9e9cb4edf7447f6eab8b | fa906e7d01ac5e4222bc068bd1e908297cfd7b57 | 2021-12-31T06:47:13Z | java | 2022-01-01T07:23:50Z | dolphinscheduler-service/src/main/java/org/apache/dolphinscheduler/service/process/ProcessService.java | }
/**
* change task state
*
* @param state state
* @param endTime endTime
* @param varPool varPool
*/
public void changeTaskState(TaskInstance taskInstance, ExecutionStatus state,
Date endTime,
int processId,
String appIds,
String varPool) {
taskInstance.setPid(processId);
taskInstance.setAppLink(appIds);
taskInstance.setState(state);
taskInstance.setEndTime(endTime);
taskInstance.setVarPool(varPool);
changeOutParam(taskInstance);
saveTaskInstance(taskInstance);
}
/**
* for show in page of 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)) { |
closed | apache/dolphinscheduler | https://github.com/apache/dolphinscheduler | 7,753 | [Bug] [Master] Failed to pass global parameters between parent and 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
When the parent process has global parameters, but the sub process does not have global parameters, a null pointer error will be triggered
`[ERROR] 2021-12-31 14:06:44.898 org.apache.dolphinscheduler.server.master.runner.MasterSchedulerService:[215] - scan command error
java.lang.UnsupportedOperationException: null
at java.util.AbstractList.add(AbstractList.java:148)
at java.util.AbstractList.add(AbstractList.java:108)
at org.apache.dolphinscheduler.service.process.ProcessService.joinGlobalParams(ProcessService.java:1025)
at org.apache.dolphinscheduler.service.process.ProcessService.setSubProcessParam(ProcessService.java:992)
at org.apache.dolphinscheduler.service.process.ProcessService.handleCommand(ProcessService.java:226)
at org.apache.dolphinscheduler.service.process.ProcessService$$FastClassBySpringCGLIB$$ed138739.invoke(<generated>)
`
### What you expected to happen
Global parameters are passed normally
### How to reproduce
Configure two processes, where the sub process has no global parameters, and the parent process has global parameters
### Anything else
_No response_
### Version
2.0.0
### Are you willing to submit PR?
- [ ] Yes I am willing to submit a PR!
### Code of Conduct
- [X] I agree to follow this project's [Code of Conduct](https://www.apache.org/foundation/policies/conduct)
| https://github.com/apache/dolphinscheduler/issues/7753 | https://github.com/apache/dolphinscheduler/pull/7755 | 4203304b08847d57218f9e9cb4edf7447f6eab8b | fa906e7d01ac5e4222bc068bd1e908297cfd7b57 | 2021-12-31T06:47:13Z | java | 2022-01-01T07:23:50Z | dolphinscheduler-service/src/main/java/org/apache/dolphinscheduler/service/process/ProcessService.java | return;
}
Map<String, Object> taskParams = JSONUtils.parseObject(taskInstance.getTaskParams(), new TypeReference<Map<String, Object>>() {
});
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();
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 |
closed | apache/dolphinscheduler | https://github.com/apache/dolphinscheduler | 7,753 | [Bug] [Master] Failed to pass global parameters between parent and 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
When the parent process has global parameters, but the sub process does not have global parameters, a null pointer error will be triggered
`[ERROR] 2021-12-31 14:06:44.898 org.apache.dolphinscheduler.server.master.runner.MasterSchedulerService:[215] - scan command error
java.lang.UnsupportedOperationException: null
at java.util.AbstractList.add(AbstractList.java:148)
at java.util.AbstractList.add(AbstractList.java:108)
at org.apache.dolphinscheduler.service.process.ProcessService.joinGlobalParams(ProcessService.java:1025)
at org.apache.dolphinscheduler.service.process.ProcessService.setSubProcessParam(ProcessService.java:992)
at org.apache.dolphinscheduler.service.process.ProcessService.handleCommand(ProcessService.java:226)
at org.apache.dolphinscheduler.service.process.ProcessService$$FastClassBySpringCGLIB$$ed138739.invoke(<generated>)
`
### What you expected to happen
Global parameters are passed normally
### How to reproduce
Configure two processes, where the sub process has no global parameters, and the parent process has global parameters
### Anything else
_No response_
### Version
2.0.0
### Are you willing to submit PR?
- [ ] Yes I am willing to submit a PR!
### Code of Conduct
- [X] I agree to follow this project's [Code of Conduct](https://www.apache.org/foundation/policies/conduct)
| https://github.com/apache/dolphinscheduler/issues/7753 | https://github.com/apache/dolphinscheduler/pull/7755 | 4203304b08847d57218f9e9cb4edf7447f6eab8b | fa906e7d01ac5e4222bc068bd1e908297cfd7b57 | 2021-12-31T06:47:13Z | java | 2022-01-01T07:23:50Z | dolphinscheduler-service/src/main/java/org/apache/dolphinscheduler/service/process/ProcessService.java | */
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);
}
/**
* query Schedule by processDefinitionCode
*
* @param processDefinitionCode processDefinitionCode
* @see Schedule
*/
public List<Schedule> queryReleaseSchedulerListByProcessDefinitionCode(long processDefinitionCode) {
return scheduleMapper.queryReleaseSchedulerListByProcessDefinitionCode(processDefinitionCode);
}
/** |
closed | apache/dolphinscheduler | https://github.com/apache/dolphinscheduler | 7,753 | [Bug] [Master] Failed to pass global parameters between parent and 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
When the parent process has global parameters, but the sub process does not have global parameters, a null pointer error will be triggered
`[ERROR] 2021-12-31 14:06:44.898 org.apache.dolphinscheduler.server.master.runner.MasterSchedulerService:[215] - scan command error
java.lang.UnsupportedOperationException: null
at java.util.AbstractList.add(AbstractList.java:148)
at java.util.AbstractList.add(AbstractList.java:108)
at org.apache.dolphinscheduler.service.process.ProcessService.joinGlobalParams(ProcessService.java:1025)
at org.apache.dolphinscheduler.service.process.ProcessService.setSubProcessParam(ProcessService.java:992)
at org.apache.dolphinscheduler.service.process.ProcessService.handleCommand(ProcessService.java:226)
at org.apache.dolphinscheduler.service.process.ProcessService$$FastClassBySpringCGLIB$$ed138739.invoke(<generated>)
`
### What you expected to happen
Global parameters are passed normally
### How to reproduce
Configure two processes, where the sub process has no global parameters, and the parent process has global parameters
### Anything else
_No response_
### Version
2.0.0
### Are you willing to submit PR?
- [ ] Yes I am willing to submit a PR!
### Code of Conduct
- [X] I agree to follow this project's [Code of Conduct](https://www.apache.org/foundation/policies/conduct)
| https://github.com/apache/dolphinscheduler/issues/7753 | https://github.com/apache/dolphinscheduler/pull/7755 | 4203304b08847d57218f9e9cb4edf7447f6eab8b | fa906e7d01ac5e4222bc068bd1e908297cfd7b57 | 2021-12-31T06:47:13Z | java | 2022-01-01T07:23:50Z | dolphinscheduler-service/src/main/java/org/apache/dolphinscheduler/service/process/ProcessService.java | * query need failover process instance
*
* @param host host
* @return process instance list
*/
public List<ProcessInstance> queryNeedFailoverProcessInstances(String host) {
return processInstanceMapper.queryByHostAndStatus(host, stateArray);
}
public List<String> queryNeedFailoverProcessInstanceHost() {
return processInstanceMapper.queryNeedFailoverProcessInstanceHost(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());
Command cmd = new Command();
cmd.setProcessDefinitionCode(processDefinition.getCode());
cmd.setProcessDefinitionVersion(processDefinition.getVersion());
cmd.setProcessInstanceId(processInstance.getId());
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); |
closed | apache/dolphinscheduler | https://github.com/apache/dolphinscheduler | 7,753 | [Bug] [Master] Failed to pass global parameters between parent and 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
When the parent process has global parameters, but the sub process does not have global parameters, a null pointer error will be triggered
`[ERROR] 2021-12-31 14:06:44.898 org.apache.dolphinscheduler.server.master.runner.MasterSchedulerService:[215] - scan command error
java.lang.UnsupportedOperationException: null
at java.util.AbstractList.add(AbstractList.java:148)
at java.util.AbstractList.add(AbstractList.java:108)
at org.apache.dolphinscheduler.service.process.ProcessService.joinGlobalParams(ProcessService.java:1025)
at org.apache.dolphinscheduler.service.process.ProcessService.setSubProcessParam(ProcessService.java:992)
at org.apache.dolphinscheduler.service.process.ProcessService.handleCommand(ProcessService.java:226)
at org.apache.dolphinscheduler.service.process.ProcessService$$FastClassBySpringCGLIB$$ed138739.invoke(<generated>)
`
### What you expected to happen
Global parameters are passed normally
### How to reproduce
Configure two processes, where the sub process has no global parameters, and the parent process has global parameters
### Anything else
_No response_
### Version
2.0.0
### Are you willing to submit PR?
- [ ] Yes I am willing to submit a PR!
### Code of Conduct
- [X] I agree to follow this project's [Code of Conduct](https://www.apache.org/foundation/policies/conduct)
| https://github.com/apache/dolphinscheduler/issues/7753 | https://github.com/apache/dolphinscheduler/pull/7755 | 4203304b08847d57218f9e9cb4edf7447f6eab8b | fa906e7d01ac5e4222bc068bd1e908297cfd7b57 | 2021-12-31T06:47:13Z | java | 2022-01-01T07:23:50Z | dolphinscheduler-service/src/main/java/org/apache/dolphinscheduler/service/process/ProcessService.java | 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
*
* @param processInstanceId processInstanceId
* @param executionStatus executionStatus
* @return update process result
*/
public int updateProcessInstanceState(Integer processInstanceId, ExecutionStatus executionStatus) {
ProcessInstance instance = processInstanceMapper.selectById(processInstanceId); |
closed | apache/dolphinscheduler | https://github.com/apache/dolphinscheduler | 7,753 | [Bug] [Master] Failed to pass global parameters between parent and 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
When the parent process has global parameters, but the sub process does not have global parameters, a null pointer error will be triggered
`[ERROR] 2021-12-31 14:06:44.898 org.apache.dolphinscheduler.server.master.runner.MasterSchedulerService:[215] - scan command error
java.lang.UnsupportedOperationException: null
at java.util.AbstractList.add(AbstractList.java:148)
at java.util.AbstractList.add(AbstractList.java:108)
at org.apache.dolphinscheduler.service.process.ProcessService.joinGlobalParams(ProcessService.java:1025)
at org.apache.dolphinscheduler.service.process.ProcessService.setSubProcessParam(ProcessService.java:992)
at org.apache.dolphinscheduler.service.process.ProcessService.handleCommand(ProcessService.java:226)
at org.apache.dolphinscheduler.service.process.ProcessService$$FastClassBySpringCGLIB$$ed138739.invoke(<generated>)
`
### What you expected to happen
Global parameters are passed normally
### How to reproduce
Configure two processes, where the sub process has no global parameters, and the parent process has global parameters
### Anything else
_No response_
### Version
2.0.0
### Are you willing to submit PR?
- [ ] Yes I am willing to submit a PR!
### Code of Conduct
- [X] I agree to follow this project's [Code of Conduct](https://www.apache.org/foundation/policies/conduct)
| https://github.com/apache/dolphinscheduler/issues/7753 | https://github.com/apache/dolphinscheduler/pull/7755 | 4203304b08847d57218f9e9cb4edf7447f6eab8b | fa906e7d01ac5e4222bc068bd1e908297cfd7b57 | 2021-12-31T06:47:13Z | java | 2022-01-01T07:23:50Z | dolphinscheduler-service/src/main/java/org/apache/dolphinscheduler/service/process/ProcessService.java | 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);
}
/**
* find tenant code by resource name
*
* @param resName resource name
* @param resourceType resource type |
closed | apache/dolphinscheduler | https://github.com/apache/dolphinscheduler | 7,753 | [Bug] [Master] Failed to pass global parameters between parent and 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
When the parent process has global parameters, but the sub process does not have global parameters, a null pointer error will be triggered
`[ERROR] 2021-12-31 14:06:44.898 org.apache.dolphinscheduler.server.master.runner.MasterSchedulerService:[215] - scan command error
java.lang.UnsupportedOperationException: null
at java.util.AbstractList.add(AbstractList.java:148)
at java.util.AbstractList.add(AbstractList.java:108)
at org.apache.dolphinscheduler.service.process.ProcessService.joinGlobalParams(ProcessService.java:1025)
at org.apache.dolphinscheduler.service.process.ProcessService.setSubProcessParam(ProcessService.java:992)
at org.apache.dolphinscheduler.service.process.ProcessService.handleCommand(ProcessService.java:226)
at org.apache.dolphinscheduler.service.process.ProcessService$$FastClassBySpringCGLIB$$ed138739.invoke(<generated>)
`
### What you expected to happen
Global parameters are passed normally
### How to reproduce
Configure two processes, where the sub process has no global parameters, and the parent process has global parameters
### Anything else
_No response_
### Version
2.0.0
### Are you willing to submit PR?
- [ ] Yes I am willing to submit a PR!
### Code of Conduct
- [X] I agree to follow this project's [Code of Conduct](https://www.apache.org/foundation/policies/conduct)
| https://github.com/apache/dolphinscheduler/issues/7753 | https://github.com/apache/dolphinscheduler/pull/7755 | 4203304b08847d57218f9e9cb4edf7447f6eab8b | fa906e7d01ac5e4222bc068bd1e908297cfd7b57 | 2021-12-31T06:47:13Z | java | 2022-01-01T07:23:50Z | dolphinscheduler-service/src/main/java/org/apache/dolphinscheduler/service/process/ProcessService.java | * @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.queryById(user.getTenantId());
if (Objects.isNull(tenant)) {
return StringUtils.EMPTY;
}
return tenant.getTenantCode();
}
/**
* find schedule list by process define codes.
*
* @param codes codes
* @return schedule list
*/
public List<Schedule> selectAllByProcessDefineCode(long[] codes) {
return scheduleMapper.selectAllByProcessDefineArray(codes);
}
/** |
closed | apache/dolphinscheduler | https://github.com/apache/dolphinscheduler | 7,753 | [Bug] [Master] Failed to pass global parameters between parent and 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
When the parent process has global parameters, but the sub process does not have global parameters, a null pointer error will be triggered
`[ERROR] 2021-12-31 14:06:44.898 org.apache.dolphinscheduler.server.master.runner.MasterSchedulerService:[215] - scan command error
java.lang.UnsupportedOperationException: null
at java.util.AbstractList.add(AbstractList.java:148)
at java.util.AbstractList.add(AbstractList.java:108)
at org.apache.dolphinscheduler.service.process.ProcessService.joinGlobalParams(ProcessService.java:1025)
at org.apache.dolphinscheduler.service.process.ProcessService.setSubProcessParam(ProcessService.java:992)
at org.apache.dolphinscheduler.service.process.ProcessService.handleCommand(ProcessService.java:226)
at org.apache.dolphinscheduler.service.process.ProcessService$$FastClassBySpringCGLIB$$ed138739.invoke(<generated>)
`
### What you expected to happen
Global parameters are passed normally
### How to reproduce
Configure two processes, where the sub process has no global parameters, and the parent process has global parameters
### Anything else
_No response_
### Version
2.0.0
### Are you willing to submit PR?
- [ ] Yes I am willing to submit a PR!
### Code of Conduct
- [X] I agree to follow this project's [Code of Conduct](https://www.apache.org/foundation/policies/conduct)
| https://github.com/apache/dolphinscheduler/issues/7753 | https://github.com/apache/dolphinscheduler/pull/7755 | 4203304b08847d57218f9e9cb4edf7447f6eab8b | fa906e7d01ac5e4222bc068bd1e908297cfd7b57 | 2021-12-31T06:47:13Z | java | 2022-01-01T07:23:50Z | dolphinscheduler-service/src/main/java/org/apache/dolphinscheduler/service/process/ProcessService.java | * 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());
}
/**
* find last running process instance
*
* @param definitionCode process definition code
* @param startTime start time
* @param endTime end time
* @return process instance |
closed | apache/dolphinscheduler | https://github.com/apache/dolphinscheduler | 7,753 | [Bug] [Master] Failed to pass global parameters between parent and 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
When the parent process has global parameters, but the sub process does not have global parameters, a null pointer error will be triggered
`[ERROR] 2021-12-31 14:06:44.898 org.apache.dolphinscheduler.server.master.runner.MasterSchedulerService:[215] - scan command error
java.lang.UnsupportedOperationException: null
at java.util.AbstractList.add(AbstractList.java:148)
at java.util.AbstractList.add(AbstractList.java:108)
at org.apache.dolphinscheduler.service.process.ProcessService.joinGlobalParams(ProcessService.java:1025)
at org.apache.dolphinscheduler.service.process.ProcessService.setSubProcessParam(ProcessService.java:992)
at org.apache.dolphinscheduler.service.process.ProcessService.handleCommand(ProcessService.java:226)
at org.apache.dolphinscheduler.service.process.ProcessService$$FastClassBySpringCGLIB$$ed138739.invoke(<generated>)
`
### What you expected to happen
Global parameters are passed normally
### How to reproduce
Configure two processes, where the sub process has no global parameters, and the parent process has global parameters
### Anything else
_No response_
### Version
2.0.0
### Are you willing to submit PR?
- [ ] Yes I am willing to submit a PR!
### Code of Conduct
- [X] I agree to follow this project's [Code of Conduct](https://www.apache.org/foundation/policies/conduct)
| https://github.com/apache/dolphinscheduler/issues/7753 | https://github.com/apache/dolphinscheduler/pull/7755 | 4203304b08847d57218f9e9cb4edf7447f6eab8b | fa906e7d01ac5e4222bc068bd1e908297cfd7b57 | 2021-12-31T06:47:13Z | java | 2022-01-01T07:23:50Z | dolphinscheduler-service/src/main/java/org/apache/dolphinscheduler/service/process/ProcessService.java | */
public ProcessInstance findLastRunningProcess(Long definitionCode, Date startTime, Date endTime) {
return processInstanceMapper.queryLastRunningProcess(definitionCode,
startTime,
endTime,
stateArray);
}
/**
* query user queue by process instance
*
* @param processInstance processInstance
* @return queue
*/
public String queryUserQueueByProcessInstance(ProcessInstance processInstance) {
String queue = "";
if (processInstance == null) {
return queue;
}
User executor = userMapper.selectById(processInstance.getExecutorId());
if (executor != null) {
queue = executor.getQueue();
}
return queue;
}
/**
* query project name and user name by processInstanceId.
*
* @param processInstanceId processInstanceId
* @return projectName and userName
*/ |
closed | apache/dolphinscheduler | https://github.com/apache/dolphinscheduler | 7,753 | [Bug] [Master] Failed to pass global parameters between parent and 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
When the parent process has global parameters, but the sub process does not have global parameters, a null pointer error will be triggered
`[ERROR] 2021-12-31 14:06:44.898 org.apache.dolphinscheduler.server.master.runner.MasterSchedulerService:[215] - scan command error
java.lang.UnsupportedOperationException: null
at java.util.AbstractList.add(AbstractList.java:148)
at java.util.AbstractList.add(AbstractList.java:108)
at org.apache.dolphinscheduler.service.process.ProcessService.joinGlobalParams(ProcessService.java:1025)
at org.apache.dolphinscheduler.service.process.ProcessService.setSubProcessParam(ProcessService.java:992)
at org.apache.dolphinscheduler.service.process.ProcessService.handleCommand(ProcessService.java:226)
at org.apache.dolphinscheduler.service.process.ProcessService$$FastClassBySpringCGLIB$$ed138739.invoke(<generated>)
`
### What you expected to happen
Global parameters are passed normally
### How to reproduce
Configure two processes, where the sub process has no global parameters, and the parent process has global parameters
### Anything else
_No response_
### Version
2.0.0
### Are you willing to submit PR?
- [ ] Yes I am willing to submit a PR!
### Code of Conduct
- [X] I agree to follow this project's [Code of Conduct](https://www.apache.org/foundation/policies/conduct)
| https://github.com/apache/dolphinscheduler/issues/7753 | https://github.com/apache/dolphinscheduler/pull/7755 | 4203304b08847d57218f9e9cb4edf7447f6eab8b | fa906e7d01ac5e4222bc068bd1e908297cfd7b57 | 2021-12-31T06:47:13Z | java | 2022-01-01T07:23:50Z | dolphinscheduler-service/src/main/java/org/apache/dolphinscheduler/service/process/ProcessService.java | 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;
}
/**
* get have perm project list
*
* @param userId userId
* @return project list
*/
public List<Project> getProjectListHavePerm(int userId) {
List<Project> createProjects = projectMapper.queryProjectCreatedByUser(userId); |
closed | apache/dolphinscheduler | https://github.com/apache/dolphinscheduler | 7,753 | [Bug] [Master] Failed to pass global parameters between parent and 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
When the parent process has global parameters, but the sub process does not have global parameters, a null pointer error will be triggered
`[ERROR] 2021-12-31 14:06:44.898 org.apache.dolphinscheduler.server.master.runner.MasterSchedulerService:[215] - scan command error
java.lang.UnsupportedOperationException: null
at java.util.AbstractList.add(AbstractList.java:148)
at java.util.AbstractList.add(AbstractList.java:108)
at org.apache.dolphinscheduler.service.process.ProcessService.joinGlobalParams(ProcessService.java:1025)
at org.apache.dolphinscheduler.service.process.ProcessService.setSubProcessParam(ProcessService.java:992)
at org.apache.dolphinscheduler.service.process.ProcessService.handleCommand(ProcessService.java:226)
at org.apache.dolphinscheduler.service.process.ProcessService$$FastClassBySpringCGLIB$$ed138739.invoke(<generated>)
`
### What you expected to happen
Global parameters are passed normally
### How to reproduce
Configure two processes, where the sub process has no global parameters, and the parent process has global parameters
### Anything else
_No response_
### Version
2.0.0
### Are you willing to submit PR?
- [ ] Yes I am willing to submit a PR!
### Code of Conduct
- [X] I agree to follow this project's [Code of Conduct](https://www.apache.org/foundation/policies/conduct)
| https://github.com/apache/dolphinscheduler/issues/7753 | https://github.com/apache/dolphinscheduler/pull/7755 | 4203304b08847d57218f9e9cb4edf7447f6eab8b | fa906e7d01ac5e4222bc068bd1e908297cfd7b57 | 2021-12-31T06:47:13Z | java | 2022-01-01T07:23:50Z | dolphinscheduler-service/src/main/java/org/apache/dolphinscheduler/service/process/ProcessService.java | 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:
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); |
closed | apache/dolphinscheduler | https://github.com/apache/dolphinscheduler | 7,753 | [Bug] [Master] Failed to pass global parameters between parent and 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
When the parent process has global parameters, but the sub process does not have global parameters, a null pointer error will be triggered
`[ERROR] 2021-12-31 14:06:44.898 org.apache.dolphinscheduler.server.master.runner.MasterSchedulerService:[215] - scan command error
java.lang.UnsupportedOperationException: null
at java.util.AbstractList.add(AbstractList.java:148)
at java.util.AbstractList.add(AbstractList.java:108)
at org.apache.dolphinscheduler.service.process.ProcessService.joinGlobalParams(ProcessService.java:1025)
at org.apache.dolphinscheduler.service.process.ProcessService.setSubProcessParam(ProcessService.java:992)
at org.apache.dolphinscheduler.service.process.ProcessService.handleCommand(ProcessService.java:226)
at org.apache.dolphinscheduler.service.process.ProcessService$$FastClassBySpringCGLIB$$ed138739.invoke(<generated>)
`
### What you expected to happen
Global parameters are passed normally
### How to reproduce
Configure two processes, where the sub process has no global parameters, and the parent process has global parameters
### Anything else
_No response_
### Version
2.0.0
### Are you willing to submit PR?
- [ ] Yes I am willing to submit a PR!
### Code of Conduct
- [X] I agree to follow this project's [Code of Conduct](https://www.apache.org/foundation/policies/conduct)
| https://github.com/apache/dolphinscheduler/issues/7753 | https://github.com/apache/dolphinscheduler/pull/7755 | 4203304b08847d57218f9e9cb4edf7447f6eab8b | fa906e7d01ac5e4222bc068bd1e908297cfd7b57 | 2021-12-31T06:47:13Z | java | 2022-01-01T07:23:50Z | dolphinscheduler-service/src/main/java/org/apache/dolphinscheduler/service/process/ProcessService.java | 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
* @return User
*/
public User getUserById(int userId) {
return userMapper.selectById(userId);
}
/**
* get resource by resource id |
closed | apache/dolphinscheduler | https://github.com/apache/dolphinscheduler | 7,753 | [Bug] [Master] Failed to pass global parameters between parent and 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
When the parent process has global parameters, but the sub process does not have global parameters, a null pointer error will be triggered
`[ERROR] 2021-12-31 14:06:44.898 org.apache.dolphinscheduler.server.master.runner.MasterSchedulerService:[215] - scan command error
java.lang.UnsupportedOperationException: null
at java.util.AbstractList.add(AbstractList.java:148)
at java.util.AbstractList.add(AbstractList.java:108)
at org.apache.dolphinscheduler.service.process.ProcessService.joinGlobalParams(ProcessService.java:1025)
at org.apache.dolphinscheduler.service.process.ProcessService.setSubProcessParam(ProcessService.java:992)
at org.apache.dolphinscheduler.service.process.ProcessService.handleCommand(ProcessService.java:226)
at org.apache.dolphinscheduler.service.process.ProcessService$$FastClassBySpringCGLIB$$ed138739.invoke(<generated>)
`
### What you expected to happen
Global parameters are passed normally
### How to reproduce
Configure two processes, where the sub process has no global parameters, and the parent process has global parameters
### Anything else
_No response_
### Version
2.0.0
### Are you willing to submit PR?
- [ ] Yes I am willing to submit a PR!
### Code of Conduct
- [X] I agree to follow this project's [Code of Conduct](https://www.apache.org/foundation/policies/conduct)
| https://github.com/apache/dolphinscheduler/issues/7753 | https://github.com/apache/dolphinscheduler/pull/7755 | 4203304b08847d57218f9e9cb4edf7447f6eab8b | fa906e7d01ac5e4222bc068bd1e908297cfd7b57 | 2021-12-31T06:47:13Z | java | 2022-01-01T07:23:50Z | dolphinscheduler-service/src/main/java/org/apache/dolphinscheduler/service/process/ProcessService.java | *
* @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 "";
}
ProcessDefinition definition = findProcessDefinition(processInstance.getProcessDefinitionCode(), processInstance.getProcessDefinitionVersion());
if (definition == null) {
return "";
}
return String.format("%s_%s_%s", definition.getId(), processInstance.getId(), taskInstance.getId());
} |
closed | apache/dolphinscheduler | https://github.com/apache/dolphinscheduler | 7,753 | [Bug] [Master] Failed to pass global parameters between parent and 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
When the parent process has global parameters, but the sub process does not have global parameters, a null pointer error will be triggered
`[ERROR] 2021-12-31 14:06:44.898 org.apache.dolphinscheduler.server.master.runner.MasterSchedulerService:[215] - scan command error
java.lang.UnsupportedOperationException: null
at java.util.AbstractList.add(AbstractList.java:148)
at java.util.AbstractList.add(AbstractList.java:108)
at org.apache.dolphinscheduler.service.process.ProcessService.joinGlobalParams(ProcessService.java:1025)
at org.apache.dolphinscheduler.service.process.ProcessService.setSubProcessParam(ProcessService.java:992)
at org.apache.dolphinscheduler.service.process.ProcessService.handleCommand(ProcessService.java:226)
at org.apache.dolphinscheduler.service.process.ProcessService$$FastClassBySpringCGLIB$$ed138739.invoke(<generated>)
`
### What you expected to happen
Global parameters are passed normally
### How to reproduce
Configure two processes, where the sub process has no global parameters, and the parent process has global parameters
### Anything else
_No response_
### Version
2.0.0
### Are you willing to submit PR?
- [ ] Yes I am willing to submit a PR!
### Code of Conduct
- [X] I agree to follow this project's [Code of Conduct](https://www.apache.org/foundation/policies/conduct)
| https://github.com/apache/dolphinscheduler/issues/7753 | https://github.com/apache/dolphinscheduler/pull/7755 | 4203304b08847d57218f9e9cb4edf7447f6eab8b | fa906e7d01ac5e4222bc068bd1e908297cfd7b57 | 2021-12-31T06:47:13Z | java | 2022-01-01T07:23:50Z | dolphinscheduler-service/src/main/java/org/apache/dolphinscheduler/service/process/ProcessService.java | /**
* switch process definition version to process definition log version
*/
public int switchVersion(ProcessDefinition processDefinition, ProcessDefinitionLog processDefinitionLog) {
if (null == processDefinition || null == processDefinitionLog) {
return Constants.DEFINITION_FAILURE;
}
processDefinitionLog.setId(processDefinition.getId());
processDefinitionLog.setReleaseState(ReleaseState.OFFLINE);
processDefinitionLog.setFlag(Flag.YES);
int result = processDefineMapper.updateById(processDefinitionLog);
if (result > 0) {
result = switchProcessTaskRelationVersion(processDefinitionLog);
if (result <= 0) {
return Constants.DEFINITION_FAILURE;
}
}
return result;
}
public int switchProcessTaskRelationVersion(ProcessDefinition processDefinition) {
List<ProcessTaskRelation> processTaskRelationList = processTaskRelationMapper.queryByProcessCode(processDefinition.getProjectCode(), processDefinition.getCode());
if (!processTaskRelationList.isEmpty()) {
processTaskRelationMapper.deleteByCode(processDefinition.getProjectCode(), processDefinition.getCode());
}
List<ProcessTaskRelationLog> processTaskRelationLogList = processTaskRelationLogMapper.queryByProcessCodeAndVersion(processDefinition.getCode(), processDefinition.getVersion());
return processTaskRelationMapper.batchInsert(processTaskRelationLogList);
}
/**
* get resource ids
* |
closed | apache/dolphinscheduler | https://github.com/apache/dolphinscheduler | 7,753 | [Bug] [Master] Failed to pass global parameters between parent and 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
When the parent process has global parameters, but the sub process does not have global parameters, a null pointer error will be triggered
`[ERROR] 2021-12-31 14:06:44.898 org.apache.dolphinscheduler.server.master.runner.MasterSchedulerService:[215] - scan command error
java.lang.UnsupportedOperationException: null
at java.util.AbstractList.add(AbstractList.java:148)
at java.util.AbstractList.add(AbstractList.java:108)
at org.apache.dolphinscheduler.service.process.ProcessService.joinGlobalParams(ProcessService.java:1025)
at org.apache.dolphinscheduler.service.process.ProcessService.setSubProcessParam(ProcessService.java:992)
at org.apache.dolphinscheduler.service.process.ProcessService.handleCommand(ProcessService.java:226)
at org.apache.dolphinscheduler.service.process.ProcessService$$FastClassBySpringCGLIB$$ed138739.invoke(<generated>)
`
### What you expected to happen
Global parameters are passed normally
### How to reproduce
Configure two processes, where the sub process has no global parameters, and the parent process has global parameters
### Anything else
_No response_
### Version
2.0.0
### Are you willing to submit PR?
- [ ] Yes I am willing to submit a PR!
### Code of Conduct
- [X] I agree to follow this project's [Code of Conduct](https://www.apache.org/foundation/policies/conduct)
| https://github.com/apache/dolphinscheduler/issues/7753 | https://github.com/apache/dolphinscheduler/pull/7755 | 4203304b08847d57218f9e9cb4edf7447f6eab8b | fa906e7d01ac5e4222bc068bd1e908297cfd7b57 | 2021-12-31T06:47:13Z | java | 2022-01-01T07:23:50Z | dolphinscheduler-service/src/main/java/org/apache/dolphinscheduler/service/process/ProcessService.java | * @param taskDefinition taskDefinition
* @return resource ids
*/
public String getResourceIds(TaskDefinition taskDefinition) {
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 int 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 |
closed | apache/dolphinscheduler | https://github.com/apache/dolphinscheduler | 7,753 | [Bug] [Master] Failed to pass global parameters between parent and 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
When the parent process has global parameters, but the sub process does not have global parameters, a null pointer error will be triggered
`[ERROR] 2021-12-31 14:06:44.898 org.apache.dolphinscheduler.server.master.runner.MasterSchedulerService:[215] - scan command error
java.lang.UnsupportedOperationException: null
at java.util.AbstractList.add(AbstractList.java:148)
at java.util.AbstractList.add(AbstractList.java:108)
at org.apache.dolphinscheduler.service.process.ProcessService.joinGlobalParams(ProcessService.java:1025)
at org.apache.dolphinscheduler.service.process.ProcessService.setSubProcessParam(ProcessService.java:992)
at org.apache.dolphinscheduler.service.process.ProcessService.handleCommand(ProcessService.java:226)
at org.apache.dolphinscheduler.service.process.ProcessService$$FastClassBySpringCGLIB$$ed138739.invoke(<generated>)
`
### What you expected to happen
Global parameters are passed normally
### How to reproduce
Configure two processes, where the sub process has no global parameters, and the parent process has global parameters
### Anything else
_No response_
### Version
2.0.0
### Are you willing to submit PR?
- [ ] Yes I am willing to submit a PR!
### Code of Conduct
- [X] I agree to follow this project's [Code of Conduct](https://www.apache.org/foundation/policies/conduct)
| https://github.com/apache/dolphinscheduler/issues/7753 | https://github.com/apache/dolphinscheduler/pull/7755 | 4203304b08847d57218f9e9cb4edf7447f6eab8b | fa906e7d01ac5e4222bc068bd1e908297cfd7b57 | 2021-12-31T06:47:13Z | java | 2022-01-01T07:23:50Z | dolphinscheduler-service/src/main/java/org/apache/dolphinscheduler/service/process/ProcessService.java | .queryByDefinitionCodeAndVersion(taskDefinitionLog.getCode(), taskDefinitionLog.getVersion());
if (definitionCodeAndVersion != null) {
if (!taskDefinitionLog.equals(definitionCodeAndVersion)) {
taskDefinitionLog.setUserId(definitionCodeAndVersion.getUserId());
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(CodeGenerateUtils.getInstance().genCode());
} catch (CodeGenerateException e) {
logger.error("Task code get error, ", e);
return Constants.DEFINITION_FAILURE;
}
}
newTaskDefinitionLogs.add(taskDefinitionLog);
}
int insertResult = 0;
int updateResult = 0;
for (TaskDefinitionLog taskDefinitionToUpdate : updateTaskDefinitionLogs) {
TaskDefinition task = taskDefinitionMapper.queryByCode(taskDefinitionToUpdate.getCode());
if (task == null) { |
closed | apache/dolphinscheduler | https://github.com/apache/dolphinscheduler | 7,753 | [Bug] [Master] Failed to pass global parameters between parent and 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
When the parent process has global parameters, but the sub process does not have global parameters, a null pointer error will be triggered
`[ERROR] 2021-12-31 14:06:44.898 org.apache.dolphinscheduler.server.master.runner.MasterSchedulerService:[215] - scan command error
java.lang.UnsupportedOperationException: null
at java.util.AbstractList.add(AbstractList.java:148)
at java.util.AbstractList.add(AbstractList.java:108)
at org.apache.dolphinscheduler.service.process.ProcessService.joinGlobalParams(ProcessService.java:1025)
at org.apache.dolphinscheduler.service.process.ProcessService.setSubProcessParam(ProcessService.java:992)
at org.apache.dolphinscheduler.service.process.ProcessService.handleCommand(ProcessService.java:226)
at org.apache.dolphinscheduler.service.process.ProcessService$$FastClassBySpringCGLIB$$ed138739.invoke(<generated>)
`
### What you expected to happen
Global parameters are passed normally
### How to reproduce
Configure two processes, where the sub process has no global parameters, and the parent process has global parameters
### Anything else
_No response_
### Version
2.0.0
### Are you willing to submit PR?
- [ ] Yes I am willing to submit a PR!
### Code of Conduct
- [X] I agree to follow this project's [Code of Conduct](https://www.apache.org/foundation/policies/conduct)
| https://github.com/apache/dolphinscheduler/issues/7753 | https://github.com/apache/dolphinscheduler/pull/7755 | 4203304b08847d57218f9e9cb4edf7447f6eab8b | fa906e7d01ac5e4222bc068bd1e908297cfd7b57 | 2021-12-31T06:47:13Z | java | 2022-01-01T07:23:50Z | dolphinscheduler-service/src/main/java/org/apache/dolphinscheduler/service/process/ProcessService.java | newTaskDefinitionLogs.add(taskDefinitionToUpdate);
} else {
insertResult += taskDefinitionLogMapper.insert(taskDefinitionToUpdate);
taskDefinitionToUpdate.setId(task.getId());
updateResult += taskDefinitionMapper.updateById(taskDefinitionToUpdate);
}
}
if (!newTaskDefinitionLogs.isEmpty()) {
updateResult += taskDefinitionMapper.batchInsert(newTaskDefinitionLogs);
insertResult += taskDefinitionLogMapper.batchInsert(newTaskDefinitionLogs);
}
return (insertResult & updateResult) > 0 ? 1 : Constants.EXIT_CODE_SUCCESS;
}
/**
* 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()); |
closed | apache/dolphinscheduler | https://github.com/apache/dolphinscheduler | 7,753 | [Bug] [Master] Failed to pass global parameters between parent and 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
When the parent process has global parameters, but the sub process does not have global parameters, a null pointer error will be triggered
`[ERROR] 2021-12-31 14:06:44.898 org.apache.dolphinscheduler.server.master.runner.MasterSchedulerService:[215] - scan command error
java.lang.UnsupportedOperationException: null
at java.util.AbstractList.add(AbstractList.java:148)
at java.util.AbstractList.add(AbstractList.java:108)
at org.apache.dolphinscheduler.service.process.ProcessService.joinGlobalParams(ProcessService.java:1025)
at org.apache.dolphinscheduler.service.process.ProcessService.setSubProcessParam(ProcessService.java:992)
at org.apache.dolphinscheduler.service.process.ProcessService.handleCommand(ProcessService.java:226)
at org.apache.dolphinscheduler.service.process.ProcessService$$FastClassBySpringCGLIB$$ed138739.invoke(<generated>)
`
### What you expected to happen
Global parameters are passed normally
### How to reproduce
Configure two processes, where the sub process has no global parameters, and the parent process has global parameters
### Anything else
_No response_
### Version
2.0.0
### Are you willing to submit PR?
- [ ] Yes I am willing to submit a PR!
### Code of Conduct
- [X] I agree to follow this project's [Code of Conduct](https://www.apache.org/foundation/policies/conduct)
| https://github.com/apache/dolphinscheduler/issues/7753 | https://github.com/apache/dolphinscheduler/pull/7755 | 4203304b08847d57218f9e9cb4edf7447f6eab8b | fa906e7d01ac5e4222bc068bd1e908297cfd7b57 | 2021-12-31T06:47:13Z | java | 2022-01-01T07:23:50Z | dolphinscheduler-service/src/main/java/org/apache/dolphinscheduler/service/process/ProcessService.java | result = processDefineMapper.updateById(processDefinitionLog);
}
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) {
if (taskRelationList.isEmpty()) {
return Constants.EXIT_CODE_SUCCESS;
}
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 preTaskDefinitionLog = taskDefinitionLogMap.get(processTaskRelationLog.getPreTaskCode());
if (preTaskDefinitionLog != null) {
processTaskRelationLog.setPreTaskVersion(preTaskDefinitionLog.getVersion());
}
TaskDefinitionLog postTaskDefinitionLog = taskDefinitionLogMap.get(processTaskRelationLog.getPostTaskCode());
if (postTaskDefinitionLog != null) {
processTaskRelationLog.setPostTaskVersion(postTaskDefinitionLog.getVersion()); |
closed | apache/dolphinscheduler | https://github.com/apache/dolphinscheduler | 7,753 | [Bug] [Master] Failed to pass global parameters between parent and 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
When the parent process has global parameters, but the sub process does not have global parameters, a null pointer error will be triggered
`[ERROR] 2021-12-31 14:06:44.898 org.apache.dolphinscheduler.server.master.runner.MasterSchedulerService:[215] - scan command error
java.lang.UnsupportedOperationException: null
at java.util.AbstractList.add(AbstractList.java:148)
at java.util.AbstractList.add(AbstractList.java:108)
at org.apache.dolphinscheduler.service.process.ProcessService.joinGlobalParams(ProcessService.java:1025)
at org.apache.dolphinscheduler.service.process.ProcessService.setSubProcessParam(ProcessService.java:992)
at org.apache.dolphinscheduler.service.process.ProcessService.handleCommand(ProcessService.java:226)
at org.apache.dolphinscheduler.service.process.ProcessService$$FastClassBySpringCGLIB$$ed138739.invoke(<generated>)
`
### What you expected to happen
Global parameters are passed normally
### How to reproduce
Configure two processes, where the sub process has no global parameters, and the parent process has global parameters
### Anything else
_No response_
### Version
2.0.0
### Are you willing to submit PR?
- [ ] Yes I am willing to submit a PR!
### Code of Conduct
- [X] I agree to follow this project's [Code of Conduct](https://www.apache.org/foundation/policies/conduct)
| https://github.com/apache/dolphinscheduler/issues/7753 | https://github.com/apache/dolphinscheduler/pull/7755 | 4203304b08847d57218f9e9cb4edf7447f6eab8b | fa906e7d01ac5e4222bc068bd1e908297cfd7b57 | 2021-12-31T06:47:13Z | java | 2022-01-01T07:23:50Z | dolphinscheduler-service/src/main/java/org/apache/dolphinscheduler/service/process/ProcessService.java | }
}
processTaskRelationLog.setCreateTime(now);
processTaskRelationLog.setUpdateTime(now);
processTaskRelationLog.setOperator(operator.getId());
processTaskRelationLog.setOperateTime(now);
}
List<ProcessTaskRelation> processTaskRelationList = processTaskRelationMapper.queryByProcessCode(projectCode, processDefinitionCode);
if (!processTaskRelationList.isEmpty()) {
Set<Integer> processTaskRelationSet = processTaskRelationList.stream().map(ProcessTaskRelation::hashCode).collect(toSet());
Set<Integer> taskRelationSet = taskRelationList.stream().map(ProcessTaskRelationLog::hashCode).collect(toSet());
boolean result = CollectionUtils.isEqualCollection(processTaskRelationSet, taskRelationSet);
if (result) {
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); |
closed | apache/dolphinscheduler | https://github.com/apache/dolphinscheduler | 7,753 | [Bug] [Master] Failed to pass global parameters between parent and 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
When the parent process has global parameters, but the sub process does not have global parameters, a null pointer error will be triggered
`[ERROR] 2021-12-31 14:06:44.898 org.apache.dolphinscheduler.server.master.runner.MasterSchedulerService:[215] - scan command error
java.lang.UnsupportedOperationException: null
at java.util.AbstractList.add(AbstractList.java:148)
at java.util.AbstractList.add(AbstractList.java:108)
at org.apache.dolphinscheduler.service.process.ProcessService.joinGlobalParams(ProcessService.java:1025)
at org.apache.dolphinscheduler.service.process.ProcessService.setSubProcessParam(ProcessService.java:992)
at org.apache.dolphinscheduler.service.process.ProcessService.handleCommand(ProcessService.java:226)
at org.apache.dolphinscheduler.service.process.ProcessService$$FastClassBySpringCGLIB$$ed138739.invoke(<generated>)
`
### What you expected to happen
Global parameters are passed normally
### How to reproduce
Configure two processes, where the sub process has no global parameters, and the parent process has global parameters
### Anything else
_No response_
### Version
2.0.0
### Are you willing to submit PR?
- [ ] Yes I am willing to submit a PR!
### Code of Conduct
- [X] I agree to follow this project's [Code of Conduct](https://www.apache.org/foundation/policies/conduct)
| https://github.com/apache/dolphinscheduler/issues/7753 | https://github.com/apache/dolphinscheduler/pull/7755 | 4203304b08847d57218f9e9cb4edf7447f6eab8b | fa906e7d01ac5e4222bc068bd1e908297cfd7b57 | 2021-12-31T06:47:13Z | java | 2022-01-01T07:23:50Z | dolphinscheduler-service/src/main/java/org/apache/dolphinscheduler/service/process/ProcessService.java | for (ProcessDefinition processDefinition : processDefinitionList) {
if (processDefinition.getReleaseState() == ReleaseState.ONLINE) {
return true;
}
}
}
return false;
}
/**
* 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()); |
closed | apache/dolphinscheduler | https://github.com/apache/dolphinscheduler | 7,753 | [Bug] [Master] Failed to pass global parameters between parent and 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
When the parent process has global parameters, but the sub process does not have global parameters, a null pointer error will be triggered
`[ERROR] 2021-12-31 14:06:44.898 org.apache.dolphinscheduler.server.master.runner.MasterSchedulerService:[215] - scan command error
java.lang.UnsupportedOperationException: null
at java.util.AbstractList.add(AbstractList.java:148)
at java.util.AbstractList.add(AbstractList.java:108)
at org.apache.dolphinscheduler.service.process.ProcessService.joinGlobalParams(ProcessService.java:1025)
at org.apache.dolphinscheduler.service.process.ProcessService.setSubProcessParam(ProcessService.java:992)
at org.apache.dolphinscheduler.service.process.ProcessService.handleCommand(ProcessService.java:226)
at org.apache.dolphinscheduler.service.process.ProcessService$$FastClassBySpringCGLIB$$ed138739.invoke(<generated>)
`
### What you expected to happen
Global parameters are passed normally
### How to reproduce
Configure two processes, where the sub process has no global parameters, and the parent process has global parameters
### Anything else
_No response_
### Version
2.0.0
### Are you willing to submit PR?
- [ ] Yes I am willing to submit a PR!
### Code of Conduct
- [X] I agree to follow this project's [Code of Conduct](https://www.apache.org/foundation/policies/conduct)
| https://github.com/apache/dolphinscheduler/issues/7753 | https://github.com/apache/dolphinscheduler/pull/7755 | 4203304b08847d57218f9e9cb4edf7447f6eab8b | fa906e7d01ac5e4222bc068bd1e908297cfd7b57 | 2021-12-31T06:47:13Z | java | 2022-01-01T07:23:50Z | dolphinscheduler-service/src/main/java/org/apache/dolphinscheduler/service/process/ProcessService.java | 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) {
taskDefinitionSet.add(new TaskDefinition(processTaskRelation.getPostTaskCode(), processTaskRelation.getPostTaskVersion()));
}
}
if (taskDefinitionSet.isEmpty()) {
return Lists.newArrayList();
}
return taskDefinitionLogMapper.queryByTaskDefinitions(taskDefinitionSet);
}
public List<TaskDefinitionLog> getTaskDefineLogListByRelation(List<ProcessTaskRelation> processTaskRelations) {
List<TaskDefinitionLog> taskDefinitionLogs = new ArrayList<>();
Map<Long, Integer> taskCodeVersionMap = new HashMap<>();
for (ProcessTaskRelation processTaskRelation : processTaskRelations) {
if (processTaskRelation.getPreTaskCode() > 0) {
taskCodeVersionMap.put(processTaskRelation.getPreTaskCode(), processTaskRelation.getPreTaskVersion());
}
if (processTaskRelation.getPostTaskCode() > 0) {
taskCodeVersionMap.put(processTaskRelation.getPostTaskCode(), processTaskRelation.getPostTaskVersion());
}
}
taskCodeVersionMap.forEach((code,version) -> {
taskDefinitionLogs.add((TaskDefinitionLog) this.findTaskDefinition(code, version)); |
closed | apache/dolphinscheduler | https://github.com/apache/dolphinscheduler | 7,753 | [Bug] [Master] Failed to pass global parameters between parent and 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
When the parent process has global parameters, but the sub process does not have global parameters, a null pointer error will be triggered
`[ERROR] 2021-12-31 14:06:44.898 org.apache.dolphinscheduler.server.master.runner.MasterSchedulerService:[215] - scan command error
java.lang.UnsupportedOperationException: null
at java.util.AbstractList.add(AbstractList.java:148)
at java.util.AbstractList.add(AbstractList.java:108)
at org.apache.dolphinscheduler.service.process.ProcessService.joinGlobalParams(ProcessService.java:1025)
at org.apache.dolphinscheduler.service.process.ProcessService.setSubProcessParam(ProcessService.java:992)
at org.apache.dolphinscheduler.service.process.ProcessService.handleCommand(ProcessService.java:226)
at org.apache.dolphinscheduler.service.process.ProcessService$$FastClassBySpringCGLIB$$ed138739.invoke(<generated>)
`
### What you expected to happen
Global parameters are passed normally
### How to reproduce
Configure two processes, where the sub process has no global parameters, and the parent process has global parameters
### Anything else
_No response_
### Version
2.0.0
### Are you willing to submit PR?
- [ ] Yes I am willing to submit a PR!
### Code of Conduct
- [X] I agree to follow this project's [Code of Conduct](https://www.apache.org/foundation/policies/conduct)
| https://github.com/apache/dolphinscheduler/issues/7753 | https://github.com/apache/dolphinscheduler/pull/7755 | 4203304b08847d57218f9e9cb4edf7447f6eab8b | fa906e7d01ac5e4222bc068bd1e908297cfd7b57 | 2021-12-31T06:47:13Z | java | 2022-01-01T07:23:50Z | dolphinscheduler-service/src/main/java/org/apache/dolphinscheduler/service/process/ProcessService.java | });
return taskDefinitionLogs;
}
/**
* find task definition by code and version
*/
public TaskDefinition findTaskDefinition(long taskCode, int taskDefinitionVersion) {
return taskDefinitionLogMapper.queryByDefinitionCodeAndVersion(taskCode, taskDefinitionVersion);
}
/**
* find process task relation list by projectCode and processDefinitionCode
*/
public List<ProcessTaskRelation> findRelationByCode(long projectCode, long processDefinitionCode) {
return processTaskRelationMapper.queryByProcessCode(projectCode, processDefinitionCode);
}
/**
* 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) { |
closed | apache/dolphinscheduler | https://github.com/apache/dolphinscheduler | 7,753 | [Bug] [Master] Failed to pass global parameters between parent and 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
When the parent process has global parameters, but the sub process does not have global parameters, a null pointer error will be triggered
`[ERROR] 2021-12-31 14:06:44.898 org.apache.dolphinscheduler.server.master.runner.MasterSchedulerService:[215] - scan command error
java.lang.UnsupportedOperationException: null
at java.util.AbstractList.add(AbstractList.java:148)
at java.util.AbstractList.add(AbstractList.java:108)
at org.apache.dolphinscheduler.service.process.ProcessService.joinGlobalParams(ProcessService.java:1025)
at org.apache.dolphinscheduler.service.process.ProcessService.setSubProcessParam(ProcessService.java:992)
at org.apache.dolphinscheduler.service.process.ProcessService.handleCommand(ProcessService.java:226)
at org.apache.dolphinscheduler.service.process.ProcessService$$FastClassBySpringCGLIB$$ed138739.invoke(<generated>)
`
### What you expected to happen
Global parameters are passed normally
### How to reproduce
Configure two processes, where the sub process has no global parameters, and the parent process has global parameters
### Anything else
_No response_
### Version
2.0.0
### Are you willing to submit PR?
- [ ] Yes I am willing to submit a PR!
### Code of Conduct
- [X] I agree to follow this project's [Code of Conduct](https://www.apache.org/foundation/policies/conduct)
| https://github.com/apache/dolphinscheduler/issues/7753 | https://github.com/apache/dolphinscheduler/pull/7755 | 4203304b08847d57218f9e9cb4edf7447f6eab8b | fa906e7d01ac5e4222bc068bd1e908297cfd7b57 | 2021-12-31T06:47:13Z | java | 2022-01-01T07:23:50Z | dolphinscheduler-service/src/main/java/org/apache/dolphinscheduler/service/process/ProcessService.java | Map<Long, List<Long>> taskCodeMap = new HashMap<>();
for (ProcessTaskRelation processTaskRelation : taskRelationList) {
taskCodeMap.compute(processTaskRelation.getPostTaskCode(), (k, v) -> {
if (v == null) {
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()); |
closed | apache/dolphinscheduler | https://github.com/apache/dolphinscheduler | 7,753 | [Bug] [Master] Failed to pass global parameters between parent and 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
When the parent process has global parameters, but the sub process does not have global parameters, a null pointer error will be triggered
`[ERROR] 2021-12-31 14:06:44.898 org.apache.dolphinscheduler.server.master.runner.MasterSchedulerService:[215] - scan command error
java.lang.UnsupportedOperationException: null
at java.util.AbstractList.add(AbstractList.java:148)
at java.util.AbstractList.add(AbstractList.java:108)
at org.apache.dolphinscheduler.service.process.ProcessService.joinGlobalParams(ProcessService.java:1025)
at org.apache.dolphinscheduler.service.process.ProcessService.setSubProcessParam(ProcessService.java:992)
at org.apache.dolphinscheduler.service.process.ProcessService.handleCommand(ProcessService.java:226)
at org.apache.dolphinscheduler.service.process.ProcessService$$FastClassBySpringCGLIB$$ed138739.invoke(<generated>)
`
### What you expected to happen
Global parameters are passed normally
### How to reproduce
Configure two processes, where the sub process has no global parameters, and the parent process has global parameters
### Anything else
_No response_
### Version
2.0.0
### Are you willing to submit PR?
- [ ] Yes I am willing to submit a PR!
### Code of Conduct
- [X] I agree to follow this project's [Code of Conduct](https://www.apache.org/foundation/policies/conduct)
| https://github.com/apache/dolphinscheduler/issues/7753 | https://github.com/apache/dolphinscheduler/pull/7755 | 4203304b08847d57218f9e9cb4edf7447f6eab8b | fa906e7d01ac5e4222bc068bd1e908297cfd7b57 | 2021-12-31T06:47:13Z | java | 2022-01-01T07:23:50Z | dolphinscheduler-service/src/main/java/org/apache/dolphinscheduler/service/process/ProcessService.java | Map<String, Object> taskParamsMap = taskNode.taskParamsToJsonObj(taskDefinitionLog.getTaskParams());
taskNode.setConditionResult(JSONUtils.toJsonString(taskParamsMap.get(Constants.CONDITION_RESULT)));
taskNode.setSwitchResult(JSONUtils.toJsonString(taskParamsMap.get(Constants.SWITCH_RESULT)));
taskNode.setDependence(JSONUtils.toJsonString(taskParamsMap.get(Constants.DEPENDENCE)));
taskParamsMap.remove(Constants.CONDITION_RESULT);
taskParamsMap.remove(Constants.DEPENDENCE);
taskNode.setParams(JSONUtils.toJsonString(taskParamsMap));
taskNode.setTaskInstancePriority(taskDefinitionLog.getTaskPriority());
taskNode.setWorkerGroup(taskDefinitionLog.getWorkerGroup());
taskNode.setEnvironmentCode(taskDefinitionLog.getEnvironmentCode());
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::getCode).collect(Collectors.toList())));
taskNode.setTaskGroupId(taskDefinitionLog.getTaskGroupId());
taskNode.setTaskGroupPriority(taskDefinitionLog.getTaskGroupPriority());
taskNodeList.add(taskNode);
}
}
return taskNodeList;
}
public Map<ProcessInstance, TaskInstance> notifyProcessList(int processId) {
HashMap<ProcessInstance, TaskInstance> processTaskMap = new HashMap<>();
ProcessInstanceMap processInstanceMap = processInstanceMapMapper.queryBySubProcessId(processId);
if (processInstanceMap == null) {
return processTaskMap;
}
ProcessInstance fatherProcess = this.findProcessInstanceById(processInstanceMap.getParentProcessInstanceId()); |
closed | apache/dolphinscheduler | https://github.com/apache/dolphinscheduler | 7,753 | [Bug] [Master] Failed to pass global parameters between parent and 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
When the parent process has global parameters, but the sub process does not have global parameters, a null pointer error will be triggered
`[ERROR] 2021-12-31 14:06:44.898 org.apache.dolphinscheduler.server.master.runner.MasterSchedulerService:[215] - scan command error
java.lang.UnsupportedOperationException: null
at java.util.AbstractList.add(AbstractList.java:148)
at java.util.AbstractList.add(AbstractList.java:108)
at org.apache.dolphinscheduler.service.process.ProcessService.joinGlobalParams(ProcessService.java:1025)
at org.apache.dolphinscheduler.service.process.ProcessService.setSubProcessParam(ProcessService.java:992)
at org.apache.dolphinscheduler.service.process.ProcessService.handleCommand(ProcessService.java:226)
at org.apache.dolphinscheduler.service.process.ProcessService$$FastClassBySpringCGLIB$$ed138739.invoke(<generated>)
`
### What you expected to happen
Global parameters are passed normally
### How to reproduce
Configure two processes, where the sub process has no global parameters, and the parent process has global parameters
### Anything else
_No response_
### Version
2.0.0
### Are you willing to submit PR?
- [ ] Yes I am willing to submit a PR!
### Code of Conduct
- [X] I agree to follow this project's [Code of Conduct](https://www.apache.org/foundation/policies/conduct)
| https://github.com/apache/dolphinscheduler/issues/7753 | https://github.com/apache/dolphinscheduler/pull/7755 | 4203304b08847d57218f9e9cb4edf7447f6eab8b | fa906e7d01ac5e4222bc068bd1e908297cfd7b57 | 2021-12-31T06:47:13Z | java | 2022-01-01T07:23:50Z | dolphinscheduler-service/src/main/java/org/apache/dolphinscheduler/service/process/ProcessService.java | TaskInstance fatherTask = this.findTaskInstanceById(processInstanceMap.getParentTaskInstanceId());
if (fatherProcess != null) {
processTaskMap.put(fatherProcess, fatherTask);
}
return processTaskMap;
}
/**
* the first time (when submit the task ) get the resource of the task group
* @param taskId task id
* @param taskName
* @param groupId
* @param processId
* @param priority
* @return
*/
public boolean acquireTaskGroup(int taskId,
String taskName, int groupId,
int processId, int priority) {
TaskGroup taskGroup = taskGroupMapper.selectById(groupId);
if (taskGroup == null) {
return true;
}
if (taskGroup.getStatus() == Flag.NO.getCode()) {
return true;
}
TaskGroupQueue taskGroupQueue = this.taskGroupQueueMapper.queryByTaskId(taskId);
if (taskGroupQueue == null) {
taskGroupQueue = insertIntoTaskGroupQueue(taskId, taskName, groupId, processId, priority, TaskGroupQueueStatus.WAIT_QUEUE);
} else { |
closed | apache/dolphinscheduler | https://github.com/apache/dolphinscheduler | 7,753 | [Bug] [Master] Failed to pass global parameters between parent and 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
When the parent process has global parameters, but the sub process does not have global parameters, a null pointer error will be triggered
`[ERROR] 2021-12-31 14:06:44.898 org.apache.dolphinscheduler.server.master.runner.MasterSchedulerService:[215] - scan command error
java.lang.UnsupportedOperationException: null
at java.util.AbstractList.add(AbstractList.java:148)
at java.util.AbstractList.add(AbstractList.java:108)
at org.apache.dolphinscheduler.service.process.ProcessService.joinGlobalParams(ProcessService.java:1025)
at org.apache.dolphinscheduler.service.process.ProcessService.setSubProcessParam(ProcessService.java:992)
at org.apache.dolphinscheduler.service.process.ProcessService.handleCommand(ProcessService.java:226)
at org.apache.dolphinscheduler.service.process.ProcessService$$FastClassBySpringCGLIB$$ed138739.invoke(<generated>)
`
### What you expected to happen
Global parameters are passed normally
### How to reproduce
Configure two processes, where the sub process has no global parameters, and the parent process has global parameters
### Anything else
_No response_
### Version
2.0.0
### Are you willing to submit PR?
- [ ] Yes I am willing to submit a PR!
### Code of Conduct
- [X] I agree to follow this project's [Code of Conduct](https://www.apache.org/foundation/policies/conduct)
| https://github.com/apache/dolphinscheduler/issues/7753 | https://github.com/apache/dolphinscheduler/pull/7755 | 4203304b08847d57218f9e9cb4edf7447f6eab8b | fa906e7d01ac5e4222bc068bd1e908297cfd7b57 | 2021-12-31T06:47:13Z | java | 2022-01-01T07:23:50Z | dolphinscheduler-service/src/main/java/org/apache/dolphinscheduler/service/process/ProcessService.java | if (taskGroupQueue.getStatus() == TaskGroupQueueStatus.ACQUIRE_SUCCESS) {
return true;
}
taskGroupQueue.setInQueue(Flag.NO.getCode());
taskGroupQueue.setStatus(TaskGroupQueueStatus.WAIT_QUEUE);
this.taskGroupQueueMapper.updateById(taskGroupQueue);
}
List<TaskGroupQueue> highPriorityTasks = taskGroupQueueMapper.queryHighPriorityTasks(groupId, priority, TaskGroupQueueStatus.WAIT_QUEUE.getCode());
if (CollectionUtils.isNotEmpty(highPriorityTasks)) {
this.taskGroupQueueMapper.updateInQueue(Flag.NO.getCode(), taskGroupQueue.getId());
return false;
}
int count = taskGroupMapper.selectAvailableCountById(groupId);
if (count == 1 && robTaskGroupResouce(taskGroupQueue)) {
return true;
}
this.taskGroupQueueMapper.updateInQueue(Flag.NO.getCode(), taskGroupQueue.getId());
return false;
}
/**
* try to get the task group resource(when other task release the resource)
* @param taskGroupQueue
* @return
*/
public boolean robTaskGroupResouce(TaskGroupQueue taskGroupQueue) {
TaskGroup taskGroup = taskGroupMapper.selectById(taskGroupQueue.getGroupId());
int affectedCount = taskGroupMapper.updateTaskGroupResource(taskGroup.getId(),taskGroupQueue.getId(),
TaskGroupQueueStatus.WAIT_QUEUE.getCode()); |
closed | apache/dolphinscheduler | https://github.com/apache/dolphinscheduler | 7,753 | [Bug] [Master] Failed to pass global parameters between parent and 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
When the parent process has global parameters, but the sub process does not have global parameters, a null pointer error will be triggered
`[ERROR] 2021-12-31 14:06:44.898 org.apache.dolphinscheduler.server.master.runner.MasterSchedulerService:[215] - scan command error
java.lang.UnsupportedOperationException: null
at java.util.AbstractList.add(AbstractList.java:148)
at java.util.AbstractList.add(AbstractList.java:108)
at org.apache.dolphinscheduler.service.process.ProcessService.joinGlobalParams(ProcessService.java:1025)
at org.apache.dolphinscheduler.service.process.ProcessService.setSubProcessParam(ProcessService.java:992)
at org.apache.dolphinscheduler.service.process.ProcessService.handleCommand(ProcessService.java:226)
at org.apache.dolphinscheduler.service.process.ProcessService$$FastClassBySpringCGLIB$$ed138739.invoke(<generated>)
`
### What you expected to happen
Global parameters are passed normally
### How to reproduce
Configure two processes, where the sub process has no global parameters, and the parent process has global parameters
### Anything else
_No response_
### Version
2.0.0
### Are you willing to submit PR?
- [ ] Yes I am willing to submit a PR!
### Code of Conduct
- [X] I agree to follow this project's [Code of Conduct](https://www.apache.org/foundation/policies/conduct)
| https://github.com/apache/dolphinscheduler/issues/7753 | https://github.com/apache/dolphinscheduler/pull/7755 | 4203304b08847d57218f9e9cb4edf7447f6eab8b | fa906e7d01ac5e4222bc068bd1e908297cfd7b57 | 2021-12-31T06:47:13Z | java | 2022-01-01T07:23:50Z | dolphinscheduler-service/src/main/java/org/apache/dolphinscheduler/service/process/ProcessService.java | if (affectedCount > 0) {
taskGroupQueue.setStatus(TaskGroupQueueStatus.ACQUIRE_SUCCESS);
this.taskGroupQueueMapper.updateById(taskGroupQueue);
this.taskGroupQueueMapper.updateInQueue(Flag.NO.getCode(), taskGroupQueue.getId());
return true;
}
return false;
}
public boolean acquireTaskGroupAgain(TaskGroupQueue taskGroupQueue) {
return robTaskGroupResouce(taskGroupQueue);
}
public void releaseAllTaskGroup(int processInstanceId) {
List<TaskInstance> taskInstances = this.taskInstanceMapper.loadAllInfosNoRelease(processInstanceId, TaskGroupQueueStatus.ACQUIRE_SUCCESS.getCode());
for (TaskInstance info : taskInstances) {
releaseTaskGroup(info);
}
}
/**
* release the TGQ resource when the corresponding task is finished.
*
* @return the result code and msg
*/
public TaskInstance releaseTaskGroup(TaskInstance taskInstance) {
TaskGroup taskGroup = taskGroupMapper.selectById(taskInstance.getTaskGroupId());
if (taskGroup == null) {
return null;
}
TaskGroupQueue thisTaskGroupQueue = this.taskGroupQueueMapper.queryByTaskId(taskInstance.getId());
if (thisTaskGroupQueue.getStatus() == TaskGroupQueueStatus.RELEASE) {
return null; |
closed | apache/dolphinscheduler | https://github.com/apache/dolphinscheduler | 7,753 | [Bug] [Master] Failed to pass global parameters between parent and 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
When the parent process has global parameters, but the sub process does not have global parameters, a null pointer error will be triggered
`[ERROR] 2021-12-31 14:06:44.898 org.apache.dolphinscheduler.server.master.runner.MasterSchedulerService:[215] - scan command error
java.lang.UnsupportedOperationException: null
at java.util.AbstractList.add(AbstractList.java:148)
at java.util.AbstractList.add(AbstractList.java:108)
at org.apache.dolphinscheduler.service.process.ProcessService.joinGlobalParams(ProcessService.java:1025)
at org.apache.dolphinscheduler.service.process.ProcessService.setSubProcessParam(ProcessService.java:992)
at org.apache.dolphinscheduler.service.process.ProcessService.handleCommand(ProcessService.java:226)
at org.apache.dolphinscheduler.service.process.ProcessService$$FastClassBySpringCGLIB$$ed138739.invoke(<generated>)
`
### What you expected to happen
Global parameters are passed normally
### How to reproduce
Configure two processes, where the sub process has no global parameters, and the parent process has global parameters
### Anything else
_No response_
### Version
2.0.0
### Are you willing to submit PR?
- [ ] Yes I am willing to submit a PR!
### Code of Conduct
- [X] I agree to follow this project's [Code of Conduct](https://www.apache.org/foundation/policies/conduct)
| https://github.com/apache/dolphinscheduler/issues/7753 | https://github.com/apache/dolphinscheduler/pull/7755 | 4203304b08847d57218f9e9cb4edf7447f6eab8b | fa906e7d01ac5e4222bc068bd1e908297cfd7b57 | 2021-12-31T06:47:13Z | java | 2022-01-01T07:23:50Z | dolphinscheduler-service/src/main/java/org/apache/dolphinscheduler/service/process/ProcessService.java | }
try {
while (taskGroupMapper.releaseTaskGroupResource(taskGroup.getId(), taskGroup.getUseSize()
, thisTaskGroupQueue.getId(), TaskGroupQueueStatus.ACQUIRE_SUCCESS.getCode()) != 1) {
thisTaskGroupQueue = this.taskGroupQueueMapper.queryByTaskId(taskInstance.getId());
if (thisTaskGroupQueue.getStatus() == TaskGroupQueueStatus.RELEASE) {
return null;
}
taskGroup = taskGroupMapper.selectById(taskInstance.getTaskGroupId());
}
} catch (Exception e) {
logger.error("release the task group error",e);
}
logger.info("updateTask:{}",taskInstance.getName());
changeTaskGroupQueueStatus(taskInstance.getId(), TaskGroupQueueStatus.RELEASE);
TaskGroupQueue taskGroupQueue = this.taskGroupQueueMapper.queryTheHighestPriorityTasks(taskGroup.getId(),
TaskGroupQueueStatus.WAIT_QUEUE.getCode(), Flag.NO.getCode(), Flag.NO.getCode());
if (taskGroupQueue == null) {
return null;
}
while (this.taskGroupQueueMapper.updateInQueueCAS(Flag.NO.getCode(), Flag.YES.getCode(), taskGroupQueue.getId()) != 1) {
taskGroupQueue = this.taskGroupQueueMapper.queryTheHighestPriorityTasks(taskGroup.getId(),
TaskGroupQueueStatus.WAIT_QUEUE.getCode(), Flag.NO.getCode(), Flag.NO.getCode());
if (taskGroupQueue == null) {
return null;
}
}
return this.taskInstanceMapper.selectById(taskGroupQueue.getTaskId());
}
/** |
closed | apache/dolphinscheduler | https://github.com/apache/dolphinscheduler | 7,753 | [Bug] [Master] Failed to pass global parameters between parent and 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
When the parent process has global parameters, but the sub process does not have global parameters, a null pointer error will be triggered
`[ERROR] 2021-12-31 14:06:44.898 org.apache.dolphinscheduler.server.master.runner.MasterSchedulerService:[215] - scan command error
java.lang.UnsupportedOperationException: null
at java.util.AbstractList.add(AbstractList.java:148)
at java.util.AbstractList.add(AbstractList.java:108)
at org.apache.dolphinscheduler.service.process.ProcessService.joinGlobalParams(ProcessService.java:1025)
at org.apache.dolphinscheduler.service.process.ProcessService.setSubProcessParam(ProcessService.java:992)
at org.apache.dolphinscheduler.service.process.ProcessService.handleCommand(ProcessService.java:226)
at org.apache.dolphinscheduler.service.process.ProcessService$$FastClassBySpringCGLIB$$ed138739.invoke(<generated>)
`
### What you expected to happen
Global parameters are passed normally
### How to reproduce
Configure two processes, where the sub process has no global parameters, and the parent process has global parameters
### Anything else
_No response_
### Version
2.0.0
### Are you willing to submit PR?
- [ ] Yes I am willing to submit a PR!
### Code of Conduct
- [X] I agree to follow this project's [Code of Conduct](https://www.apache.org/foundation/policies/conduct)
| https://github.com/apache/dolphinscheduler/issues/7753 | https://github.com/apache/dolphinscheduler/pull/7755 | 4203304b08847d57218f9e9cb4edf7447f6eab8b | fa906e7d01ac5e4222bc068bd1e908297cfd7b57 | 2021-12-31T06:47:13Z | java | 2022-01-01T07:23:50Z | dolphinscheduler-service/src/main/java/org/apache/dolphinscheduler/service/process/ProcessService.java | * release the TGQ resource when the corresponding task is finished.
*
* @param taskId task id
* @return the result code and msg
*/
public void changeTaskGroupQueueStatus(int taskId, TaskGroupQueueStatus status) {
TaskGroupQueue taskGroupQueue = taskGroupQueueMapper.queryByTaskId(taskId);
taskGroupQueue.setStatus(status);
taskGroupQueue.setUpdateTime(new Date(System.currentTimeMillis()));
taskGroupQueueMapper.updateById(taskGroupQueue);
}
/**
* insert into task group queue
*
* @param taskId task id
* @param taskName task name
* @param groupId group id
* @param processId process id
* @param priority priority
* @return result and msg code
*/
public TaskGroupQueue insertIntoTaskGroupQueue(Integer taskId,
String taskName, Integer groupId,
Integer processId, Integer priority, TaskGroupQueueStatus status) {
TaskGroupQueue taskGroupQueue = new TaskGroupQueue(taskId, taskName, groupId, processId, priority, status);
taskGroupQueue.setCreateTime(new Date());
taskGroupQueue.setUpdateTime(new Date());
taskGroupQueueMapper.insert(taskGroupQueue);
return taskGroupQueue;
} |
closed | apache/dolphinscheduler | https://github.com/apache/dolphinscheduler | 7,753 | [Bug] [Master] Failed to pass global parameters between parent and 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
When the parent process has global parameters, but the sub process does not have global parameters, a null pointer error will be triggered
`[ERROR] 2021-12-31 14:06:44.898 org.apache.dolphinscheduler.server.master.runner.MasterSchedulerService:[215] - scan command error
java.lang.UnsupportedOperationException: null
at java.util.AbstractList.add(AbstractList.java:148)
at java.util.AbstractList.add(AbstractList.java:108)
at org.apache.dolphinscheduler.service.process.ProcessService.joinGlobalParams(ProcessService.java:1025)
at org.apache.dolphinscheduler.service.process.ProcessService.setSubProcessParam(ProcessService.java:992)
at org.apache.dolphinscheduler.service.process.ProcessService.handleCommand(ProcessService.java:226)
at org.apache.dolphinscheduler.service.process.ProcessService$$FastClassBySpringCGLIB$$ed138739.invoke(<generated>)
`
### What you expected to happen
Global parameters are passed normally
### How to reproduce
Configure two processes, where the sub process has no global parameters, and the parent process has global parameters
### Anything else
_No response_
### Version
2.0.0
### Are you willing to submit PR?
- [ ] Yes I am willing to submit a PR!
### Code of Conduct
- [X] I agree to follow this project's [Code of Conduct](https://www.apache.org/foundation/policies/conduct)
| https://github.com/apache/dolphinscheduler/issues/7753 | https://github.com/apache/dolphinscheduler/pull/7755 | 4203304b08847d57218f9e9cb4edf7447f6eab8b | fa906e7d01ac5e4222bc068bd1e908297cfd7b57 | 2021-12-31T06:47:13Z | java | 2022-01-01T07:23:50Z | dolphinscheduler-service/src/main/java/org/apache/dolphinscheduler/service/process/ProcessService.java | public int updateTaskGroupQueueStatus(Integer taskId, int status) {
return taskGroupQueueMapper.updateStatusByTaskId(taskId, status);
}
public int updateTaskGroupQueue(TaskGroupQueue taskGroupQueue) {
return taskGroupQueueMapper.updateById(taskGroupQueue);
}
public TaskGroupQueue loadTaskGroupQueue(int taskId) {
return this.taskGroupQueueMapper.queryByTaskId(taskId);
}
public void sendStartTask2Master(ProcessInstance processInstance,int taskId,
org.apache.dolphinscheduler.remote.command.CommandType taskType) {
String host = processInstance.getHost();
String address = host.split(":")[0];
int port = Integer.parseInt(host.split(":")[1]);
TaskEventChangeCommand taskEventChangeCommand = new TaskEventChangeCommand(
processInstance.getId(), taskId
);
stateEventCallbackService.sendResult(address, port, taskEventChangeCommand.convert2Command(taskType));
}
public ProcessInstance loadNextProcess4Serial(long code, int state) {
return this.processInstanceMapper.loadNextProcess4Serial(code, state);
}
private void deleteCommandWithCheck(int commandId) {
int delete = this.commandMapper.deleteById(commandId);
if (delete != 1) {
throw new ServiceException("delete command fail, id:" + commandId);
}
}
} |
closed | apache/dolphinscheduler | https://github.com/apache/dolphinscheduler | 7,767 | Delete the log of ‘workflow instance’ The log of ‘task instance’ is not deleted in cascade | ### 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
删除 ‘工作流实例’的日志 ‘任务实例’的日志没有级联删除
### What you expected to happen
删除 ‘工作流实例’的日志 ‘任务实例’的日志级联删除
### How to reproduce
手工删除过 t_ds_task_instance 、t_ds_process_instance、t_ds_relation_process_instance
### Anything else
_No response_
### Version
2.0.1
### Are you willing to submit PR?
- [ ] Yes I am willing to submit a PR!
### Code of Conduct
- [ ] I agree to follow this project's [Code of Conduct](https://www.apache.org/foundation/policies/conduct)
| https://github.com/apache/dolphinscheduler/issues/7767 | https://github.com/apache/dolphinscheduler/pull/7768 | 4d16c24b6e78887927a9550a90b25bceb9b5c0b1 | 7395b980d3d76646dada5b7e9220d946b154001e | 2022-01-01T07:10:16Z | java | 2022-01-03T07:52:50Z | dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/impl/ProcessInstanceServiceImpl.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. |
closed | apache/dolphinscheduler | https://github.com/apache/dolphinscheduler | 7,767 | Delete the log of ‘workflow instance’ The log of ‘task instance’ is not deleted in cascade | ### 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
删除 ‘工作流实例’的日志 ‘任务实例’的日志没有级联删除
### What you expected to happen
删除 ‘工作流实例’的日志 ‘任务实例’的日志级联删除
### How to reproduce
手工删除过 t_ds_task_instance 、t_ds_process_instance、t_ds_relation_process_instance
### Anything else
_No response_
### Version
2.0.1
### Are you willing to submit PR?
- [ ] Yes I am willing to submit a PR!
### Code of Conduct
- [ ] I agree to follow this project's [Code of Conduct](https://www.apache.org/foundation/policies/conduct)
| https://github.com/apache/dolphinscheduler/issues/7767 | https://github.com/apache/dolphinscheduler/pull/7768 | 4d16c24b6e78887927a9550a90b25bceb9b5c0b1 | 7395b980d3d76646dada5b7e9220d946b154001e | 2022-01-01T07:10:16Z | java | 2022-01-03T07:52:50Z | dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/impl/ProcessInstanceServiceImpl.java | * 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.api.service.impl;
import static org.apache.dolphinscheduler.common.Constants.DATA_LIST;
import static org.apache.dolphinscheduler.common.Constants.DEPENDENT_SPLIT;
import static org.apache.dolphinscheduler.common.Constants.GLOBAL_PARAMS;
import static org.apache.dolphinscheduler.common.Constants.LOCAL_PARAMS;
import static org.apache.dolphinscheduler.common.Constants.PROCESS_INSTANCE_STATE;
import static org.apache.dolphinscheduler.common.Constants.TASK_LIST;
import org.apache.dolphinscheduler.api.dto.gantt.GanttDto;
import org.apache.dolphinscheduler.api.dto.gantt.Task;
import org.apache.dolphinscheduler.api.enums.Status;
import org.apache.dolphinscheduler.api.exceptions.ServiceException;
import org.apache.dolphinscheduler.api.service.ExecutorService;
import org.apache.dolphinscheduler.api.service.LoggerService;
import org.apache.dolphinscheduler.api.service.ProcessDefinitionService;
import org.apache.dolphinscheduler.api.service.ProcessInstanceService;
import org.apache.dolphinscheduler.api.service.ProjectService;
import org.apache.dolphinscheduler.api.service.UsersService;
import org.apache.dolphinscheduler.api.utils.CheckUtils; |
closed | apache/dolphinscheduler | https://github.com/apache/dolphinscheduler | 7,767 | Delete the log of ‘workflow instance’ The log of ‘task instance’ is not deleted in cascade | ### 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
删除 ‘工作流实例’的日志 ‘任务实例’的日志没有级联删除
### What you expected to happen
删除 ‘工作流实例’的日志 ‘任务实例’的日志级联删除
### How to reproduce
手工删除过 t_ds_task_instance 、t_ds_process_instance、t_ds_relation_process_instance
### Anything else
_No response_
### Version
2.0.1
### Are you willing to submit PR?
- [ ] Yes I am willing to submit a PR!
### Code of Conduct
- [ ] I agree to follow this project's [Code of Conduct](https://www.apache.org/foundation/policies/conduct)
| https://github.com/apache/dolphinscheduler/issues/7767 | https://github.com/apache/dolphinscheduler/pull/7768 | 4d16c24b6e78887927a9550a90b25bceb9b5c0b1 | 7395b980d3d76646dada5b7e9220d946b154001e | 2022-01-01T07:10:16Z | java | 2022-01-03T07:52:50Z | dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/impl/ProcessInstanceServiceImpl.java | import org.apache.dolphinscheduler.api.utils.PageInfo;
import org.apache.dolphinscheduler.api.utils.Result;
import org.apache.dolphinscheduler.common.Constants;
import org.apache.dolphinscheduler.common.enums.DependResult;
import org.apache.dolphinscheduler.common.enums.ExecutionStatus;
import org.apache.dolphinscheduler.common.enums.Flag;
import org.apache.dolphinscheduler.common.enums.TaskType;
import org.apache.dolphinscheduler.common.graph.DAG;
import org.apache.dolphinscheduler.common.model.TaskNode;
import org.apache.dolphinscheduler.common.model.TaskNodeRelation;
import org.apache.dolphinscheduler.common.process.Property;
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.placeholder.BusinessTimeUtils;
import org.apache.dolphinscheduler.dao.entity.ProcessDefinition;
import org.apache.dolphinscheduler.dao.entity.ProcessInstance;
import org.apache.dolphinscheduler.dao.entity.ProcessTaskRelationLog;
import org.apache.dolphinscheduler.dao.entity.Project;
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.User;
import org.apache.dolphinscheduler.dao.mapper.ProcessDefinitionLogMapper;
import org.apache.dolphinscheduler.dao.mapper.ProcessDefinitionMapper;
import org.apache.dolphinscheduler.dao.mapper.ProcessInstanceMapper;
import org.apache.dolphinscheduler.dao.mapper.ProjectMapper;
import org.apache.dolphinscheduler.dao.mapper.TaskDefinitionLogMapper;
import org.apache.dolphinscheduler.dao.mapper.TaskDefinitionMapper; |
closed | apache/dolphinscheduler | https://github.com/apache/dolphinscheduler | 7,767 | Delete the log of ‘workflow instance’ The log of ‘task instance’ is not deleted in cascade | ### 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
删除 ‘工作流实例’的日志 ‘任务实例’的日志没有级联删除
### What you expected to happen
删除 ‘工作流实例’的日志 ‘任务实例’的日志级联删除
### How to reproduce
手工删除过 t_ds_task_instance 、t_ds_process_instance、t_ds_relation_process_instance
### Anything else
_No response_
### Version
2.0.1
### Are you willing to submit PR?
- [ ] Yes I am willing to submit a PR!
### Code of Conduct
- [ ] I agree to follow this project's [Code of Conduct](https://www.apache.org/foundation/policies/conduct)
| https://github.com/apache/dolphinscheduler/issues/7767 | https://github.com/apache/dolphinscheduler/pull/7768 | 4d16c24b6e78887927a9550a90b25bceb9b5c0b1 | 7395b980d3d76646dada5b7e9220d946b154001e | 2022-01-01T07:10:16Z | java | 2022-01-03T07:52:50Z | dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/impl/ProcessInstanceServiceImpl.java | import org.apache.dolphinscheduler.dao.mapper.TaskInstanceMapper;
import org.apache.dolphinscheduler.dao.mapper.TenantMapper;
import org.apache.dolphinscheduler.service.process.ProcessService;
import org.apache.commons.collections.CollectionUtils;
import org.apache.commons.lang.StringUtils;
import java.io.BufferedReader;
import java.io.ByteArrayInputStream;
import java.io.IOException;
import java.io.InputStreamReader;
import java.nio.charset.StandardCharsets;
import java.util.ArrayList;
import java.util.Collections;
import java.util.Date;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.Objects;
import java.util.function.Function;
import java.util.stream.Collectors;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
/**
* process instance service impl
*/
@Service
public class ProcessInstanceServiceImpl extends BaseServiceImpl implements ProcessInstanceService {
public static final String TASK_TYPE = "taskType"; |
closed | apache/dolphinscheduler | https://github.com/apache/dolphinscheduler | 7,767 | Delete the log of ‘workflow instance’ The log of ‘task instance’ is not deleted in cascade | ### 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
删除 ‘工作流实例’的日志 ‘任务实例’的日志没有级联删除
### What you expected to happen
删除 ‘工作流实例’的日志 ‘任务实例’的日志级联删除
### How to reproduce
手工删除过 t_ds_task_instance 、t_ds_process_instance、t_ds_relation_process_instance
### Anything else
_No response_
### Version
2.0.1
### Are you willing to submit PR?
- [ ] Yes I am willing to submit a PR!
### Code of Conduct
- [ ] I agree to follow this project's [Code of Conduct](https://www.apache.org/foundation/policies/conduct)
| https://github.com/apache/dolphinscheduler/issues/7767 | https://github.com/apache/dolphinscheduler/pull/7768 | 4d16c24b6e78887927a9550a90b25bceb9b5c0b1 | 7395b980d3d76646dada5b7e9220d946b154001e | 2022-01-01T07:10:16Z | java | 2022-01-03T07:52:50Z | dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/impl/ProcessInstanceServiceImpl.java | public static final String LOCAL_PARAMS_LIST = "localParamsList";
@Autowired
ProjectMapper projectMapper;
@Autowired
ProjectService projectService;
@Autowired
ProcessService processService;
@Autowired
ProcessInstanceMapper processInstanceMapper;
@Autowired
ProcessDefinitionMapper processDefineMapper;
@Autowired
ProcessDefinitionService processDefinitionService;
@Autowired
ExecutorService execService;
@Autowired
TaskInstanceMapper taskInstanceMapper;
@Autowired
LoggerService loggerService;
@Autowired
ProcessDefinitionLogMapper processDefinitionLogMapper;
@Autowired
TaskDefinitionLogMapper taskDefinitionLogMapper;
@Autowired
UsersService usersService;
@Autowired
private TenantMapper tenantMapper;
@Autowired
TaskDefinitionMapper taskDefinitionMapper;
/** |
closed | apache/dolphinscheduler | https://github.com/apache/dolphinscheduler | 7,767 | Delete the log of ‘workflow instance’ The log of ‘task instance’ is not deleted in cascade | ### 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
删除 ‘工作流实例’的日志 ‘任务实例’的日志没有级联删除
### What you expected to happen
删除 ‘工作流实例’的日志 ‘任务实例’的日志级联删除
### How to reproduce
手工删除过 t_ds_task_instance 、t_ds_process_instance、t_ds_relation_process_instance
### Anything else
_No response_
### Version
2.0.1
### Are you willing to submit PR?
- [ ] Yes I am willing to submit a PR!
### Code of Conduct
- [ ] I agree to follow this project's [Code of Conduct](https://www.apache.org/foundation/policies/conduct)
| https://github.com/apache/dolphinscheduler/issues/7767 | https://github.com/apache/dolphinscheduler/pull/7768 | 4d16c24b6e78887927a9550a90b25bceb9b5c0b1 | 7395b980d3d76646dada5b7e9220d946b154001e | 2022-01-01T07:10:16Z | java | 2022-01-03T07:52:50Z | dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/impl/ProcessInstanceServiceImpl.java | * return top n SUCCESS process instance order by running time which started between startTime and endTime
*/
@Override
public Map<String, Object> queryTopNLongestRunningProcessInstance(User loginUser, long projectCode, int size, String startTime, String endTime) {
Project project = projectMapper.queryByCode(projectCode);
Map<String, Object> result = projectService.checkProjectAndAuth(loginUser, project, projectCode);
if (result.get(Constants.STATUS) != Status.SUCCESS) {
return result;
}
if (0 > size) {
putMsg(result, Status.NEGTIVE_SIZE_NUMBER_ERROR, size);
return result;
}
if (Objects.isNull(startTime)) {
putMsg(result, Status.DATA_IS_NULL, Constants.START_TIME);
return result;
}
Date start = DateUtils.stringToDate(startTime);
if (Objects.isNull(endTime)) {
putMsg(result, Status.DATA_IS_NULL, Constants.END_TIME);
return result;
}
Date end = DateUtils.stringToDate(endTime);
if (start == null || end == null) {
putMsg(result, Status.REQUEST_PARAMS_NOT_VALID_ERROR, Constants.START_END_DATE);
return result;
}
if (start.getTime() > end.getTime()) {
putMsg(result, Status.START_TIME_BIGGER_THAN_END_TIME_ERROR, startTime, endTime); |
closed | apache/dolphinscheduler | https://github.com/apache/dolphinscheduler | 7,767 | Delete the log of ‘workflow instance’ The log of ‘task instance’ is not deleted in cascade | ### 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
删除 ‘工作流实例’的日志 ‘任务实例’的日志没有级联删除
### What you expected to happen
删除 ‘工作流实例’的日志 ‘任务实例’的日志级联删除
### How to reproduce
手工删除过 t_ds_task_instance 、t_ds_process_instance、t_ds_relation_process_instance
### Anything else
_No response_
### Version
2.0.1
### Are you willing to submit PR?
- [ ] Yes I am willing to submit a PR!
### Code of Conduct
- [ ] I agree to follow this project's [Code of Conduct](https://www.apache.org/foundation/policies/conduct)
| https://github.com/apache/dolphinscheduler/issues/7767 | https://github.com/apache/dolphinscheduler/pull/7768 | 4d16c24b6e78887927a9550a90b25bceb9b5c0b1 | 7395b980d3d76646dada5b7e9220d946b154001e | 2022-01-01T07:10:16Z | java | 2022-01-03T07:52:50Z | dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/impl/ProcessInstanceServiceImpl.java | return result;
}
List<ProcessInstance> processInstances = processInstanceMapper.queryTopNProcessInstance(size, start, end, ExecutionStatus.SUCCESS, projectCode);
result.put(DATA_LIST, processInstances);
putMsg(result, Status.SUCCESS);
return result;
}
/**
* query process instance by id
*
* @param loginUser login user
* @param projectCode project code
* @param processId process instance id
* @return process instance detail
*/
@Override
public Map<String, Object> queryProcessInstanceById(User loginUser, long projectCode, Integer processId) {
Project project = projectMapper.queryByCode(projectCode);
Map<String, Object> result = projectService.checkProjectAndAuth(loginUser, project, projectCode);
if (result.get(Constants.STATUS) != Status.SUCCESS) {
return result;
}
ProcessInstance processInstance = processService.findProcessInstanceDetailById(processId);
ProcessDefinition processDefinition = processService.findProcessDefinition(processInstance.getProcessDefinitionCode(),
processInstance.getProcessDefinitionVersion());
if (processDefinition == null || projectCode != processDefinition.getProjectCode()) {
putMsg(result, Status.PROCESS_DEFINE_NOT_EXIST, processId);
} else {
processInstance.setWarningGroupId(processDefinition.getWarningGroupId()); |
closed | apache/dolphinscheduler | https://github.com/apache/dolphinscheduler | 7,767 | Delete the log of ‘workflow instance’ The log of ‘task instance’ is not deleted in cascade | ### 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
删除 ‘工作流实例’的日志 ‘任务实例’的日志没有级联删除
### What you expected to happen
删除 ‘工作流实例’的日志 ‘任务实例’的日志级联删除
### How to reproduce
手工删除过 t_ds_task_instance 、t_ds_process_instance、t_ds_relation_process_instance
### Anything else
_No response_
### Version
2.0.1
### Are you willing to submit PR?
- [ ] Yes I am willing to submit a PR!
### Code of Conduct
- [ ] I agree to follow this project's [Code of Conduct](https://www.apache.org/foundation/policies/conduct)
| https://github.com/apache/dolphinscheduler/issues/7767 | https://github.com/apache/dolphinscheduler/pull/7768 | 4d16c24b6e78887927a9550a90b25bceb9b5c0b1 | 7395b980d3d76646dada5b7e9220d946b154001e | 2022-01-01T07:10:16Z | java | 2022-01-03T07:52:50Z | dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/impl/ProcessInstanceServiceImpl.java | processInstance.setLocations(processDefinition.getLocations());
processInstance.setDagData(processService.genDagData(processDefinition));
result.put(DATA_LIST, processInstance);
putMsg(result, Status.SUCCESS);
}
return result;
}
/**
* paging query process instance list, filtering according to project, process definition, time range, keyword, process status
*
* @param loginUser login user
* @param projectCode project code
* @param processDefineCode process definition code
* @param pageNo page number
* @param pageSize page size
* @param searchVal search value
* @param stateType state type
* @param host host
* @param startDate start time
* @param endDate end time
* @return process instance list
*/
@Override
public Result queryProcessInstanceList(User loginUser, long projectCode, long processDefineCode, String startDate, String endDate, String searchVal, String executorName,
ExecutionStatus stateType, String host, Integer pageNo, Integer pageSize) {
Result result = new Result();
Project project = projectMapper.queryByCode(projectCode);
Map<String, Object> checkResult = projectService.checkProjectAndAuth(loginUser, project, projectCode);
Status resultEnum = (Status) checkResult.get(Constants.STATUS); |
closed | apache/dolphinscheduler | https://github.com/apache/dolphinscheduler | 7,767 | Delete the log of ‘workflow instance’ The log of ‘task instance’ is not deleted in cascade | ### 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
删除 ‘工作流实例’的日志 ‘任务实例’的日志没有级联删除
### What you expected to happen
删除 ‘工作流实例’的日志 ‘任务实例’的日志级联删除
### How to reproduce
手工删除过 t_ds_task_instance 、t_ds_process_instance、t_ds_relation_process_instance
### Anything else
_No response_
### Version
2.0.1
### Are you willing to submit PR?
- [ ] Yes I am willing to submit a PR!
### Code of Conduct
- [ ] I agree to follow this project's [Code of Conduct](https://www.apache.org/foundation/policies/conduct)
| https://github.com/apache/dolphinscheduler/issues/7767 | https://github.com/apache/dolphinscheduler/pull/7768 | 4d16c24b6e78887927a9550a90b25bceb9b5c0b1 | 7395b980d3d76646dada5b7e9220d946b154001e | 2022-01-01T07:10:16Z | java | 2022-01-03T07:52:50Z | dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/impl/ProcessInstanceServiceImpl.java | if (resultEnum != Status.SUCCESS) {
putMsg(result,resultEnum);
return result;
}
int[] statusArray = null;
if (stateType != null) {
statusArray = new int[]{stateType.ordinal()};
}
Map<String, Object> checkAndParseDateResult = checkAndParseDateParameters(startDate, endDate);
resultEnum = (Status) checkAndParseDateResult.get(Constants.STATUS);
if (resultEnum != Status.SUCCESS) {
putMsg(result,resultEnum);
return result;
}
Date start = (Date) checkAndParseDateResult.get(Constants.START_TIME);
Date end = (Date) checkAndParseDateResult.get(Constants.END_TIME);
Page<ProcessInstance> page = new Page<>(pageNo, pageSize);
PageInfo<ProcessInstance> pageInfo = new PageInfo<>(pageNo, pageSize);
int executorId = usersService.getUserIdByName(executorName);
IPage<ProcessInstance> processInstanceList = processInstanceMapper.queryProcessInstanceListPaging(page,
project.getCode(), processDefineCode, searchVal, executorId, statusArray, host, start, end);
List<ProcessInstance> processInstances = processInstanceList.getRecords();
List<Integer> userIds = Collections.emptyList();
if (CollectionUtils.isNotEmpty(processInstances)) {
userIds = processInstances.stream().map(ProcessInstance::getExecutorId).collect(Collectors.toList());
}
List<User> users = usersService.queryUser(userIds);
Map<Integer, User> idToUserMap = Collections.emptyMap();
if (CollectionUtils.isNotEmpty(users)) { |
closed | apache/dolphinscheduler | https://github.com/apache/dolphinscheduler | 7,767 | Delete the log of ‘workflow instance’ The log of ‘task instance’ is not deleted in cascade | ### 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
删除 ‘工作流实例’的日志 ‘任务实例’的日志没有级联删除
### What you expected to happen
删除 ‘工作流实例’的日志 ‘任务实例’的日志级联删除
### How to reproduce
手工删除过 t_ds_task_instance 、t_ds_process_instance、t_ds_relation_process_instance
### Anything else
_No response_
### Version
2.0.1
### Are you willing to submit PR?
- [ ] Yes I am willing to submit a PR!
### Code of Conduct
- [ ] I agree to follow this project's [Code of Conduct](https://www.apache.org/foundation/policies/conduct)
| https://github.com/apache/dolphinscheduler/issues/7767 | https://github.com/apache/dolphinscheduler/pull/7768 | 4d16c24b6e78887927a9550a90b25bceb9b5c0b1 | 7395b980d3d76646dada5b7e9220d946b154001e | 2022-01-01T07:10:16Z | java | 2022-01-03T07:52:50Z | dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/impl/ProcessInstanceServiceImpl.java | idToUserMap = users.stream().collect(Collectors.toMap(User::getId, Function.identity()));
}
for (ProcessInstance processInstance : processInstances) {
processInstance.setDuration(DateUtils.format2Duration(processInstance.getStartTime(), processInstance.getEndTime()));
User executor = idToUserMap.get(processInstance.getExecutorId());
if (null != executor) {
processInstance.setExecutorName(executor.getUserName());
}
}
pageInfo.setTotal((int) processInstanceList.getTotal());
pageInfo.setTotalList(processInstances);
result.setData(pageInfo);
putMsg(result, Status.SUCCESS);
return result;
}
/**
* query task list by process instance id
*
* @param loginUser login user
* @param projectCode project code
* @param processId process instance id
* @return task list for the process instance
* @throws IOException io exception
*/
@Override
public Map<String, Object> queryTaskListByProcessId(User loginUser, long projectCode, Integer processId) throws IOException {
Project project = projectMapper.queryByCode(projectCode);
Map<String, Object> result = projectService.checkProjectAndAuth(loginUser, project, projectCode);
if (result.get(Constants.STATUS) != Status.SUCCESS) { |
closed | apache/dolphinscheduler | https://github.com/apache/dolphinscheduler | 7,767 | Delete the log of ‘workflow instance’ The log of ‘task instance’ is not deleted in cascade | ### 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
删除 ‘工作流实例’的日志 ‘任务实例’的日志没有级联删除
### What you expected to happen
删除 ‘工作流实例’的日志 ‘任务实例’的日志级联删除
### How to reproduce
手工删除过 t_ds_task_instance 、t_ds_process_instance、t_ds_relation_process_instance
### Anything else
_No response_
### Version
2.0.1
### Are you willing to submit PR?
- [ ] Yes I am willing to submit a PR!
### Code of Conduct
- [ ] I agree to follow this project's [Code of Conduct](https://www.apache.org/foundation/policies/conduct)
| https://github.com/apache/dolphinscheduler/issues/7767 | https://github.com/apache/dolphinscheduler/pull/7768 | 4d16c24b6e78887927a9550a90b25bceb9b5c0b1 | 7395b980d3d76646dada5b7e9220d946b154001e | 2022-01-01T07:10:16Z | java | 2022-01-03T07:52:50Z | dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/impl/ProcessInstanceServiceImpl.java | return result;
}
ProcessInstance processInstance = processService.findProcessInstanceDetailById(processId);
ProcessDefinition processDefinition = processDefineMapper.queryByCode(processInstance.getProcessDefinitionCode());
if (processDefinition != null && projectCode != processDefinition.getProjectCode()) {
putMsg(result, Status.PROCESS_INSTANCE_NOT_EXIST, processId);
return result;
}
List<TaskInstance> taskInstanceList = processService.findValidTaskListByProcessId(processId);
addDependResultForTaskList(taskInstanceList);
Map<String, Object> resultMap = new HashMap<>();
resultMap.put(PROCESS_INSTANCE_STATE, processInstance.getState().toString());
resultMap.put(TASK_LIST, taskInstanceList);
result.put(DATA_LIST, resultMap);
putMsg(result, Status.SUCCESS);
return result;
}
/**
* add dependent result for dependent task
*/
private void addDependResultForTaskList(List<TaskInstance> taskInstanceList) throws IOException {
for (TaskInstance taskInstance : taskInstanceList) {
if (TaskType.DEPENDENT.getDesc().equalsIgnoreCase(taskInstance.getTaskType())) {
Result<String> logResult = loggerService.queryLog(
taskInstance.getId(), Constants.LOG_QUERY_SKIP_LINE_NUMBER, Constants.LOG_QUERY_LIMIT);
if (logResult.getCode() == Status.SUCCESS.ordinal()) {
String log = logResult.getData();
Map<String, DependResult> resultMap = parseLogForDependentResult(log);
taskInstance.setDependentResult(JSONUtils.toJsonString(resultMap));
} |
closed | apache/dolphinscheduler | https://github.com/apache/dolphinscheduler | 7,767 | Delete the log of ‘workflow instance’ The log of ‘task instance’ is not deleted in cascade | ### 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
删除 ‘工作流实例’的日志 ‘任务实例’的日志没有级联删除
### What you expected to happen
删除 ‘工作流实例’的日志 ‘任务实例’的日志级联删除
### How to reproduce
手工删除过 t_ds_task_instance 、t_ds_process_instance、t_ds_relation_process_instance
### Anything else
_No response_
### Version
2.0.1
### Are you willing to submit PR?
- [ ] Yes I am willing to submit a PR!
### Code of Conduct
- [ ] I agree to follow this project's [Code of Conduct](https://www.apache.org/foundation/policies/conduct)
| https://github.com/apache/dolphinscheduler/issues/7767 | https://github.com/apache/dolphinscheduler/pull/7768 | 4d16c24b6e78887927a9550a90b25bceb9b5c0b1 | 7395b980d3d76646dada5b7e9220d946b154001e | 2022-01-01T07:10:16Z | java | 2022-01-03T07:52:50Z | dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/impl/ProcessInstanceServiceImpl.java | }
}
}
@Override
public Map<String, DependResult> parseLogForDependentResult(String log) throws IOException {
Map<String, DependResult> resultMap = new HashMap<>();
if (StringUtils.isEmpty(log)) {
return resultMap;
}
BufferedReader br = new BufferedReader(new InputStreamReader(new ByteArrayInputStream(log.getBytes(
StandardCharsets.UTF_8)), StandardCharsets.UTF_8));
String line;
while ((line = br.readLine()) != null) {
if (line.contains(DEPENDENT_SPLIT)) {
String[] tmpStringArray = line.split(":\\|\\|");
if (tmpStringArray.length != 2) {
continue;
}
String dependResultString = tmpStringArray[1];
String[] dependStringArray = dependResultString.split(",");
if (dependStringArray.length != 2) {
continue;
}
String key = dependStringArray[0].trim();
DependResult dependResult = DependResult.valueOf(dependStringArray[1].trim());
resultMap.put(key, dependResult);
}
}
return resultMap;
} |
closed | apache/dolphinscheduler | https://github.com/apache/dolphinscheduler | 7,767 | Delete the log of ‘workflow instance’ The log of ‘task instance’ is not deleted in cascade | ### 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
删除 ‘工作流实例’的日志 ‘任务实例’的日志没有级联删除
### What you expected to happen
删除 ‘工作流实例’的日志 ‘任务实例’的日志级联删除
### How to reproduce
手工删除过 t_ds_task_instance 、t_ds_process_instance、t_ds_relation_process_instance
### Anything else
_No response_
### Version
2.0.1
### Are you willing to submit PR?
- [ ] Yes I am willing to submit a PR!
### Code of Conduct
- [ ] I agree to follow this project's [Code of Conduct](https://www.apache.org/foundation/policies/conduct)
| https://github.com/apache/dolphinscheduler/issues/7767 | https://github.com/apache/dolphinscheduler/pull/7768 | 4d16c24b6e78887927a9550a90b25bceb9b5c0b1 | 7395b980d3d76646dada5b7e9220d946b154001e | 2022-01-01T07:10:16Z | java | 2022-01-03T07:52:50Z | dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/impl/ProcessInstanceServiceImpl.java | /**
* query sub process instance detail info by task id
*
* @param loginUser login user
* @param projectCode project code
* @param taskId task id
* @return sub process instance detail
*/
@Override
public Map<String, Object> querySubProcessInstanceByTaskId(User loginUser, long projectCode, Integer taskId) {
Project project = projectMapper.queryByCode(projectCode);
Map<String, Object> result = projectService.checkProjectAndAuth(loginUser, project, projectCode);
if (result.get(Constants.STATUS) != Status.SUCCESS) {
return result;
}
TaskInstance taskInstance = processService.findTaskInstanceById(taskId);
if (taskInstance == null) {
putMsg(result, Status.TASK_INSTANCE_NOT_EXISTS, taskId);
return result;
}
TaskDefinition taskDefinition = taskDefinitionMapper.queryByCode(taskInstance.getTaskCode());
if (taskDefinition != null && projectCode != taskDefinition.getProjectCode()) {
putMsg(result, Status.TASK_INSTANCE_NOT_EXISTS, taskId);
return result;
}
if (!taskInstance.isSubProcess()) {
putMsg(result, Status.TASK_INSTANCE_NOT_SUB_WORKFLOW_INSTANCE, taskInstance.getName());
return result;
} |
closed | apache/dolphinscheduler | https://github.com/apache/dolphinscheduler | 7,767 | Delete the log of ‘workflow instance’ The log of ‘task instance’ is not deleted in cascade | ### 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
删除 ‘工作流实例’的日志 ‘任务实例’的日志没有级联删除
### What you expected to happen
删除 ‘工作流实例’的日志 ‘任务实例’的日志级联删除
### How to reproduce
手工删除过 t_ds_task_instance 、t_ds_process_instance、t_ds_relation_process_instance
### Anything else
_No response_
### Version
2.0.1
### Are you willing to submit PR?
- [ ] Yes I am willing to submit a PR!
### Code of Conduct
- [ ] I agree to follow this project's [Code of Conduct](https://www.apache.org/foundation/policies/conduct)
| https://github.com/apache/dolphinscheduler/issues/7767 | https://github.com/apache/dolphinscheduler/pull/7768 | 4d16c24b6e78887927a9550a90b25bceb9b5c0b1 | 7395b980d3d76646dada5b7e9220d946b154001e | 2022-01-01T07:10:16Z | java | 2022-01-03T07:52:50Z | dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/impl/ProcessInstanceServiceImpl.java | ProcessInstance subWorkflowInstance = processService.findSubProcessInstance(
taskInstance.getProcessInstanceId(), taskInstance.getId());
if (subWorkflowInstance == null) {
putMsg(result, Status.SUB_PROCESS_INSTANCE_NOT_EXIST, taskId);
return result;
}
Map<String, Object> dataMap = new HashMap<>();
dataMap.put(Constants.SUBPROCESS_INSTANCE_ID, subWorkflowInstance.getId());
result.put(DATA_LIST, dataMap);
putMsg(result, Status.SUCCESS);
return result;
}
/**
* update process instance
*
* @param loginUser login user
* @param projectCode project code
* @param taskRelationJson process task relation json
* @param taskDefinitionJson taskDefinitionJson
* @param processInstanceId process instance id
* @param scheduleTime schedule time
* @param syncDefine sync define
* @param globalParams
* @param locations locations for nodes
* @param timeout timeout
* @param tenantCode tenantCode
* @return update result code
*/
@Transactional(rollbackFor = RuntimeException.class)
@Override |
closed | apache/dolphinscheduler | https://github.com/apache/dolphinscheduler | 7,767 | Delete the log of ‘workflow instance’ The log of ‘task instance’ is not deleted in cascade | ### 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
删除 ‘工作流实例’的日志 ‘任务实例’的日志没有级联删除
### What you expected to happen
删除 ‘工作流实例’的日志 ‘任务实例’的日志级联删除
### How to reproduce
手工删除过 t_ds_task_instance 、t_ds_process_instance、t_ds_relation_process_instance
### Anything else
_No response_
### Version
2.0.1
### Are you willing to submit PR?
- [ ] Yes I am willing to submit a PR!
### Code of Conduct
- [ ] I agree to follow this project's [Code of Conduct](https://www.apache.org/foundation/policies/conduct)
| https://github.com/apache/dolphinscheduler/issues/7767 | https://github.com/apache/dolphinscheduler/pull/7768 | 4d16c24b6e78887927a9550a90b25bceb9b5c0b1 | 7395b980d3d76646dada5b7e9220d946b154001e | 2022-01-01T07:10:16Z | java | 2022-01-03T07:52:50Z | dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/impl/ProcessInstanceServiceImpl.java | public Map<String, Object> updateProcessInstance(User loginUser, long projectCode, Integer processInstanceId, String taskRelationJson,
String taskDefinitionJson, String scheduleTime, Boolean syncDefine, String globalParams,
String locations, int timeout, String tenantCode) {
Project project = projectMapper.queryByCode(projectCode);
Map<String, Object> result = projectService.checkProjectAndAuth(loginUser, project, projectCode);
if (result.get(Constants.STATUS) != Status.SUCCESS) {
return result;
}
ProcessInstance processInstance = processService.findProcessInstanceDetailById(processInstanceId);
if (processInstance == null) {
putMsg(result, Status.PROCESS_INSTANCE_NOT_EXIST, processInstanceId);
return result;
}
ProcessDefinition processDefinition0 = processDefineMapper.queryByCode(processInstance.getProcessDefinitionCode());
if (processDefinition0 != null && projectCode != processDefinition0.getProjectCode()) {
putMsg(result, Status.PROCESS_INSTANCE_NOT_EXIST, processInstanceId);
return result;
}
if (!processInstance.getState().typeIsFinished()) {
putMsg(result, Status.PROCESS_INSTANCE_STATE_OPERATION_ERROR,
processInstance.getName(), processInstance.getState().toString(), "update");
return result;
}
setProcessInstance(processInstance, tenantCode, scheduleTime, globalParams, timeout);
if (Boolean.TRUE.equals(syncDefine)) {
List<TaskDefinitionLog> taskDefinitionLogs = JSONUtils.toList(taskDefinitionJson, TaskDefinitionLog.class); |
closed | apache/dolphinscheduler | https://github.com/apache/dolphinscheduler | 7,767 | Delete the log of ‘workflow instance’ The log of ‘task instance’ is not deleted in cascade | ### 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
删除 ‘工作流实例’的日志 ‘任务实例’的日志没有级联删除
### What you expected to happen
删除 ‘工作流实例’的日志 ‘任务实例’的日志级联删除
### How to reproduce
手工删除过 t_ds_task_instance 、t_ds_process_instance、t_ds_relation_process_instance
### Anything else
_No response_
### Version
2.0.1
### Are you willing to submit PR?
- [ ] Yes I am willing to submit a PR!
### Code of Conduct
- [ ] I agree to follow this project's [Code of Conduct](https://www.apache.org/foundation/policies/conduct)
| https://github.com/apache/dolphinscheduler/issues/7767 | https://github.com/apache/dolphinscheduler/pull/7768 | 4d16c24b6e78887927a9550a90b25bceb9b5c0b1 | 7395b980d3d76646dada5b7e9220d946b154001e | 2022-01-01T07:10:16Z | java | 2022-01-03T07:52:50Z | dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/impl/ProcessInstanceServiceImpl.java | if (taskDefinitionLogs.isEmpty()) {
putMsg(result, Status.DATA_IS_NOT_VALID, taskDefinitionJson);
return result;
}
for (TaskDefinitionLog taskDefinitionLog : taskDefinitionLogs) {
if (!CheckUtils.checkTaskDefinitionParameters(taskDefinitionLog)) {
putMsg(result, Status.PROCESS_NODE_S_PARAMETER_INVALID, taskDefinitionLog.getName());
return result;
}
}
int saveTaskResult = processService.saveTaskDefine(loginUser, projectCode, taskDefinitionLogs);
if (saveTaskResult == Constants.DEFINITION_FAILURE) {
putMsg(result, Status.UPDATE_TASK_DEFINITION_ERROR);
throw new ServiceException(Status.UPDATE_TASK_DEFINITION_ERROR);
}
ProcessDefinition processDefinition = processDefineMapper.queryByCode(processInstance.getProcessDefinitionCode());
List<ProcessTaskRelationLog> taskRelationList = JSONUtils.toList(taskRelationJson, ProcessTaskRelationLog.class);
result = processDefinitionService.checkProcessNodeList(taskRelationJson);
if (result.get(Constants.STATUS) != Status.SUCCESS) {
return result;
}
int tenantId = -1;
if (!Constants.DEFAULT.equals(tenantCode)) {
Tenant tenant = tenantMapper.queryByTenantCode(tenantCode);
if (tenant == null) {
putMsg(result, Status.TENANT_NOT_EXIST);
return result;
}
tenantId = tenant.getId(); |
closed | apache/dolphinscheduler | https://github.com/apache/dolphinscheduler | 7,767 | Delete the log of ‘workflow instance’ The log of ‘task instance’ is not deleted in cascade | ### 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
删除 ‘工作流实例’的日志 ‘任务实例’的日志没有级联删除
### What you expected to happen
删除 ‘工作流实例’的日志 ‘任务实例’的日志级联删除
### How to reproduce
手工删除过 t_ds_task_instance 、t_ds_process_instance、t_ds_relation_process_instance
### Anything else
_No response_
### Version
2.0.1
### Are you willing to submit PR?
- [ ] Yes I am willing to submit a PR!
### Code of Conduct
- [ ] I agree to follow this project's [Code of Conduct](https://www.apache.org/foundation/policies/conduct)
| https://github.com/apache/dolphinscheduler/issues/7767 | https://github.com/apache/dolphinscheduler/pull/7768 | 4d16c24b6e78887927a9550a90b25bceb9b5c0b1 | 7395b980d3d76646dada5b7e9220d946b154001e | 2022-01-01T07:10:16Z | java | 2022-01-03T07:52:50Z | dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/impl/ProcessInstanceServiceImpl.java | }
ProcessDefinition processDefinitionDeepCopy = JSONUtils.parseObject(JSONUtils.toJsonString(processDefinition), ProcessDefinition.class);
processDefinition.set(projectCode, processDefinition.getName(), processDefinition.getDescription(), globalParams, locations, timeout, tenantId);
processDefinition.setUpdateTime(new Date());
int insertVersion;
if (processDefinition.equals(processDefinitionDeepCopy)) {
insertVersion = processDefinitionDeepCopy.getVersion();
} else {
processDefinition.setUpdateTime(new Date());
insertVersion = processService.saveProcessDefine(loginUser, processDefinition, false);
}
if (insertVersion == 0) {
putMsg(result, Status.UPDATE_PROCESS_DEFINITION_ERROR);
throw new ServiceException(Status.UPDATE_PROCESS_DEFINITION_ERROR);
}
int insertResult = processService.saveTaskRelation(loginUser, processDefinition.getProjectCode(),
processDefinition.getCode(), insertVersion, taskRelationList, taskDefinitionLogs);
if (insertResult == Constants.EXIT_CODE_SUCCESS) {
putMsg(result, Status.SUCCESS);
result.put(Constants.DATA_LIST, processDefinition);
} else {
putMsg(result, Status.UPDATE_PROCESS_DEFINITION_ERROR);
throw new ServiceException(Status.UPDATE_PROCESS_DEFINITION_ERROR);
}
processInstance.setProcessDefinitionVersion(insertVersion);
}
int update = processService.updateProcessInstance(processInstance);
if (update == 0) {
putMsg(result, Status.UPDATE_PROCESS_INSTANCE_ERROR);
throw new ServiceException(Status.UPDATE_PROCESS_INSTANCE_ERROR); |
closed | apache/dolphinscheduler | https://github.com/apache/dolphinscheduler | 7,767 | Delete the log of ‘workflow instance’ The log of ‘task instance’ is not deleted in cascade | ### 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
删除 ‘工作流实例’的日志 ‘任务实例’的日志没有级联删除
### What you expected to happen
删除 ‘工作流实例’的日志 ‘任务实例’的日志级联删除
### How to reproduce
手工删除过 t_ds_task_instance 、t_ds_process_instance、t_ds_relation_process_instance
### Anything else
_No response_
### Version
2.0.1
### Are you willing to submit PR?
- [ ] Yes I am willing to submit a PR!
### Code of Conduct
- [ ] I agree to follow this project's [Code of Conduct](https://www.apache.org/foundation/policies/conduct)
| https://github.com/apache/dolphinscheduler/issues/7767 | https://github.com/apache/dolphinscheduler/pull/7768 | 4d16c24b6e78887927a9550a90b25bceb9b5c0b1 | 7395b980d3d76646dada5b7e9220d946b154001e | 2022-01-01T07:10:16Z | java | 2022-01-03T07:52:50Z | dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/impl/ProcessInstanceServiceImpl.java | }
putMsg(result, Status.SUCCESS);
return result;
}
/**
* update process instance attributes
*/
private void setProcessInstance(ProcessInstance processInstance, String tenantCode, String scheduleTime, String globalParams, int timeout) {
Date schedule = processInstance.getScheduleTime();
if (scheduleTime != null) {
schedule = DateUtils.getScheduleDate(scheduleTime);
}
processInstance.setScheduleTime(schedule);
List<Property> globalParamList = JSONUtils.toList(globalParams, Property.class);
Map<String, String> globalParamMap = globalParamList.stream().collect(Collectors.toMap(Property::getProp, Property::getValue));
globalParams = ParameterUtils.curingGlobalParams(globalParamMap, globalParamList, processInstance.getCmdTypeIfComplement(), schedule);
processInstance.setTimeout(timeout);
processInstance.setTenantCode(tenantCode);
processInstance.setGlobalParams(globalParams);
}
/**
* query parent process instance detail info by sub process instance id
*
* @param loginUser login user
* @param projectCode project code
* @param subId sub process id
* @return parent instance detail
*/
@Override
public Map<String, Object> queryParentInstanceBySubId(User loginUser, long projectCode, Integer subId) { |
closed | apache/dolphinscheduler | https://github.com/apache/dolphinscheduler | 7,767 | Delete the log of ‘workflow instance’ The log of ‘task instance’ is not deleted in cascade | ### 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
删除 ‘工作流实例’的日志 ‘任务实例’的日志没有级联删除
### What you expected to happen
删除 ‘工作流实例’的日志 ‘任务实例’的日志级联删除
### How to reproduce
手工删除过 t_ds_task_instance 、t_ds_process_instance、t_ds_relation_process_instance
### Anything else
_No response_
### Version
2.0.1
### Are you willing to submit PR?
- [ ] Yes I am willing to submit a PR!
### Code of Conduct
- [ ] I agree to follow this project's [Code of Conduct](https://www.apache.org/foundation/policies/conduct)
| https://github.com/apache/dolphinscheduler/issues/7767 | https://github.com/apache/dolphinscheduler/pull/7768 | 4d16c24b6e78887927a9550a90b25bceb9b5c0b1 | 7395b980d3d76646dada5b7e9220d946b154001e | 2022-01-01T07:10:16Z | java | 2022-01-03T07:52:50Z | dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/impl/ProcessInstanceServiceImpl.java | Project project = projectMapper.queryByCode(projectCode);
Map<String, Object> result = projectService.checkProjectAndAuth(loginUser, project, projectCode);
if (result.get(Constants.STATUS) != Status.SUCCESS) {
return result;
}
ProcessInstance subInstance = processService.findProcessInstanceDetailById(subId);
if (subInstance == null) {
putMsg(result, Status.PROCESS_INSTANCE_NOT_EXIST, subId);
return result;
}
if (subInstance.getIsSubProcess() == Flag.NO) {
putMsg(result, Status.PROCESS_INSTANCE_NOT_SUB_PROCESS_INSTANCE, subInstance.getName());
return result;
}
ProcessInstance parentWorkflowInstance = processService.findParentProcessInstance(subId);
if (parentWorkflowInstance == null) {
putMsg(result, Status.SUB_PROCESS_INSTANCE_NOT_EXIST);
return result;
}
Map<String, Object> dataMap = new HashMap<>();
dataMap.put(Constants.PARENT_WORKFLOW_INSTANCE, parentWorkflowInstance.getId());
result.put(DATA_LIST, dataMap);
putMsg(result, Status.SUCCESS);
return result;
}
/**
* delete process instance by id, at the same time，delete task instance and their mapping relation data
*
* @param loginUser login user |
closed | apache/dolphinscheduler | https://github.com/apache/dolphinscheduler | 7,767 | Delete the log of ‘workflow instance’ The log of ‘task instance’ is not deleted in cascade | ### 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
删除 ‘工作流实例’的日志 ‘任务实例’的日志没有级联删除
### What you expected to happen
删除 ‘工作流实例’的日志 ‘任务实例’的日志级联删除
### How to reproduce
手工删除过 t_ds_task_instance 、t_ds_process_instance、t_ds_relation_process_instance
### Anything else
_No response_
### Version
2.0.1
### Are you willing to submit PR?
- [ ] Yes I am willing to submit a PR!
### Code of Conduct
- [ ] I agree to follow this project's [Code of Conduct](https://www.apache.org/foundation/policies/conduct)
| https://github.com/apache/dolphinscheduler/issues/7767 | https://github.com/apache/dolphinscheduler/pull/7768 | 4d16c24b6e78887927a9550a90b25bceb9b5c0b1 | 7395b980d3d76646dada5b7e9220d946b154001e | 2022-01-01T07:10:16Z | java | 2022-01-03T07:52:50Z | dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/impl/ProcessInstanceServiceImpl.java | * @param projectCode project code
* @param processInstanceId process instance id
* @return delete result code
*/
@Override
@Transactional(rollbackFor = RuntimeException.class)
public Map<String, Object> deleteProcessInstanceById(User loginUser, long projectCode, Integer processInstanceId) {
Project project = projectMapper.queryByCode(projectCode);
Map<String, Object> result = projectService.checkProjectAndAuth(loginUser, project, projectCode);
if (result.get(Constants.STATUS) != Status.SUCCESS) {
return result;
}
ProcessInstance processInstance = processService.findProcessInstanceDetailById(processInstanceId);
if (null == processInstance) {
putMsg(result, Status.PROCESS_INSTANCE_NOT_EXIST, processInstanceId);
return result;
}
ProcessDefinition processDefinition = processDefineMapper.queryByCode(processInstance.getProcessDefinitionCode());
if (processDefinition != null && projectCode != processDefinition.getProjectCode()) {
putMsg(result, Status.PROCESS_INSTANCE_NOT_EXIST, processInstanceId);
return result;
}
try {
processService.removeTaskLogFile(processInstanceId);
} catch (Exception e) {
}
//
int delete = processService.deleteWorkProcessInstanceById(processInstanceId);
processService.deleteAllSubWorkProcessByParentId(processInstanceId); |
closed | apache/dolphinscheduler | https://github.com/apache/dolphinscheduler | 7,767 | Delete the log of ‘workflow instance’ The log of ‘task instance’ is not deleted in cascade | ### 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
删除 ‘工作流实例’的日志 ‘任务实例’的日志没有级联删除
### What you expected to happen
删除 ‘工作流实例’的日志 ‘任务实例’的日志级联删除
### How to reproduce
手工删除过 t_ds_task_instance 、t_ds_process_instance、t_ds_relation_process_instance
### Anything else
_No response_
### Version
2.0.1
### Are you willing to submit PR?
- [ ] Yes I am willing to submit a PR!
### Code of Conduct
- [ ] I agree to follow this project's [Code of Conduct](https://www.apache.org/foundation/policies/conduct)
| https://github.com/apache/dolphinscheduler/issues/7767 | https://github.com/apache/dolphinscheduler/pull/7768 | 4d16c24b6e78887927a9550a90b25bceb9b5c0b1 | 7395b980d3d76646dada5b7e9220d946b154001e | 2022-01-01T07:10:16Z | java | 2022-01-03T07:52:50Z | dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/impl/ProcessInstanceServiceImpl.java | processService.deleteWorkProcessMapByParentId(processInstanceId);
if (delete > 0) {
putMsg(result, Status.SUCCESS);
} else {
putMsg(result, Status.DELETE_PROCESS_INSTANCE_BY_ID_ERROR);
throw new ServiceException(Status.DELETE_PROCESS_INSTANCE_BY_ID_ERROR);
}
return result;
}
/**
* view process instance variables
*
* @param projectCode project code
* @param processInstanceId process instance id
* @return variables data
*/
@Override
public Map<String, Object> viewVariables(long projectCode, Integer processInstanceId) {
Map<String, Object> result = new HashMap<>();
ProcessInstance processInstance = processInstanceMapper.queryDetailById(processInstanceId);
if (processInstance == null) {
throw new RuntimeException("workflow instance is null");
}
ProcessDefinition processDefinition = processDefineMapper.queryByCode(processInstance.getProcessDefinitionCode());
if (processDefinition != null && projectCode != processDefinition.getProjectCode()) {
putMsg(result, Status.PROCESS_INSTANCE_NOT_EXIST, processInstanceId);
return result;
}
Map<String, String> timeParams = BusinessTimeUtils
.getBusinessTime(processInstance.getCmdTypeIfComplement(), |
closed | apache/dolphinscheduler | https://github.com/apache/dolphinscheduler | 7,767 | Delete the log of ‘workflow instance’ The log of ‘task instance’ is not deleted in cascade | ### 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
删除 ‘工作流实例’的日志 ‘任务实例’的日志没有级联删除
### What you expected to happen
删除 ‘工作流实例’的日志 ‘任务实例’的日志级联删除
### How to reproduce
手工删除过 t_ds_task_instance 、t_ds_process_instance、t_ds_relation_process_instance
### Anything else
_No response_
### Version
2.0.1
### Are you willing to submit PR?
- [ ] Yes I am willing to submit a PR!
### Code of Conduct
- [ ] I agree to follow this project's [Code of Conduct](https://www.apache.org/foundation/policies/conduct)
| https://github.com/apache/dolphinscheduler/issues/7767 | https://github.com/apache/dolphinscheduler/pull/7768 | 4d16c24b6e78887927a9550a90b25bceb9b5c0b1 | 7395b980d3d76646dada5b7e9220d946b154001e | 2022-01-01T07:10:16Z | java | 2022-01-03T07:52:50Z | dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/impl/ProcessInstanceServiceImpl.java | processInstance.getScheduleTime());
String userDefinedParams = processInstance.getGlobalParams();
//
List<Property> globalParams = new ArrayList<>();
//
String globalParamStr = ParameterUtils.convertParameterPlaceholders(JSONUtils.toJsonString(globalParams), timeParams);
globalParams = JSONUtils.toList(globalParamStr, Property.class);
for (Property property : globalParams) {
timeParams.put(property.getProp(), property.getValue());
}
if (userDefinedParams != null && userDefinedParams.length() > 0) {
globalParams = JSONUtils.toList(userDefinedParams, Property.class);
}
Map<String, Map<String, Object>> localUserDefParams = getLocalParams(processInstance, timeParams);
Map<String, Object> resultMap = new HashMap<>();
resultMap.put(GLOBAL_PARAMS, globalParams);
resultMap.put(LOCAL_PARAMS, localUserDefParams);
result.put(DATA_LIST, resultMap);
putMsg(result, Status.SUCCESS);
return result;
}
/**
* get local params
*/
private Map<String, Map<String, Object>> getLocalParams(ProcessInstance processInstance, Map<String, String> timeParams) {
Map<String, Map<String, Object>> localUserDefParams = new HashMap<>();
List<TaskInstance> taskInstanceList = taskInstanceMapper.findValidTaskListByProcessId(processInstance.getId(), Flag.YES);
for (TaskInstance taskInstance : taskInstanceList) {
TaskDefinitionLog taskDefinitionLog = taskDefinitionLogMapper.queryByDefinitionCodeAndVersion(
taskInstance.getTaskCode(), taskInstance.getTaskDefinitionVersion()); |
closed | apache/dolphinscheduler | https://github.com/apache/dolphinscheduler | 7,767 | Delete the log of ‘workflow instance’ The log of ‘task instance’ is not deleted in cascade | ### 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
删除 ‘工作流实例’的日志 ‘任务实例’的日志没有级联删除
### What you expected to happen
删除 ‘工作流实例’的日志 ‘任务实例’的日志级联删除
### How to reproduce
手工删除过 t_ds_task_instance 、t_ds_process_instance、t_ds_relation_process_instance
### Anything else
_No response_
### Version
2.0.1
### Are you willing to submit PR?
- [ ] Yes I am willing to submit a PR!
### Code of Conduct
- [ ] I agree to follow this project's [Code of Conduct](https://www.apache.org/foundation/policies/conduct)
| https://github.com/apache/dolphinscheduler/issues/7767 | https://github.com/apache/dolphinscheduler/pull/7768 | 4d16c24b6e78887927a9550a90b25bceb9b5c0b1 | 7395b980d3d76646dada5b7e9220d946b154001e | 2022-01-01T07:10:16Z | java | 2022-01-03T07:52:50Z | dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/impl/ProcessInstanceServiceImpl.java | String localParams = JSONUtils.getNodeString(taskDefinitionLog.getTaskParams(), LOCAL_PARAMS);
if (!StringUtils.isEmpty(localParams)) {
localParams = ParameterUtils.convertParameterPlaceholders(localParams, timeParams);
List<Property> localParamsList = JSONUtils.toList(localParams, Property.class);
Map<String, Object> localParamsMap = new HashMap<>();
localParamsMap.put(TASK_TYPE, taskDefinitionLog.getTaskType());
localParamsMap.put(LOCAL_PARAMS_LIST, localParamsList);
if (CollectionUtils.isNotEmpty(localParamsList)) {
localUserDefParams.put(taskDefinitionLog.getName(), localParamsMap);
}
}
}
return localUserDefParams;
}
/**
* encapsulation gantt structure
*
* @param projectCode project code
* @param processInstanceId process instance id
* @return gantt tree data
* @throws Exception exception when json parse
*/
@Override
public Map<String, Object> viewGantt(long projectCode, Integer processInstanceId) throws Exception {
Map<String, Object> result = new HashMap<>();
ProcessInstance processInstance = processInstanceMapper.queryDetailById(processInstanceId);
if (processInstance == null) {
throw new RuntimeException("workflow instance is null");
}
ProcessDefinition processDefinition = processDefinitionLogMapper.queryByDefinitionCodeAndVersion( |
closed | apache/dolphinscheduler | https://github.com/apache/dolphinscheduler | 7,767 | Delete the log of ‘workflow instance’ The log of ‘task instance’ is not deleted in cascade | ### 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
删除 ‘工作流实例’的日志 ‘任务实例’的日志没有级联删除
### What you expected to happen
删除 ‘工作流实例’的日志 ‘任务实例’的日志级联删除
### How to reproduce
手工删除过 t_ds_task_instance 、t_ds_process_instance、t_ds_relation_process_instance
### Anything else
_No response_
### Version
2.0.1
### Are you willing to submit PR?
- [ ] Yes I am willing to submit a PR!
### Code of Conduct
- [ ] I agree to follow this project's [Code of Conduct](https://www.apache.org/foundation/policies/conduct)
| https://github.com/apache/dolphinscheduler/issues/7767 | https://github.com/apache/dolphinscheduler/pull/7768 | 4d16c24b6e78887927a9550a90b25bceb9b5c0b1 | 7395b980d3d76646dada5b7e9220d946b154001e | 2022-01-01T07:10:16Z | java | 2022-01-03T07:52:50Z | dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/impl/ProcessInstanceServiceImpl.java | processInstance.getProcessDefinitionCode(),
processInstance.getProcessDefinitionVersion()
);
if (processDefinition != null && projectCode != processDefinition.getProjectCode()) {
putMsg(result, Status.PROCESS_INSTANCE_NOT_EXIST, processInstanceId);
return result;
}
GanttDto ganttDto = new GanttDto();
DAG<String, TaskNode, TaskNodeRelation> dag = processService.genDagGraph(processDefinition);
//
List<String> nodeList = dag.topologicalSort();
ganttDto.setTaskNames(nodeList);
List<Task> taskList = new ArrayList<>();
for (String node : nodeList) {
TaskInstance taskInstance = taskInstanceMapper.queryByInstanceIdAndCode(processInstanceId, Long.parseLong(node));
if (taskInstance == null) {
continue;
}
Date startTime = taskInstance.getStartTime() == null ? new Date() : taskInstance.getStartTime();
Date endTime = taskInstance.getEndTime() == null ? new Date() : taskInstance.getEndTime();
Task task = new Task();
task.setTaskName(taskInstance.getName());
task.getStartDate().add(startTime.getTime());
task.getEndDate().add(endTime.getTime());
task.setIsoStart(startTime);
task.setIsoEnd(endTime);
task.setStatus(taskInstance.getState().toString());
task.setExecutionDate(taskInstance.getStartTime());
task.setDuration(DateUtils.format2Readable(endTime.getTime() - startTime.getTime()));
taskList.add(task); |
closed | apache/dolphinscheduler | https://github.com/apache/dolphinscheduler | 7,767 | Delete the log of ‘workflow instance’ The log of ‘task instance’ is not deleted in cascade | ### 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
删除 ‘工作流实例’的日志 ‘任务实例’的日志没有级联删除
### What you expected to happen
删除 ‘工作流实例’的日志 ‘任务实例’的日志级联删除
### How to reproduce
手工删除过 t_ds_task_instance 、t_ds_process_instance、t_ds_relation_process_instance
### Anything else
_No response_
### Version
2.0.1
### Are you willing to submit PR?
- [ ] Yes I am willing to submit a PR!
### Code of Conduct
- [ ] I agree to follow this project's [Code of Conduct](https://www.apache.org/foundation/policies/conduct)
| https://github.com/apache/dolphinscheduler/issues/7767 | https://github.com/apache/dolphinscheduler/pull/7768 | 4d16c24b6e78887927a9550a90b25bceb9b5c0b1 | 7395b980d3d76646dada5b7e9220d946b154001e | 2022-01-01T07:10:16Z | java | 2022-01-03T07:52:50Z | dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/impl/ProcessInstanceServiceImpl.java | }
ganttDto.setTasks(taskList);
result.put(DATA_LIST, ganttDto);
putMsg(result, Status.SUCCESS);
return result;
}
/**
* query process instance by processDefinitionCode and stateArray
*
* @param processDefinitionCode processDefinitionCode
* @param states states array
* @return process instance list
*/
@Override
public List<ProcessInstance> queryByProcessDefineCodeAndStatus(Long processDefinitionCode, int[] states) {
return processInstanceMapper.queryByProcessDefineCodeAndStatus(processDefinitionCode, states);
}
/**
* query process instance by processDefinitionCode
*
* @param processDefinitionCode processDefinitionCode
* @param size size
* @return process instance list
*/
@Override
public List<ProcessInstance> queryByProcessDefineCode(Long processDefinitionCode, int size) {
return processInstanceMapper.queryByProcessDefineCode(processDefinitionCode, size);
}
} |
closed | apache/dolphinscheduler | https://github.com/apache/dolphinscheduler | 7,767 | Delete the log of ‘workflow instance’ The log of ‘task instance’ is not deleted in cascade | ### 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
删除 ‘工作流实例’的日志 ‘任务实例’的日志没有级联删除
### What you expected to happen
删除 ‘工作流实例’的日志 ‘任务实例’的日志级联删除
### How to reproduce
手工删除过 t_ds_task_instance 、t_ds_process_instance、t_ds_relation_process_instance
### Anything else
_No response_
### Version
2.0.1
### Are you willing to submit PR?
- [ ] Yes I am willing to submit a PR!
### Code of Conduct
- [ ] I agree to follow this project's [Code of Conduct](https://www.apache.org/foundation/policies/conduct)
| https://github.com/apache/dolphinscheduler/issues/7767 | https://github.com/apache/dolphinscheduler/pull/7768 | 4d16c24b6e78887927a9550a90b25bceb9b5c0b1 | 7395b980d3d76646dada5b7e9220d946b154001e | 2022-01-01T07:10:16Z | java | 2022-01-03T07:52:50Z | 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_CODE;
import static org.apache.dolphinscheduler.common.Constants.CMD_PARAM_SUB_PROCESS_PARENT_INSTANCE_ID;
import static org.apache.dolphinscheduler.common.Constants.LOCAL_PARAMS;
import static java.util.stream.Collectors.toSet;
import org.apache.dolphinscheduler.common.Constants;
import org.apache.dolphinscheduler.common.enums.AuthorizationType; |
closed | apache/dolphinscheduler | https://github.com/apache/dolphinscheduler | 7,767 | Delete the log of ‘workflow instance’ The log of ‘task instance’ is not deleted in cascade | ### 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
删除 ‘工作流实例’的日志 ‘任务实例’的日志没有级联删除
### What you expected to happen
删除 ‘工作流实例’的日志 ‘任务实例’的日志级联删除
### How to reproduce
手工删除过 t_ds_task_instance 、t_ds_process_instance、t_ds_relation_process_instance
### Anything else
_No response_
### Version
2.0.1
### Are you willing to submit PR?
- [ ] Yes I am willing to submit a PR!
### Code of Conduct
- [ ] I agree to follow this project's [Code of Conduct](https://www.apache.org/foundation/policies/conduct)
| https://github.com/apache/dolphinscheduler/issues/7767 | https://github.com/apache/dolphinscheduler/pull/7768 | 4d16c24b6e78887927a9550a90b25bceb9b5c0b1 | 7395b980d3d76646dada5b7e9220d946b154001e | 2022-01-01T07:10:16Z | java | 2022-01-03T07:52:50Z | dolphinscheduler-service/src/main/java/org/apache/dolphinscheduler/service/process/ProcessService.java | 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.TaskDependType;
import org.apache.dolphinscheduler.common.enums.TaskGroupQueueStatus;
import org.apache.dolphinscheduler.common.enums.TimeoutFlag;
import org.apache.dolphinscheduler.common.enums.WarningType;
import org.apache.dolphinscheduler.common.graph.DAG;
import org.apache.dolphinscheduler.common.model.DateInterval;
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.CodeGenerateUtils;
import org.apache.dolphinscheduler.common.utils.CodeGenerateUtils.CodeGenerateException;
import org.apache.dolphinscheduler.common.utils.DateUtils;
import org.apache.dolphinscheduler.common.utils.JSONUtils;
import org.apache.dolphinscheduler.common.utils.ParameterUtils;
import org.apache.dolphinscheduler.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; |
closed | apache/dolphinscheduler | https://github.com/apache/dolphinscheduler | 7,767 | Delete the log of ‘workflow instance’ The log of ‘task instance’ is not deleted in cascade | ### 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
删除 ‘工作流实例’的日志 ‘任务实例’的日志没有级联删除
### What you expected to happen
删除 ‘工作流实例’的日志 ‘任务实例’的日志级联删除
### How to reproduce
手工删除过 t_ds_task_instance 、t_ds_process_instance、t_ds_relation_process_instance
### Anything else
_No response_
### Version
2.0.1
### Are you willing to submit PR?
- [ ] Yes I am willing to submit a PR!
### Code of Conduct
- [ ] I agree to follow this project's [Code of Conduct](https://www.apache.org/foundation/policies/conduct)
| https://github.com/apache/dolphinscheduler/issues/7767 | https://github.com/apache/dolphinscheduler/pull/7768 | 4d16c24b6e78887927a9550a90b25bceb9b5c0b1 | 7395b980d3d76646dada5b7e9220d946b154001e | 2022-01-01T07:10:16Z | java | 2022-01-03T07:52:50Z | dolphinscheduler-service/src/main/java/org/apache/dolphinscheduler/service/process/ProcessService.java | 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.TaskGroup;
import org.apache.dolphinscheduler.dao.entity.TaskGroupQueue;
import org.apache.dolphinscheduler.dao.entity.TaskInstance;
import org.apache.dolphinscheduler.dao.entity.Tenant;
import org.apache.dolphinscheduler.dao.entity.UdfFunc;
import org.apache.dolphinscheduler.dao.entity.User;
import org.apache.dolphinscheduler.dao.mapper.CommandMapper;
import org.apache.dolphinscheduler.dao.mapper.DataSourceMapper;
import org.apache.dolphinscheduler.dao.mapper.EnvironmentMapper;
import org.apache.dolphinscheduler.dao.mapper.ErrorCommandMapper;
import org.apache.dolphinscheduler.dao.mapper.ProcessDefinitionLogMapper;
import org.apache.dolphinscheduler.dao.mapper.ProcessDefinitionMapper;
import org.apache.dolphinscheduler.dao.mapper.ProcessInstanceMapMapper;
import org.apache.dolphinscheduler.dao.mapper.ProcessInstanceMapper;
import org.apache.dolphinscheduler.dao.mapper.ProcessTaskRelationLogMapper;
import org.apache.dolphinscheduler.dao.mapper.ProcessTaskRelationMapper;
import org.apache.dolphinscheduler.dao.mapper.ProjectMapper; |
closed | apache/dolphinscheduler | https://github.com/apache/dolphinscheduler | 7,767 | Delete the log of ‘workflow instance’ The log of ‘task instance’ is not deleted in cascade | ### 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
删除 ‘工作流实例’的日志 ‘任务实例’的日志没有级联删除
### What you expected to happen
删除 ‘工作流实例’的日志 ‘任务实例’的日志级联删除
### How to reproduce
手工删除过 t_ds_task_instance 、t_ds_process_instance、t_ds_relation_process_instance
### Anything else
_No response_
### Version
2.0.1
### Are you willing to submit PR?
- [ ] Yes I am willing to submit a PR!
### Code of Conduct
- [ ] I agree to follow this project's [Code of Conduct](https://www.apache.org/foundation/policies/conduct)
| https://github.com/apache/dolphinscheduler/issues/7767 | https://github.com/apache/dolphinscheduler/pull/7768 | 4d16c24b6e78887927a9550a90b25bceb9b5c0b1 | 7395b980d3d76646dada5b7e9220d946b154001e | 2022-01-01T07:10:16Z | java | 2022-01-03T07:52:50Z | dolphinscheduler-service/src/main/java/org/apache/dolphinscheduler/service/process/ProcessService.java | 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.TaskGroupMapper;
import org.apache.dolphinscheduler.dao.mapper.TaskGroupQueueMapper;
import org.apache.dolphinscheduler.dao.mapper.TaskInstanceMapper;
import org.apache.dolphinscheduler.dao.mapper.TenantMapper;
import org.apache.dolphinscheduler.dao.mapper.UdfFuncMapper;
import org.apache.dolphinscheduler.dao.mapper.UserMapper;
import org.apache.dolphinscheduler.dao.utils.DagHelper;
import org.apache.dolphinscheduler.remote.command.StateEventChangeCommand;
import org.apache.dolphinscheduler.remote.command.TaskEventChangeCommand;
import org.apache.dolphinscheduler.remote.processor.StateEventCallbackService;
import org.apache.dolphinscheduler.remote.utils.Host;
import org.apache.dolphinscheduler.service.bean.SpringApplicationContext;
import org.apache.dolphinscheduler.service.exceptions.ServiceException;
import org.apache.dolphinscheduler.service.log.LogClientService;
import org.apache.dolphinscheduler.service.quartz.cron.CronUtils;
import org.apache.dolphinscheduler.spi.enums.ResourceType;
import org.apache.commons.collections.CollectionUtils;
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; |
closed | apache/dolphinscheduler | https://github.com/apache/dolphinscheduler | 7,767 | Delete the log of ‘workflow instance’ The log of ‘task instance’ is not deleted in cascade | ### 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
删除 ‘工作流实例’的日志 ‘任务实例’的日志没有级联删除
### What you expected to happen
删除 ‘工作流实例’的日志 ‘任务实例’的日志级联删除
### How to reproduce
手工删除过 t_ds_task_instance 、t_ds_process_instance、t_ds_relation_process_instance
### Anything else
_No response_
### Version
2.0.1
### Are you willing to submit PR?
- [ ] Yes I am willing to submit a PR!
### Code of Conduct
- [ ] I agree to follow this project's [Code of Conduct](https://www.apache.org/foundation/policies/conduct)
| https://github.com/apache/dolphinscheduler/issues/7767 | https://github.com/apache/dolphinscheduler/pull/7768 | 4d16c24b6e78887927a9550a90b25bceb9b5c0b1 | 7395b980d3d76646dada5b7e9220d946b154001e | 2022-01-01T07:10:16Z | java | 2022-01-03T07:52:50Z | dolphinscheduler-service/src/main/java/org/apache/dolphinscheduler/service/process/ProcessService.java | import java.util.Map;
import java.util.Map.Entry;
import java.util.Objects;
import java.util.Set;
import java.util.stream.Collectors;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
import org.springframework.transaction.annotation.Transactional;
import com.fasterxml.jackson.core.type.TypeReference;
import com.fasterxml.jackson.databind.node.ObjectNode;
import com.google.common.collect.Lists;
/**
* process relative dao that some mappers in this.
*/
@Component
public class 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; |
closed | apache/dolphinscheduler | https://github.com/apache/dolphinscheduler | 7,767 | Delete the log of ‘workflow instance’ The log of ‘task instance’ is not deleted in cascade | ### 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
删除 ‘工作流实例’的日志 ‘任务实例’的日志没有级联删除
### What you expected to happen
删除 ‘工作流实例’的日志 ‘任务实例’的日志级联删除
### How to reproduce
手工删除过 t_ds_task_instance 、t_ds_process_instance、t_ds_relation_process_instance
### Anything else
_No response_
### Version
2.0.1
### Are you willing to submit PR?
- [ ] Yes I am willing to submit a PR!
### Code of Conduct
- [ ] I agree to follow this project's [Code of Conduct](https://www.apache.org/foundation/policies/conduct)
| https://github.com/apache/dolphinscheduler/issues/7767 | https://github.com/apache/dolphinscheduler/pull/7768 | 4d16c24b6e78887927a9550a90b25bceb9b5c0b1 | 7395b980d3d76646dada5b7e9220d946b154001e | 2022-01-01T07:10:16Z | java | 2022-01-03T07:52:50Z | dolphinscheduler-service/src/main/java/org/apache/dolphinscheduler/service/process/ProcessService.java | @Autowired
private ProcessInstanceMapper processInstanceMapper;
@Autowired
private DataSourceMapper dataSourceMapper;
@Autowired
private ProcessInstanceMapMapper processInstanceMapMapper;
@Autowired
private TaskInstanceMapper taskInstanceMapper;
@Autowired
private CommandMapper commandMapper;
@Autowired
private ScheduleMapper scheduleMapper;
@Autowired
private UdfFuncMapper udfFuncMapper;
@Autowired
private ResourceMapper resourceMapper;
@Autowired
private ResourceUserMapper resourceUserMapper;
@Autowired
private ErrorCommandMapper errorCommandMapper;
@Autowired
private TenantMapper tenantMapper;
@Autowired
private ProjectMapper projectMapper;
@Autowired
private TaskDefinitionMapper taskDefinitionMapper;
@Autowired
private TaskDefinitionLogMapper taskDefinitionLogMapper;
@Autowired
private ProcessTaskRelationMapper processTaskRelationMapper; |
closed | apache/dolphinscheduler | https://github.com/apache/dolphinscheduler | 7,767 | Delete the log of ‘workflow instance’ The log of ‘task instance’ is not deleted in cascade | ### 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
删除 ‘工作流实例’的日志 ‘任务实例’的日志没有级联删除
### What you expected to happen
删除 ‘工作流实例’的日志 ‘任务实例’的日志级联删除
### How to reproduce
手工删除过 t_ds_task_instance 、t_ds_process_instance、t_ds_relation_process_instance
### Anything else
_No response_
### Version
2.0.1
### Are you willing to submit PR?
- [ ] Yes I am willing to submit a PR!
### Code of Conduct
- [ ] I agree to follow this project's [Code of Conduct](https://www.apache.org/foundation/policies/conduct)
| https://github.com/apache/dolphinscheduler/issues/7767 | https://github.com/apache/dolphinscheduler/pull/7768 | 4d16c24b6e78887927a9550a90b25bceb9b5c0b1 | 7395b980d3d76646dada5b7e9220d946b154001e | 2022-01-01T07:10:16Z | java | 2022-01-03T07:52:50Z | dolphinscheduler-service/src/main/java/org/apache/dolphinscheduler/service/process/ProcessService.java | @Autowired
private ProcessTaskRelationLogMapper processTaskRelationLogMapper;
@Autowired
StateEventCallbackService stateEventCallbackService;
@Autowired
private EnvironmentMapper environmentMapper;
@Autowired
private TaskGroupQueueMapper taskGroupQueueMapper;
@Autowired
private TaskGroupMapper taskGroupMapper;
/**
* handle Command (construct ProcessInstance from Command) , wrapped in transaction
*
* @param logger logger
* @param host host
* @param command found command
* @return process instance
*/
@Transactional
public ProcessInstance handleCommand(Logger logger, String host, Command command) {
ProcessInstance processInstance = constructProcessInstance(command, host);
if (processInstance == null) {
logger.error("scan command, command parameter is error: {}", command);
moveToErrorCommand(command, "process instance is null");
return null;
}
processInstance.setCommandType(command.getCommandType());
processInstance.addHistoryCmd(command.getCommandType()); |
closed | apache/dolphinscheduler | https://github.com/apache/dolphinscheduler | 7,767 | Delete the log of ‘workflow instance’ The log of ‘task instance’ is not deleted in cascade | ### 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
删除 ‘工作流实例’的日志 ‘任务实例’的日志没有级联删除
### What you expected to happen
删除 ‘工作流实例’的日志 ‘任务实例’的日志级联删除
### How to reproduce
手工删除过 t_ds_task_instance 、t_ds_process_instance、t_ds_relation_process_instance
### Anything else
_No response_
### Version
2.0.1
### Are you willing to submit PR?
- [ ] Yes I am willing to submit a PR!
### Code of Conduct
- [ ] I agree to follow this project's [Code of Conduct](https://www.apache.org/foundation/policies/conduct)
| https://github.com/apache/dolphinscheduler/issues/7767 | https://github.com/apache/dolphinscheduler/pull/7768 | 4d16c24b6e78887927a9550a90b25bceb9b5c0b1 | 7395b980d3d76646dada5b7e9220d946b154001e | 2022-01-01T07:10:16Z | java | 2022-01-03T07:52:50Z | dolphinscheduler-service/src/main/java/org/apache/dolphinscheduler/service/process/ProcessService.java | ProcessDefinition processDefinition = this.findProcessDefinition(processInstance.getProcessDefinitionCode(), processInstance.getProcessDefinitionVersion());
if (processDefinition.getExecutionType().typeIsSerial()) {
saveSerialProcess(processInstance, processDefinition);
if (processInstance.getState() != ExecutionStatus.SUBMITTED_SUCCESS) {
setSubProcessParam(processInstance);
deleteCommandWithCheck(command.getId());
return null;
}
} else {
saveProcessInstance(processInstance);
}
setSubProcessParam(processInstance);
deleteCommandWithCheck(command.getId());
return processInstance;
}
private void saveSerialProcess(ProcessInstance processInstance, ProcessDefinition processDefinition) {
processInstance.setState(ExecutionStatus.SERIAL_WAIT);
saveProcessInstance(processInstance);
if (processDefinition.getExecutionType().typeIsSerialWait()) {
while (true) {
List<ProcessInstance> runningProcessInstances = this.processInstanceMapper.queryByProcessDefineCodeAndStatusAndNextId(processInstance.getProcessDefinitionCode(),
Constants.RUNNING_PROCESS_STATE, processInstance.getId());
if (CollectionUtils.isEmpty(runningProcessInstances)) {
processInstance.setState(ExecutionStatus.SUBMITTED_SUCCESS);
saveProcessInstance(processInstance);
return;
}
ProcessInstance runningProcess = runningProcessInstances.get(0); |
closed | apache/dolphinscheduler | https://github.com/apache/dolphinscheduler | 7,767 | Delete the log of ‘workflow instance’ The log of ‘task instance’ is not deleted in cascade | ### 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
删除 ‘工作流实例’的日志 ‘任务实例’的日志没有级联删除
### What you expected to happen
删除 ‘工作流实例’的日志 ‘任务实例’的日志级联删除
### How to reproduce
手工删除过 t_ds_task_instance 、t_ds_process_instance、t_ds_relation_process_instance
### Anything else
_No response_
### Version
2.0.1
### Are you willing to submit PR?
- [ ] Yes I am willing to submit a PR!
### Code of Conduct
- [ ] I agree to follow this project's [Code of Conduct](https://www.apache.org/foundation/policies/conduct)
| https://github.com/apache/dolphinscheduler/issues/7767 | https://github.com/apache/dolphinscheduler/pull/7768 | 4d16c24b6e78887927a9550a90b25bceb9b5c0b1 | 7395b980d3d76646dada5b7e9220d946b154001e | 2022-01-01T07:10:16Z | java | 2022-01-03T07:52:50Z | dolphinscheduler-service/src/main/java/org/apache/dolphinscheduler/service/process/ProcessService.java | if (this.processInstanceMapper.updateNextProcessIdById(processInstance.getId(), runningProcess.getId())) {
return;
}
}
} else if (processDefinition.getExecutionType().typeIsSerialDiscard()) {
List<ProcessInstance> runningProcessInstances = this.processInstanceMapper.queryByProcessDefineCodeAndStatusAndNextId(processInstance.getProcessDefinitionCode(),
Constants.RUNNING_PROCESS_STATE, processInstance.getId());
if (CollectionUtils.isEmpty(runningProcessInstances)) {
processInstance.setState(ExecutionStatus.STOP);
saveProcessInstance(processInstance);
}
} else if (processDefinition.getExecutionType().typeIsSerialPriority()) {
List<ProcessInstance> runningProcessInstances = this.processInstanceMapper.queryByProcessDefineCodeAndStatusAndNextId(processInstance.getProcessDefinitionCode(),
Constants.RUNNING_PROCESS_STATE, processInstance.getId());
if (CollectionUtils.isNotEmpty(runningProcessInstances)) {
for (ProcessInstance info : runningProcessInstances) {
info.setCommandType(CommandType.STOP);
info.addHistoryCmd(CommandType.STOP);
info.setState(ExecutionStatus.READY_STOP);
int update = updateProcessInstance(info);
if (update > 0) {
String host = info.getHost();
String address = host.split(":")[0];
int port = Integer.parseInt(host.split(":")[1]);
StateEventChangeCommand stateEventChangeCommand = new StateEventChangeCommand(
info.getId(), 0, info.getState(), info.getId(), 0
);
try {
stateEventCallbackService.sendResult(address, port, stateEventChangeCommand.convert2Command()); |
closed | apache/dolphinscheduler | https://github.com/apache/dolphinscheduler | 7,767 | Delete the log of ‘workflow instance’ The log of ‘task instance’ is not deleted in cascade | ### 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
删除 ‘工作流实例’的日志 ‘任务实例’的日志没有级联删除
### What you expected to happen
删除 ‘工作流实例’的日志 ‘任务实例’的日志级联删除
### How to reproduce
手工删除过 t_ds_task_instance 、t_ds_process_instance、t_ds_relation_process_instance
### Anything else
_No response_
### Version
2.0.1
### Are you willing to submit PR?
- [ ] Yes I am willing to submit a PR!
### Code of Conduct
- [ ] I agree to follow this project's [Code of Conduct](https://www.apache.org/foundation/policies/conduct)
| https://github.com/apache/dolphinscheduler/issues/7767 | https://github.com/apache/dolphinscheduler/pull/7768 | 4d16c24b6e78887927a9550a90b25bceb9b5c0b1 | 7395b980d3d76646dada5b7e9220d946b154001e | 2022-01-01T07:10:16Z | java | 2022-01-03T07:52:50Z | dolphinscheduler-service/src/main/java/org/apache/dolphinscheduler/service/process/ProcessService.java | } catch (Exception e) {
logger.error("sendResultError");
}
}
}
}
}
}
/**
* save error command, and delete original command
*
* @param command command
* @param message message
*/
public void moveToErrorCommand(Command command, String message) {
ErrorCommand errorCommand = new ErrorCommand(command, message);
this.errorCommandMapper.insert(errorCommand);
this.commandMapper.deleteById(command.getId());
}
/**
* set process waiting thread
*
* @param command command
* @param processInstance processInstance
* @return process instance
*/
private ProcessInstance setWaitingThreadProcess(Command command, ProcessInstance processInstance) {
processInstance.setState(ExecutionStatus.WAITING_THREAD);
if (command.getCommandType() != CommandType.RECOVER_WAITING_THREAD) {
processInstance.addHistoryCmd(command.getCommandType()); |
closed | apache/dolphinscheduler | https://github.com/apache/dolphinscheduler | 7,767 | Delete the log of ‘workflow instance’ The log of ‘task instance’ is not deleted in cascade | ### 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
删除 ‘工作流实例’的日志 ‘任务实例’的日志没有级联删除
### What you expected to happen
删除 ‘工作流实例’的日志 ‘任务实例’的日志级联删除
### How to reproduce
手工删除过 t_ds_task_instance 、t_ds_process_instance、t_ds_relation_process_instance
### Anything else
_No response_
### Version
2.0.1
### Are you willing to submit PR?
- [ ] Yes I am willing to submit a PR!
### Code of Conduct
- [ ] I agree to follow this project's [Code of Conduct](https://www.apache.org/foundation/policies/conduct)
| https://github.com/apache/dolphinscheduler/issues/7767 | https://github.com/apache/dolphinscheduler/pull/7768 | 4d16c24b6e78887927a9550a90b25bceb9b5c0b1 | 7395b980d3d76646dada5b7e9220d946b154001e | 2022-01-01T07:10:16Z | java | 2022-01-03T07:52:50Z | dolphinscheduler-service/src/main/java/org/apache/dolphinscheduler/service/process/ProcessService.java | }
saveProcessInstance(processInstance);
this.setSubProcessParam(processInstance);
createRecoveryWaitingThreadCommand(command, processInstance);
return null;
}
/**
* 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;
}
/**
* get command page
*/
public List<Command> findCommandPage(int pageSize, int pageNumber) {
return commandMapper.queryCommandPage(pageSize, pageNumber * pageSize);
}
/**
* check the input command exists in queue list
*
* @param command command
* @return create command result |
closed | apache/dolphinscheduler | https://github.com/apache/dolphinscheduler | 7,767 | Delete the log of ‘workflow instance’ The log of ‘task instance’ is not deleted in cascade | ### 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
删除 ‘工作流实例’的日志 ‘任务实例’的日志没有级联删除
### What you expected to happen
删除 ‘工作流实例’的日志 ‘任务实例’的日志级联删除
### How to reproduce
手工删除过 t_ds_task_instance 、t_ds_process_instance、t_ds_relation_process_instance
### Anything else
_No response_
### Version
2.0.1
### Are you willing to submit PR?
- [ ] Yes I am willing to submit a PR!
### Code of Conduct
- [ ] I agree to follow this project's [Code of Conduct](https://www.apache.org/foundation/policies/conduct)
| https://github.com/apache/dolphinscheduler/issues/7767 | https://github.com/apache/dolphinscheduler/pull/7768 | 4d16c24b6e78887927a9550a90b25bceb9b5c0b1 | 7395b980d3d76646dada5b7e9220d946b154001e | 2022-01-01T07:10:16Z | java | 2022-01-03T07:52:50Z | dolphinscheduler-service/src/main/java/org/apache/dolphinscheduler/service/process/ProcessService.java | */
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()) {
isNeedCreate = false;
break;
}
}
}
}
return isNeedCreate;
}
/**
* find process instance detail by id
*
* @param processId processId
* @return process instance |
closed | apache/dolphinscheduler | https://github.com/apache/dolphinscheduler | 7,767 | Delete the log of ‘workflow instance’ The log of ‘task instance’ is not deleted in cascade | ### 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
删除 ‘工作流实例’的日志 ‘任务实例’的日志没有级联删除
### What you expected to happen
删除 ‘工作流实例’的日志 ‘任务实例’的日志级联删除
### How to reproduce
手工删除过 t_ds_task_instance 、t_ds_process_instance、t_ds_relation_process_instance
### Anything else
_No response_
### Version
2.0.1
### Are you willing to submit PR?
- [ ] Yes I am willing to submit a PR!
### Code of Conduct
- [ ] I agree to follow this project's [Code of Conduct](https://www.apache.org/foundation/policies/conduct)
| https://github.com/apache/dolphinscheduler/issues/7767 | https://github.com/apache/dolphinscheduler/pull/7768 | 4d16c24b6e78887927a9550a90b25bceb9b5c0b1 | 7395b980d3d76646dada5b7e9220d946b154001e | 2022-01-01T07:10:16Z | java | 2022-01-03T07:52:50Z | dolphinscheduler-service/src/main/java/org/apache/dolphinscheduler/service/process/ProcessService.java | */
public ProcessInstance findProcessInstanceDetailById(int processId) {
return processInstanceMapper.queryDetailById(processId);
}
/**
* get task node list by definitionId
*/
public List<TaskDefinition> getTaskNodeListByDefinition(long defineCode) {
ProcessDefinition processDefinition = processDefineMapper.queryByCode(defineCode);
if (processDefinition == null) {
logger.error("process define not exists");
return Lists.newArrayList();
}
List<ProcessTaskRelationLog> processTaskRelations = processTaskRelationLogMapper.queryByProcessCodeAndVersion(processDefinition.getCode(), processDefinition.getVersion());
Set<TaskDefinition> taskDefinitionSet = new HashSet<>();
for (ProcessTaskRelationLog processTaskRelation : processTaskRelations) {
if (processTaskRelation.getPostTaskCode() > 0) {
taskDefinitionSet.add(new TaskDefinition(processTaskRelation.getPostTaskCode(), processTaskRelation.getPostTaskVersion()));
}
}
if (taskDefinitionSet.isEmpty()) {
return Lists.newArrayList();
}
List<TaskDefinitionLog> taskDefinitionLogs = taskDefinitionLogMapper.queryByTaskDefinitions(taskDefinitionSet);
return Lists.newArrayList(taskDefinitionLogs);
}
/**
* find process instance by id
*
* @param processId processId |
closed | apache/dolphinscheduler | https://github.com/apache/dolphinscheduler | 7,767 | Delete the log of ‘workflow instance’ The log of ‘task instance’ is not deleted in cascade | ### 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
删除 ‘工作流实例’的日志 ‘任务实例’的日志没有级联删除
### What you expected to happen
删除 ‘工作流实例’的日志 ‘任务实例’的日志级联删除
### How to reproduce
手工删除过 t_ds_task_instance 、t_ds_process_instance、t_ds_relation_process_instance
### Anything else
_No response_
### Version
2.0.1
### Are you willing to submit PR?
- [ ] Yes I am willing to submit a PR!
### Code of Conduct
- [ ] I agree to follow this project's [Code of Conduct](https://www.apache.org/foundation/policies/conduct)
| https://github.com/apache/dolphinscheduler/issues/7767 | https://github.com/apache/dolphinscheduler/pull/7768 | 4d16c24b6e78887927a9550a90b25bceb9b5c0b1 | 7395b980d3d76646dada5b7e9220d946b154001e | 2022-01-01T07:10:16Z | java | 2022-01-03T07:52:50Z | dolphinscheduler-service/src/main/java/org/apache/dolphinscheduler/service/process/ProcessService.java | * @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
*/
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;
} |
closed | apache/dolphinscheduler | https://github.com/apache/dolphinscheduler | 7,767 | Delete the log of ‘workflow instance’ The log of ‘task instance’ is not deleted in cascade | ### 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
删除 ‘工作流实例’的日志 ‘任务实例’的日志没有级联删除
### What you expected to happen
删除 ‘工作流实例’的日志 ‘任务实例’的日志级联删除
### How to reproduce
手工删除过 t_ds_task_instance 、t_ds_process_instance、t_ds_relation_process_instance
### Anything else
_No response_
### Version
2.0.1
### Are you willing to submit PR?
- [ ] Yes I am willing to submit a PR!
### Code of Conduct
- [ ] I agree to follow this project's [Code of Conduct](https://www.apache.org/foundation/policies/conduct)
| https://github.com/apache/dolphinscheduler/issues/7767 | https://github.com/apache/dolphinscheduler/pull/7768 | 4d16c24b6e78887927a9550a90b25bceb9b5c0b1 | 7395b980d3d76646dada5b7e9220d946b154001e | 2022-01-01T07:10:16Z | java | 2022-01-03T07:52:50Z | dolphinscheduler-service/src/main/java/org/apache/dolphinscheduler/service/process/ProcessService.java | /**
* 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
*
* @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); |
closed | apache/dolphinscheduler | https://github.com/apache/dolphinscheduler | 7,767 | Delete the log of ‘workflow instance’ The log of ‘task instance’ is not deleted in cascade | ### 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
删除 ‘工作流实例’的日志 ‘任务实例’的日志没有级联删除
### What you expected to happen
删除 ‘工作流实例’的日志 ‘任务实例’的日志级联删除
### How to reproduce
手工删除过 t_ds_task_instance 、t_ds_process_instance、t_ds_relation_process_instance
### Anything else
_No response_
### Version
2.0.1
### Are you willing to submit PR?
- [ ] Yes I am willing to submit a PR!
### Code of Conduct
- [ ] I agree to follow this project's [Code of Conduct](https://www.apache.org/foundation/policies/conduct)
| https://github.com/apache/dolphinscheduler/issues/7767 | https://github.com/apache/dolphinscheduler/pull/7768 | 4d16c24b6e78887927a9550a90b25bceb9b5c0b1 | 7395b980d3d76646dada5b7e9220d946b154001e | 2022-01-01T07:10:16Z | java | 2022-01-03T07:52:50Z | dolphinscheduler-service/src/main/java/org/apache/dolphinscheduler/service/process/ProcessService.java | 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;
}
Host host = Host.of(taskInstance.getHost());
logClient.removeTaskLog(host.getIp(), host.getPort(), taskLogPath);
}
}
}
/**
* recursive query sub process definition id by parent id.
*
* @param parentCode parentCode |
closed | apache/dolphinscheduler | https://github.com/apache/dolphinscheduler | 7,767 | Delete the log of ‘workflow instance’ The log of ‘task instance’ is not deleted in cascade | ### 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
删除 ‘工作流实例’的日志 ‘任务实例’的日志没有级联删除
### What you expected to happen
删除 ‘工作流实例’的日志 ‘任务实例’的日志级联删除
### How to reproduce
手工删除过 t_ds_task_instance 、t_ds_process_instance、t_ds_relation_process_instance
### Anything else
_No response_
### Version
2.0.1
### Are you willing to submit PR?
- [ ] Yes I am willing to submit a PR!
### Code of Conduct
- [ ] I agree to follow this project's [Code of Conduct](https://www.apache.org/foundation/policies/conduct)
| https://github.com/apache/dolphinscheduler/issues/7767 | https://github.com/apache/dolphinscheduler/pull/7768 | 4d16c24b6e78887927a9550a90b25bceb9b5c0b1 | 7395b980d3d76646dada5b7e9220d946b154001e | 2022-01-01T07:10:16Z | java | 2022-01-03T07:52:50Z | dolphinscheduler-service/src/main/java/org/apache/dolphinscheduler/service/process/ProcessService.java | * @param ids ids
*/
public void recurseFindSubProcess(long parentCode, List<Long> ids) {
List<TaskDefinition> taskNodeList = this.getTaskNodeListByDefinition(parentCode);
if (taskNodeList != null && !taskNodeList.isEmpty()) {
for (TaskDefinition taskNode : taskNodeList) {
String parameter = taskNode.getTaskParams();
ObjectNode parameterJson = JSONUtils.parseObject(parameter);
if (parameterJson.get(CMD_PARAM_SUB_PROCESS_DEFINE_CODE) != null) {
SubProcessParameters subProcessParam = JSONUtils.parseObject(parameter, SubProcessParameters.class);
ids.add(subProcessParam.getProcessDefinitionCode());
recurseFindSubProcess(subProcessParam.getProcessDefinitionCode(), ids);
}
}
}
}
/**
* 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 | 7,767 | Delete the log of ‘workflow instance’ The log of ‘task instance’ is not deleted in cascade | ### 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
删除 ‘工作流实例’的日志 ‘任务实例’的日志没有级联删除
### What you expected to happen
删除 ‘工作流实例’的日志 ‘任务实例’的日志级联删除
### How to reproduce
手工删除过 t_ds_task_instance 、t_ds_process_instance、t_ds_relation_process_instance
### Anything else
_No response_
### Version
2.0.1
### Are you willing to submit PR?
- [ ] Yes I am willing to submit a PR!
### Code of Conduct
- [ ] I agree to follow this project's [Code of Conduct](https://www.apache.org/foundation/policies/conduct)
| https://github.com/apache/dolphinscheduler/issues/7767 | https://github.com/apache/dolphinscheduler/pull/7768 | 4d16c24b6e78887927a9550a90b25bceb9b5c0b1 | 7395b980d3d76646dada5b7e9220d946b154001e | 2022-01-01T07:10:16Z | java | 2022-01-03T07:52:50Z | 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(),
processInstance.getDryRun(),
processInstance.getId(),
processInstance.getProcessDefinitionVersion()
);
saveCommand(command);
return;
}
if (originCommand.getCommandType() == CommandType.RECOVER_WAITING_THREAD) {
originCommand.setUpdateTime(new Date()); |
closed | apache/dolphinscheduler | https://github.com/apache/dolphinscheduler | 7,767 | Delete the log of ‘workflow instance’ The log of ‘task instance’ is not deleted in cascade | ### 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
删除 ‘工作流实例’的日志 ‘任务实例’的日志没有级联删除
### What you expected to happen
删除 ‘工作流实例’的日志 ‘任务实例’的日志级联删除
### How to reproduce
手工删除过 t_ds_task_instance 、t_ds_process_instance、t_ds_relation_process_instance
### Anything else
_No response_
### Version
2.0.1
### Are you willing to submit PR?
- [ ] Yes I am willing to submit a PR!
### Code of Conduct
- [ ] I agree to follow this project's [Code of Conduct](https://www.apache.org/foundation/policies/conduct)
| https://github.com/apache/dolphinscheduler/issues/7767 | https://github.com/apache/dolphinscheduler/pull/7768 | 4d16c24b6e78887927a9550a90b25bceb9b5c0b1 | 7395b980d3d76646dada5b7e9220d946b154001e | 2022-01-01T07:10:16Z | java | 2022-01-03T07:52:50Z | dolphinscheduler-service/src/main/java/org/apache/dolphinscheduler/service/process/ProcessService.java | saveCommand(originCommand);
} else {
commandMapper.deleteById(originCommand.getId());
originCommand.setId(0);
originCommand.setCommandType(CommandType.RECOVER_WAITING_THREAD);
originCommand.setUpdateTime(new Date());
originCommand.setCommandParam(JSONUtils.toJsonString(cmdParam));
originCommand.setProcessInstancePriority(processInstance.getProcessInstancePriority());
saveCommand(originCommand);
}
}
/**
* get schedule time from command
*
* @param command command
* @param cmdParam cmdParam map
* @return date
*/
private Date getScheduleTime(Command command, Map<String, String> cmdParam) {
Date scheduleTime = command.getScheduleTime();
if (scheduleTime == null
&& cmdParam != null
&& cmdParam.containsKey(CMDPARAM_COMPLEMENT_DATA_START_DATE)) {
Date start = DateUtils.stringToDate(cmdParam.get(CMDPARAM_COMPLEMENT_DATA_START_DATE));
Date end = DateUtils.stringToDate(cmdParam.get(CMDPARAM_COMPLEMENT_DATA_END_DATE));
List<Schedule> schedules = queryReleaseSchedulerListByProcessDefinitionCode(command.getProcessDefinitionCode());
List<Date> complementDateList = CronUtils.getSelfFireDateList(start, end, schedules);
if (complementDateList.size() > 0) {
scheduleTime = complementDateList.get(0); |
closed | apache/dolphinscheduler | https://github.com/apache/dolphinscheduler | 7,767 | Delete the log of ‘workflow instance’ The log of ‘task instance’ is not deleted in cascade | ### 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
删除 ‘工作流实例’的日志 ‘任务实例’的日志没有级联删除
### What you expected to happen
删除 ‘工作流实例’的日志 ‘任务实例’的日志级联删除
### How to reproduce
手工删除过 t_ds_task_instance 、t_ds_process_instance、t_ds_relation_process_instance
### Anything else
_No response_
### Version
2.0.1
### Are you willing to submit PR?
- [ ] Yes I am willing to submit a PR!
### Code of Conduct
- [ ] I agree to follow this project's [Code of Conduct](https://www.apache.org/foundation/policies/conduct)
| https://github.com/apache/dolphinscheduler/issues/7767 | https://github.com/apache/dolphinscheduler/pull/7768 | 4d16c24b6e78887927a9550a90b25bceb9b5c0b1 | 7395b980d3d76646dada5b7e9220d946b154001e | 2022-01-01T07:10:16Z | java | 2022-01-03T07:52:50Z | dolphinscheduler-service/src/main/java/org/apache/dolphinscheduler/service/process/ProcessService.java | } else {
logger.error("set scheduler time error: complement date list is empty, command: {}",
command.toString());
}
}
return scheduleTime;
}
/**
* generate a new work process instance from command.
*
* @param processDefinition processDefinition
* @param command command
* @param cmdParam cmdParam map
* @return process instance
*/
private ProcessInstance generateNewProcessInstance(ProcessDefinition processDefinition,
Command command,
Map<String, String> cmdParam) {
ProcessInstance processInstance = new ProcessInstance(processDefinition);
processInstance.setProcessDefinitionCode(processDefinition.getCode());
processInstance.setProcessDefinitionVersion(processDefinition.getVersion());
processInstance.setState(ExecutionStatus.RUNNING_EXECUTION);
processInstance.setRecovery(Flag.NO);
processInstance.setStartTime(new Date());
processInstance.setRestartTime(processInstance.getStartTime());
processInstance.setRunTimes(1);
processInstance.setMaxTryTimes(0);
processInstance.setCommandParam(command.getCommandParam());
processInstance.setCommandType(command.getCommandType());
processInstance.setIsSubProcess(Flag.NO); |
closed | apache/dolphinscheduler | https://github.com/apache/dolphinscheduler | 7,767 | Delete the log of ‘workflow instance’ The log of ‘task instance’ is not deleted in cascade | ### 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
删除 ‘工作流实例’的日志 ‘任务实例’的日志没有级联删除
### What you expected to happen
删除 ‘工作流实例’的日志 ‘任务实例’的日志级联删除
### How to reproduce
手工删除过 t_ds_task_instance 、t_ds_process_instance、t_ds_relation_process_instance
### Anything else
_No response_
### Version
2.0.1
### Are you willing to submit PR?
- [ ] Yes I am willing to submit a PR!
### Code of Conduct
- [ ] I agree to follow this project's [Code of Conduct](https://www.apache.org/foundation/policies/conduct)
| https://github.com/apache/dolphinscheduler/issues/7767 | https://github.com/apache/dolphinscheduler/pull/7768 | 4d16c24b6e78887927a9550a90b25bceb9b5c0b1 | 7395b980d3d76646dada5b7e9220d946b154001e | 2022-01-01T07:10:16Z | java | 2022-01-03T07:52:50Z | dolphinscheduler-service/src/main/java/org/apache/dolphinscheduler/service/process/ProcessService.java | processInstance.setTaskDependType(command.getTaskDependType());
processInstance.setFailureStrategy(command.getFailureStrategy());
processInstance.setExecutorId(command.getExecutorId());
WarningType warningType = command.getWarningType() == null ? WarningType.NONE : command.getWarningType();
processInstance.setWarningType(warningType);
Integer warningGroupId = command.getWarningGroupId() == null ? 0 : command.getWarningGroupId();
processInstance.setWarningGroupId(warningGroupId);
processInstance.setDryRun(command.getDryRun());
if (command.getScheduleTime() != null) {
processInstance.setScheduleTime(command.getScheduleTime());
}
processInstance.setCommandStartTime(command.getStartTime());
processInstance.setLocations(processDefinition.getLocations());
setGlobalParamIfCommanded(processDefinition, cmdParam);
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;
} |
closed | apache/dolphinscheduler | https://github.com/apache/dolphinscheduler | 7,767 | Delete the log of ‘workflow instance’ The log of ‘task instance’ is not deleted in cascade | ### 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
删除 ‘工作流实例’的日志 ‘任务实例’的日志没有级联删除
### What you expected to happen
删除 ‘工作流实例’的日志 ‘任务实例’的日志级联删除
### How to reproduce
手工删除过 t_ds_task_instance 、t_ds_process_instance、t_ds_relation_process_instance
### Anything else
_No response_
### Version
2.0.1
### Are you willing to submit PR?
- [ ] Yes I am willing to submit a PR!
### Code of Conduct
- [ ] I agree to follow this project's [Code of Conduct](https://www.apache.org/foundation/policies/conduct)
| https://github.com/apache/dolphinscheduler/issues/7767 | https://github.com/apache/dolphinscheduler/pull/7768 | 4d16c24b6e78887927a9550a90b25bceb9b5c0b1 | 7395b980d3d76646dada5b7e9220d946b154001e | 2022-01-01T07:10:16Z | java | 2022-01-03T07:52:50Z | dolphinscheduler-service/src/main/java/org/apache/dolphinscheduler/service/process/ProcessService.java | 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);
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.
* |
closed | apache/dolphinscheduler | https://github.com/apache/dolphinscheduler | 7,767 | Delete the log of ‘workflow instance’ The log of ‘task instance’ is not deleted in cascade | ### 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
删除 ‘工作流实例’的日志 ‘任务实例’的日志没有级联删除
### What you expected to happen
删除 ‘工作流实例’的日志 ‘任务实例’的日志级联删除
### How to reproduce
手工删除过 t_ds_task_instance 、t_ds_process_instance、t_ds_relation_process_instance
### Anything else
_No response_
### Version
2.0.1
### Are you willing to submit PR?
- [ ] Yes I am willing to submit a PR!
### Code of Conduct
- [ ] I agree to follow this project's [Code of Conduct](https://www.apache.org/foundation/policies/conduct)
| https://github.com/apache/dolphinscheduler/issues/7767 | https://github.com/apache/dolphinscheduler/pull/7768 | 4d16c24b6e78887927a9550a90b25bceb9b5c0b1 | 7395b980d3d76646dada5b7e9220d946b154001e | 2022-01-01T07:10:16Z | java | 2022-01-03T07:52:50Z | dolphinscheduler-service/src/main/java/org/apache/dolphinscheduler/service/process/ProcessService.java | * @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);
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);
} |
closed | apache/dolphinscheduler | https://github.com/apache/dolphinscheduler | 7,767 | Delete the log of ‘workflow instance’ The log of ‘task instance’ is not deleted in cascade | ### 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
删除 ‘工作流实例’的日志 ‘任务实例’的日志没有级联删除
### What you expected to happen
删除 ‘工作流实例’的日志 ‘任务实例’的日志级联删除
### How to reproduce
手工删除过 t_ds_task_instance 、t_ds_process_instance、t_ds_relation_process_instance
### Anything else
_No response_
### Version
2.0.1
### Are you willing to submit PR?
- [ ] Yes I am willing to submit a PR!
### Code of Conduct
- [ ] I agree to follow this project's [Code of Conduct](https://www.apache.org/foundation/policies/conduct)
| https://github.com/apache/dolphinscheduler/issues/7767 | https://github.com/apache/dolphinscheduler/pull/7768 | 4d16c24b6e78887927a9550a90b25bceb9b5c0b1 | 7395b980d3d76646dada5b7e9220d946b154001e | 2022-01-01T07:10:16Z | java | 2022-01-03T07:52:50Z | dolphinscheduler-service/src/main/java/org/apache/dolphinscheduler/service/process/ProcessService.java | return environment;
}
/**
* check command parameters is valid
*
* @param command command
* @param cmdParam cmdParam map
* @return whether command param is valid
*/
private Boolean checkCmdParam(Command command, Map<String, String> cmdParam) {
if (command.getTaskDependType() == TaskDependType.TASK_ONLY || command.getTaskDependType() == TaskDependType.TASK_PRE) {
if (cmdParam == null
|| !cmdParam.containsKey(Constants.CMD_PARAM_START_NODES)
|| cmdParam.get(Constants.CMD_PARAM_START_NODES).isEmpty()) {
logger.error("command node depend type is {}, but start nodes is null ", command.getTaskDependType());
return false;
}
}
return true;
}
/**
* construct process instance according to one command.
*
* @param command command
* @param host host
* @return process instance
*/
private ProcessInstance constructProcessInstance(Command command, String host) {
ProcessInstance processInstance;
ProcessDefinition processDefinition; |
closed | apache/dolphinscheduler | https://github.com/apache/dolphinscheduler | 7,767 | Delete the log of ‘workflow instance’ The log of ‘task instance’ is not deleted in cascade | ### 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
删除 ‘工作流实例’的日志 ‘任务实例’的日志没有级联删除
### What you expected to happen
删除 ‘工作流实例’的日志 ‘任务实例’的日志级联删除
### How to reproduce
手工删除过 t_ds_task_instance 、t_ds_process_instance、t_ds_relation_process_instance
### Anything else
_No response_
### Version
2.0.1
### Are you willing to submit PR?
- [ ] Yes I am willing to submit a PR!
### Code of Conduct
- [ ] I agree to follow this project's [Code of Conduct](https://www.apache.org/foundation/policies/conduct)
| https://github.com/apache/dolphinscheduler/issues/7767 | https://github.com/apache/dolphinscheduler/pull/7768 | 4d16c24b6e78887927a9550a90b25bceb9b5c0b1 | 7395b980d3d76646dada5b7e9220d946b154001e | 2022-01-01T07:10:16Z | java | 2022-01-03T07:52:50Z | dolphinscheduler-service/src/main/java/org/apache/dolphinscheduler/service/process/ProcessService.java | CommandType commandType = command.getCommandType();
processDefinition = this.findProcessDefinition(command.getProcessDefinitionCode(), command.getProcessDefinitionVersion());
if (processDefinition == null) {
logger.error("cannot find the work process define! define code : {}", command.getProcessDefinitionCode());
return null;
}
Map<String, String> cmdParam = JSONUtils.toMap(command.getCommandParam());
int processInstanceId = command.getProcessInstanceId();
if (processInstanceId == 0) {
processInstance = generateNewProcessInstance(processDefinition, command, cmdParam);
} else {
processInstance = this.findProcessInstanceDetailById(processInstanceId);
if (processInstance == null) {
return processInstance;
}
}
if (cmdParam != null) {
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 | 7,767 | Delete the log of ‘workflow instance’ The log of ‘task instance’ is not deleted in cascade | ### 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
删除 ‘工作流实例’的日志 ‘任务实例’的日志没有级联删除
### What you expected to happen
删除 ‘工作流实例’的日志 ‘任务实例’的日志级联删除
### How to reproduce
手工删除过 t_ds_task_instance 、t_ds_process_instance、t_ds_relation_process_instance
### Anything else
_No response_
### Version
2.0.1
### Are you willing to submit PR?
- [ ] Yes I am willing to submit a PR!
### Code of Conduct
- [ ] I agree to follow this project's [Code of Conduct](https://www.apache.org/foundation/policies/conduct)
| https://github.com/apache/dolphinscheduler/issues/7767 | https://github.com/apache/dolphinscheduler/pull/7768 | 4d16c24b6e78887927a9550a90b25bceb9b5c0b1 | 7395b980d3d76646dada5b7e9220d946b154001e | 2022-01-01T07:10:16Z | java | 2022-01-03T07:52:50Z | 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 != null && cmdParam.containsKey(Constants.CMD_PARAM_SUB_PROCESS)) {
processInstance.setCommandParam(command.getCommandParam());
}
if (Boolean.FALSE.equals(checkCmdParam(command, cmdParam))) {
logger.error("command parameter check failed!");
return null;
}
if (command.getScheduleTime() != null) {
processInstance.setScheduleTime(command.getScheduleTime());
}
processInstance.setHost(host);
processInstance.setRestartTime(new Date());
ExecutionStatus runStatus = ExecutionStatus.RUNNING_EXECUTION;
int runTime = processInstance.getRunTimes();
switch (commandType) {
case START_PROCESS:
break;
case START_FAILURE_TASK_PROCESS:
List<Integer> failedList = this.findTaskIdByInstanceState(processInstance.getId(), ExecutionStatus.FAILURE); |
closed | apache/dolphinscheduler | https://github.com/apache/dolphinscheduler | 7,767 | Delete the log of ‘workflow instance’ The log of ‘task instance’ is not deleted in cascade | ### 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
删除 ‘工作流实例’的日志 ‘任务实例’的日志没有级联删除
### What you expected to happen
删除 ‘工作流实例’的日志 ‘任务实例’的日志级联删除
### How to reproduce
手工删除过 t_ds_task_instance 、t_ds_process_instance、t_ds_relation_process_instance
### Anything else
_No response_
### Version
2.0.1
### Are you willing to submit PR?
- [ ] Yes I am willing to submit a PR!
### Code of Conduct
- [ ] I agree to follow this project's [Code of Conduct](https://www.apache.org/foundation/policies/conduct)
| https://github.com/apache/dolphinscheduler/issues/7767 | https://github.com/apache/dolphinscheduler/pull/7768 | 4d16c24b6e78887927a9550a90b25bceb9b5c0b1 | 7395b980d3d76646dada5b7e9220d946b154001e | 2022-01-01T07:10:16Z | java | 2022-01-03T07:52:50Z | dolphinscheduler-service/src/main/java/org/apache/dolphinscheduler/service/process/ProcessService.java | List<Integer> toleranceList = this.findTaskIdByInstanceState(processInstance.getId(), ExecutionStatus.NEED_FAULT_TOLERANCE);
List<Integer> killedList = this.findTaskIdByInstanceState(processInstance.getId(), ExecutionStatus.KILL);
cmdParam.remove(Constants.CMD_PARAM_RECOVERY_START_NODE_STRING);
failedList.addAll(killedList);
failedList.addAll(toleranceList);
for (Integer taskId : failedList) {
initTaskInstance(this.findTaskInstanceById(taskId));
}
cmdParam.put(Constants.CMD_PARAM_RECOVERY_START_NODE_STRING,
String.join(Constants.COMMA, convertIntListToString(failedList)));
processInstance.setCommandParam(JSONUtils.toJsonString(cmdParam));
processInstance.setRunTimes(runTime + 1);
break;
case START_CURRENT_TASK_PROCESS:
break;
case RECOVER_WAITING_THREAD:
break;
case RECOVER_SUSPENDED_PROCESS:
cmdParam.remove(Constants.CMD_PARAM_RECOVERY_START_NODE_STRING);
List<Integer> suspendedNodeList = this.findTaskIdByInstanceState(processInstance.getId(), ExecutionStatus.PAUSE);
List<Integer> stopNodeList = findTaskIdByInstanceState(processInstance.getId(),
ExecutionStatus.KILL);
suspendedNodeList.addAll(stopNodeList);
for (Integer taskId : suspendedNodeList) {
initTaskInstance(this.findTaskInstanceById(taskId));
}
cmdParam.put(Constants.CMD_PARAM_RECOVERY_START_NODE_STRING, String.join(",", convertIntListToString(suspendedNodeList)));
processInstance.setCommandParam(JSONUtils.toJsonString(cmdParam)); |
closed | apache/dolphinscheduler | https://github.com/apache/dolphinscheduler | 7,767 | Delete the log of ‘workflow instance’ The log of ‘task instance’ is not deleted in cascade | ### 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
删除 ‘工作流实例’的日志 ‘任务实例’的日志没有级联删除
### What you expected to happen
删除 ‘工作流实例’的日志 ‘任务实例’的日志级联删除
### How to reproduce
手工删除过 t_ds_task_instance 、t_ds_process_instance、t_ds_relation_process_instance
### Anything else
_No response_
### Version
2.0.1
### Are you willing to submit PR?
- [ ] Yes I am willing to submit a PR!
### Code of Conduct
- [ ] I agree to follow this project's [Code of Conduct](https://www.apache.org/foundation/policies/conduct)
| https://github.com/apache/dolphinscheduler/issues/7767 | https://github.com/apache/dolphinscheduler/pull/7768 | 4d16c24b6e78887927a9550a90b25bceb9b5c0b1 | 7395b980d3d76646dada5b7e9220d946b154001e | 2022-01-01T07:10:16Z | java | 2022-01-03T07:52:50Z | dolphinscheduler-service/src/main/java/org/apache/dolphinscheduler/service/process/ProcessService.java | processInstance.setRunTimes(runTime + 1);
break;
case RECOVER_TOLERANCE_FAULT_PROCESS:
processInstance.setRecovery(Flag.YES);
runStatus = processInstance.getState();
break;
case COMPLEMENT_DATA:
if (processInstance.getId() != 0) {
List<TaskInstance> taskInstanceList = this.findValidTaskListByProcessId(processInstance.getId());
for (TaskInstance taskInstance : taskInstanceList) {
taskInstance.setFlag(Flag.NO);
this.updateTaskInstance(taskInstance);
}
}
break;
case REPEAT_RUNNING:
if (cmdParam.containsKey(Constants.CMD_PARAM_RECOVERY_START_NODE_STRING)) {
cmdParam.remove(Constants.CMD_PARAM_RECOVERY_START_NODE_STRING);
processInstance.setCommandParam(JSONUtils.toJsonString(cmdParam));
}
List<TaskInstance> validTaskList = findValidTaskListByProcessId(processInstance.getId());
for (TaskInstance taskInstance : validTaskList) {
taskInstance.setFlag(Flag.NO);
updateTaskInstance(taskInstance);
}
processInstance.setStartTime(new Date()); |
closed | apache/dolphinscheduler | https://github.com/apache/dolphinscheduler | 7,767 | Delete the log of ‘workflow instance’ The log of ‘task instance’ is not deleted in cascade | ### 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
删除 ‘工作流实例’的日志 ‘任务实例’的日志没有级联删除
### What you expected to happen
删除 ‘工作流实例’的日志 ‘任务实例’的日志级联删除
### How to reproduce
手工删除过 t_ds_task_instance 、t_ds_process_instance、t_ds_relation_process_instance
### Anything else
_No response_
### Version
2.0.1
### Are you willing to submit PR?
- [ ] Yes I am willing to submit a PR!
### Code of Conduct
- [ ] I agree to follow this project's [Code of Conduct](https://www.apache.org/foundation/policies/conduct)
| https://github.com/apache/dolphinscheduler/issues/7767 | https://github.com/apache/dolphinscheduler/pull/7768 | 4d16c24b6e78887927a9550a90b25bceb9b5c0b1 | 7395b980d3d76646dada5b7e9220d946b154001e | 2022-01-01T07:10:16Z | java | 2022-01-03T07:52:50Z | dolphinscheduler-service/src/main/java/org/apache/dolphinscheduler/service/process/ProcessService.java | processInstance.setRestartTime(processInstance.getStartTime());
processInstance.setEndTime(null);
processInstance.setRunTimes(runTime + 1);
initComplementDataParam(processDefinition, processInstance, cmdParam);
break;
case SCHEDULER:
break;
default:
break;
}
processInstance.setState(runStatus);
return processInstance;
}
/**
* get process definition by command
* If it is a fault-tolerant command, get the specified version of ProcessDefinition through ProcessInstance
* Otherwise, get the latest version of ProcessDefinition
*
* @return ProcessDefinition
*/
private ProcessDefinition getProcessDefinitionByCommand(long processDefinitionCode, Map<String, String> cmdParam) {
if (cmdParam != null) {
int processInstanceId = 0;
if (cmdParam.containsKey(Constants.CMD_PARAM_RECOVER_PROCESS_ID_STRING)) {
processInstanceId = Integer.parseInt(cmdParam.get(Constants.CMD_PARAM_RECOVER_PROCESS_ID_STRING));
} else if (cmdParam.containsKey(Constants.CMD_PARAM_SUB_PROCESS)) {
processInstanceId = Integer.parseInt(cmdParam.get(Constants.CMD_PARAM_SUB_PROCESS));
} else if (cmdParam.containsKey(Constants.CMD_PARAM_RECOVERY_WAITING_THREAD)) {
processInstanceId = Integer.parseInt(cmdParam.get(Constants.CMD_PARAM_RECOVERY_WAITING_THREAD));
} |
closed | apache/dolphinscheduler | https://github.com/apache/dolphinscheduler | 7,767 | Delete the log of ‘workflow instance’ The log of ‘task instance’ is not deleted in cascade | ### 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
删除 ‘工作流实例’的日志 ‘任务实例’的日志没有级联删除
### What you expected to happen
删除 ‘工作流实例’的日志 ‘任务实例’的日志级联删除
### How to reproduce
手工删除过 t_ds_task_instance 、t_ds_process_instance、t_ds_relation_process_instance
### Anything else
_No response_
### Version
2.0.1
### Are you willing to submit PR?
- [ ] Yes I am willing to submit a PR!
### Code of Conduct
- [ ] I agree to follow this project's [Code of Conduct](https://www.apache.org/foundation/policies/conduct)
| https://github.com/apache/dolphinscheduler/issues/7767 | https://github.com/apache/dolphinscheduler/pull/7768 | 4d16c24b6e78887927a9550a90b25bceb9b5c0b1 | 7395b980d3d76646dada5b7e9220d946b154001e | 2022-01-01T07:10:16Z | java | 2022-01-03T07:52:50Z | dolphinscheduler-service/src/main/java/org/apache/dolphinscheduler/service/process/ProcessService.java | 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
*
* @param processDefinition processDefinition
* @param processInstance processInstance |
closed | apache/dolphinscheduler | https://github.com/apache/dolphinscheduler | 7,767 | Delete the log of ‘workflow instance’ The log of ‘task instance’ is not deleted in cascade | ### 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
删除 ‘工作流实例’的日志 ‘任务实例’的日志没有级联删除
### What you expected to happen
删除 ‘工作流实例’的日志 ‘任务实例’的日志级联删除
### How to reproduce
手工删除过 t_ds_task_instance 、t_ds_process_instance、t_ds_relation_process_instance
### Anything else
_No response_
### Version
2.0.1
### Are you willing to submit PR?
- [ ] Yes I am willing to submit a PR!
### Code of Conduct
- [ ] I agree to follow this project's [Code of Conduct](https://www.apache.org/foundation/policies/conduct)
| https://github.com/apache/dolphinscheduler/issues/7767 | https://github.com/apache/dolphinscheduler/pull/7768 | 4d16c24b6e78887927a9550a90b25bceb9b5c0b1 | 7395b980d3d76646dada5b7e9220d946b154001e | 2022-01-01T07:10:16Z | java | 2022-01-03T07:52:50Z | dolphinscheduler-service/src/main/java/org/apache/dolphinscheduler/service/process/ProcessService.java | * @param cmdParam cmdParam
*/
private void initComplementDataParam(ProcessDefinition processDefinition,
ProcessInstance processInstance,
Map<String, String> cmdParam) {
if (!processInstance.isComplementData()) {
return;
}
Date start = DateUtils.stringToDate(cmdParam.get(CMDPARAM_COMPLEMENT_DATA_START_DATE));
Date end = DateUtils.stringToDate(cmdParam.get(CMDPARAM_COMPLEMENT_DATA_END_DATE));
List<Schedule> listSchedules = queryReleaseSchedulerListByProcessDefinitionCode(processInstance.getProcessDefinitionCode());
List<Date> complementDate = CronUtils.getSelfFireDateList(start, end, listSchedules);
if (complementDate.size() > 0
&& Flag.NO == processInstance.getIsSubProcess()) {
processInstance.setScheduleTime(complementDate.get(0));
}
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(); |
closed | apache/dolphinscheduler | https://github.com/apache/dolphinscheduler | 7,767 | Delete the log of ‘workflow instance’ The log of ‘task instance’ is not deleted in cascade | ### 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
删除 ‘工作流实例’的日志 ‘任务实例’的日志没有级联删除
### What you expected to happen
删除 ‘工作流实例’的日志 ‘任务实例’的日志级联删除
### How to reproduce
手工删除过 t_ds_task_instance 、t_ds_process_instance、t_ds_relation_process_instance
### Anything else
_No response_
### Version
2.0.1
### Are you willing to submit PR?
- [ ] Yes I am willing to submit a PR!
### Code of Conduct
- [ ] I agree to follow this project's [Code of Conduct](https://www.apache.org/foundation/policies/conduct)
| https://github.com/apache/dolphinscheduler/issues/7767 | https://github.com/apache/dolphinscheduler/pull/7768 | 4d16c24b6e78887927a9550a90b25bceb9b5c0b1 | 7395b980d3d76646dada5b7e9220d946b154001e | 2022-01-01T07:10:16Z | java | 2022-01-03T07:52:50Z | dolphinscheduler-service/src/main/java/org/apache/dolphinscheduler/service/process/ProcessService.java | if (StringUtils.isEmpty(cmdParam)) {
return;
}
Map<String, String> paramMap = JSONUtils.toMap(cmdParam);
if (paramMap.containsKey(CMD_PARAM_SUB_PROCESS)
&& CMD_PARAM_EMPTY_SUB_PROCESS.equals(paramMap.get(CMD_PARAM_SUB_PROCESS))) {
paramMap.remove(CMD_PARAM_SUB_PROCESS);
paramMap.put(CMD_PARAM_SUB_PROCESS, String.valueOf(subProcessInstance.getId()));
subProcessInstance.setCommandParam(JSONUtils.toJsonString(paramMap));
subProcessInstance.setIsSubProcess(Flag.YES);
this.saveProcessInstance(subProcessInstance);
}
String parentInstanceId = paramMap.get(CMD_PARAM_SUB_PROCESS_PARENT_INSTANCE_ID);
if (StringUtils.isNotEmpty(parentInstanceId)) {
ProcessInstance parentInstance = findProcessInstanceDetailById(Integer.parseInt(parentInstanceId));
if (parentInstance != null) {
subProcessInstance.setGlobalParams(
joinGlobalParams(parentInstance.getGlobalParams(), subProcessInstance.getGlobalParams()));
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;
} |
closed | apache/dolphinscheduler | https://github.com/apache/dolphinscheduler | 7,767 | Delete the log of ‘workflow instance’ The log of ‘task instance’ is not deleted in cascade | ### 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
删除 ‘工作流实例’的日志 ‘任务实例’的日志没有级联删除
### What you expected to happen
删除 ‘工作流实例’的日志 ‘任务实例’的日志级联删除
### How to reproduce
手工删除过 t_ds_task_instance 、t_ds_process_instance、t_ds_relation_process_instance
### Anything else
_No response_
### Version
2.0.1
### Are you willing to submit PR?
- [ ] Yes I am willing to submit a PR!
### Code of Conduct
- [ ] I agree to follow this project's [Code of Conduct](https://www.apache.org/foundation/policies/conduct)
| https://github.com/apache/dolphinscheduler/issues/7767 | https://github.com/apache/dolphinscheduler/pull/7768 | 4d16c24b6e78887927a9550a90b25bceb9b5c0b1 | 7395b980d3d76646dada5b7e9220d946b154001e | 2022-01-01T07:10:16Z | java | 2022-01-03T07:52:50Z | dolphinscheduler-service/src/main/java/org/apache/dolphinscheduler/service/process/ProcessService.java | processInstanceMap.setProcessInstanceId(subProcessInstance.getId());
this.updateWorkProcessInstanceMap(processInstanceMap);
}
/**
* join parent global params into sub process.
* only the keys doesn't in sub process global would be joined.
*
* @param parentGlobalParams parentGlobalParams
* @param subGlobalParams subGlobalParams
* @return global params join
*/
private String joinGlobalParams(String parentGlobalParams, String subGlobalParams) {
List<Property> parentPropertyList = JSONUtils.toList(parentGlobalParams, Property.class);
List<Property> subPropertyList = JSONUtils.toList(subGlobalParams, Property.class);
subPropertyList = new ArrayList<>(subPropertyList);
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) { |
Subsets and Splits
No community queries yet
The top public SQL queries from the community will appear here once available.