status
stringclasses 1
value | repo_name
stringclasses 31
values | repo_url
stringclasses 31
values | issue_id
int64 1
104k
| title
stringlengths 4
233
| body
stringlengths 0
186k
⌀ | issue_url
stringlengths 38
56
| pull_url
stringlengths 37
54
| before_fix_sha
stringlengths 40
40
| after_fix_sha
stringlengths 40
40
| report_datetime
unknown | language
stringclasses 5
values | commit_datetime
unknown | updated_file
stringlengths 7
188
| chunk_content
stringlengths 1
1.03M
|
|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|
closed | apache/dolphinscheduler | https://github.com/apache/dolphinscheduler | 6,474 | [Improvement] [MasterServer] schedule time for process instance optimization | ### Search before asking
- [X] I had searched in the [issues](https://github.com/apache/dolphinscheduler/issues?q=is%3Aissue) and found no similar issues.
### What happened
branch: dev
When I use arthas to trace methods by complete data mode, I found that ProcessService.constructProcessInstance is slow because three point:
- getScheduleTime, which seems like to handle in api is better;
- complete data type handle, delete all the valid tasks when complement data;
- initComplementDataParam, the schedule time again;
### What you expected to happen
construct process instance is more quickly without needless DB operation;
### How to reproduce
use arthas to trace ProcessService.constructProcessInstance
### Anything else
_No response_
### Are you willing to submit PR?
- [X] Yes I am willing to submit a PR!
### Code of Conduct
- [X] I agree to follow this project's [Code of Conduct](https://www.apache.org/foundation/policies/conduct)
| https://github.com/apache/dolphinscheduler/issues/6474 | https://github.com/apache/dolphinscheduler/pull/6477 | ea493534df7b924220c9c1e7f6529f548d3912c9 | e091801e05c8e9243ec96f76a2e7cc1f1f5cecab | "2021-10-09T09:23:27Z" | java | "2021-10-11T07:13:38Z" | dolphinscheduler-service/src/main/java/org/apache/dolphinscheduler/service/process/ProcessService.java | 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);
List<Project> authedProjects = projectMapper.queryAuthedProjectListByUserId(userId);
if (createProjects == null) {
createProjects = new ArrayList<>();
}
if (authedProjects != null) {
createProjects.addAll(authedProjects);
}
return createProjects;
}
/** |
closed | apache/dolphinscheduler | https://github.com/apache/dolphinscheduler | 6,474 | [Improvement] [MasterServer] schedule time for process instance optimization | ### Search before asking
- [X] I had searched in the [issues](https://github.com/apache/dolphinscheduler/issues?q=is%3Aissue) and found no similar issues.
### What happened
branch: dev
When I use arthas to trace methods by complete data mode, I found that ProcessService.constructProcessInstance is slow because three point:
- getScheduleTime, which seems like to handle in api is better;
- complete data type handle, delete all the valid tasks when complement data;
- initComplementDataParam, the schedule time again;
### What you expected to happen
construct process instance is more quickly without needless DB operation;
### How to reproduce
use arthas to trace ProcessService.constructProcessInstance
### Anything else
_No response_
### Are you willing to submit PR?
- [X] Yes I am willing to submit a PR!
### Code of Conduct
- [X] I agree to follow this project's [Code of Conduct](https://www.apache.org/foundation/policies/conduct)
| https://github.com/apache/dolphinscheduler/issues/6474 | https://github.com/apache/dolphinscheduler/pull/6477 | ea493534df7b924220c9c1e7f6529f548d3912c9 | e091801e05c8e9243ec96f76a2e7cc1f1f5cecab | "2021-10-09T09:23:27Z" | java | "2021-10-11T07:13:38Z" | dolphinscheduler-service/src/main/java/org/apache/dolphinscheduler/service/process/ProcessService.java | * 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);
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()); |
closed | apache/dolphinscheduler | https://github.com/apache/dolphinscheduler | 6,474 | [Improvement] [MasterServer] schedule time for process instance optimization | ### Search before asking
- [X] I had searched in the [issues](https://github.com/apache/dolphinscheduler/issues?q=is%3Aissue) and found no similar issues.
### What happened
branch: dev
When I use arthas to trace methods by complete data mode, I found that ProcessService.constructProcessInstance is slow because three point:
- getScheduleTime, which seems like to handle in api is better;
- complete data type handle, delete all the valid tasks when complement data;
- initComplementDataParam, the schedule time again;
### What you expected to happen
construct process instance is more quickly without needless DB operation;
### How to reproduce
use arthas to trace ProcessService.constructProcessInstance
### Anything else
_No response_
### Are you willing to submit PR?
- [X] Yes I am willing to submit a PR!
### Code of Conduct
- [X] I agree to follow this project's [Code of Conduct](https://www.apache.org/foundation/policies/conduct)
| https://github.com/apache/dolphinscheduler/issues/6474 | https://github.com/apache/dolphinscheduler/pull/6477 | ea493534df7b924220c9c1e7f6529f548d3912c9 | e091801e05c8e9243ec96f76a2e7cc1f1f5cecab | "2021-10-09T09:23:27Z" | java | "2021-10-11T07:13:38Z" | dolphinscheduler-service/src/main/java/org/apache/dolphinscheduler/service/process/ProcessService.java | 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
*
* @param resourceId resource id
* @return Resource
*/
public Resource getResourceById(int resourceId) {
return resourceMapper.selectById(resourceId);
}
/**
* list resources by ids
* |
closed | apache/dolphinscheduler | https://github.com/apache/dolphinscheduler | 6,474 | [Improvement] [MasterServer] schedule time for process instance optimization | ### Search before asking
- [X] I had searched in the [issues](https://github.com/apache/dolphinscheduler/issues?q=is%3Aissue) and found no similar issues.
### What happened
branch: dev
When I use arthas to trace methods by complete data mode, I found that ProcessService.constructProcessInstance is slow because three point:
- getScheduleTime, which seems like to handle in api is better;
- complete data type handle, delete all the valid tasks when complement data;
- initComplementDataParam, the schedule time again;
### What you expected to happen
construct process instance is more quickly without needless DB operation;
### How to reproduce
use arthas to trace ProcessService.constructProcessInstance
### Anything else
_No response_
### Are you willing to submit PR?
- [X] Yes I am willing to submit a PR!
### Code of Conduct
- [X] I agree to follow this project's [Code of Conduct](https://www.apache.org/foundation/policies/conduct)
| https://github.com/apache/dolphinscheduler/issues/6474 | https://github.com/apache/dolphinscheduler/pull/6477 | ea493534df7b924220c9c1e7f6529f548d3912c9 | e091801e05c8e9243ec96f76a2e7cc1f1f5cecab | "2021-10-09T09:23:27Z" | java | "2021-10-11T07:13:38Z" | dolphinscheduler-service/src/main/java/org/apache/dolphinscheduler/service/process/ProcessService.java | * @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());
}
/**
* 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); |
closed | apache/dolphinscheduler | https://github.com/apache/dolphinscheduler | 6,474 | [Improvement] [MasterServer] schedule time for process instance optimization | ### Search before asking
- [X] I had searched in the [issues](https://github.com/apache/dolphinscheduler/issues?q=is%3Aissue) and found no similar issues.
### What happened
branch: dev
When I use arthas to trace methods by complete data mode, I found that ProcessService.constructProcessInstance is slow because three point:
- getScheduleTime, which seems like to handle in api is better;
- complete data type handle, delete all the valid tasks when complement data;
- initComplementDataParam, the schedule time again;
### What you expected to happen
construct process instance is more quickly without needless DB operation;
### How to reproduce
use arthas to trace ProcessService.constructProcessInstance
### Anything else
_No response_
### Are you willing to submit PR?
- [X] Yes I am willing to submit a PR!
### Code of Conduct
- [X] I agree to follow this project's [Code of Conduct](https://www.apache.org/foundation/policies/conduct)
| https://github.com/apache/dolphinscheduler/issues/6474 | https://github.com/apache/dolphinscheduler/pull/6477 | ea493534df7b924220c9c1e7f6529f548d3912c9 | e091801e05c8e9243ec96f76a2e7cc1f1f5cecab | "2021-10-09T09:23:27Z" | java | "2021-10-11T07:13:38Z" | dolphinscheduler-service/src/main/java/org/apache/dolphinscheduler/service/process/ProcessService.java | 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
*
* @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) |
closed | apache/dolphinscheduler | https://github.com/apache/dolphinscheduler | 6,474 | [Improvement] [MasterServer] schedule time for process instance optimization | ### Search before asking
- [X] I had searched in the [issues](https://github.com/apache/dolphinscheduler/issues?q=is%3Aissue) and found no similar issues.
### What happened
branch: dev
When I use arthas to trace methods by complete data mode, I found that ProcessService.constructProcessInstance is slow because three point:
- getScheduleTime, which seems like to handle in api is better;
- complete data type handle, delete all the valid tasks when complement data;
- initComplementDataParam, the schedule time again;
### What you expected to happen
construct process instance is more quickly without needless DB operation;
### How to reproduce
use arthas to trace ProcessService.constructProcessInstance
### Anything else
_No response_
### Are you willing to submit PR?
- [X] Yes I am willing to submit a PR!
### Code of Conduct
- [X] I agree to follow this project's [Code of Conduct](https://www.apache.org/foundation/policies/conduct)
| https://github.com/apache/dolphinscheduler/issues/6474 | https://github.com/apache/dolphinscheduler/pull/6477 | ea493534df7b924220c9c1e7f6529f548d3912c9 | e091801e05c8e9243ec96f76a2e7cc1f1f5cecab | "2021-10-09T09:23:27Z" | java | "2021-10-11T07:13:38Z" | dolphinscheduler-service/src/main/java/org/apache/dolphinscheduler/service/process/ProcessService.java | .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
.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; |
closed | apache/dolphinscheduler | https://github.com/apache/dolphinscheduler | 6,474 | [Improvement] [MasterServer] schedule time for process instance optimization | ### Search before asking
- [X] I had searched in the [issues](https://github.com/apache/dolphinscheduler/issues?q=is%3Aissue) and found no similar issues.
### What happened
branch: dev
When I use arthas to trace methods by complete data mode, I found that ProcessService.constructProcessInstance is slow because three point:
- getScheduleTime, which seems like to handle in api is better;
- complete data type handle, delete all the valid tasks when complement data;
- initComplementDataParam, the schedule time again;
### What you expected to happen
construct process instance is more quickly without needless DB operation;
### How to reproduce
use arthas to trace ProcessService.constructProcessInstance
### Anything else
_No response_
### Are you willing to submit PR?
- [X] Yes I am willing to submit a PR!
### Code of Conduct
- [X] I agree to follow this project's [Code of Conduct](https://www.apache.org/foundation/policies/conduct)
| https://github.com/apache/dolphinscheduler/issues/6474 | https://github.com/apache/dolphinscheduler/pull/6477 | ea493534df7b924220c9c1e7f6529f548d3912c9 | e091801e05c8e9243ec96f76a2e7cc1f1f5cecab | "2021-10-09T09:23:27Z" | java | "2021-10-11T07:13:38Z" | dolphinscheduler-service/src/main/java/org/apache/dolphinscheduler/service/process/ProcessService.java | }
}
taskDefinitionLog.setUserId(operator.getId());
taskDefinitionLog.setVersion(Constants.VERSION_FIRST);
taskDefinitionLog.setCreateTime(now);
if (taskDefinitionLog.getCode() == 0) {
try {
taskDefinitionLog.setCode(SnowFlakeUtils.getInstance().nextId());
} catch (SnowFlakeException e) {
logger.error("Task code get error, ", e);
return 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) {
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); |
closed | apache/dolphinscheduler | https://github.com/apache/dolphinscheduler | 6,474 | [Improvement] [MasterServer] schedule time for process instance optimization | ### Search before asking
- [X] I had searched in the [issues](https://github.com/apache/dolphinscheduler/issues?q=is%3Aissue) and found no similar issues.
### What happened
branch: dev
When I use arthas to trace methods by complete data mode, I found that ProcessService.constructProcessInstance is slow because three point:
- getScheduleTime, which seems like to handle in api is better;
- complete data type handle, delete all the valid tasks when complement data;
- initComplementDataParam, the schedule time again;
### What you expected to happen
construct process instance is more quickly without needless DB operation;
### How to reproduce
use arthas to trace ProcessService.constructProcessInstance
### Anything else
_No response_
### Are you willing to submit PR?
- [X] Yes I am willing to submit a PR!
### Code of Conduct
- [X] I agree to follow this project's [Code of Conduct](https://www.apache.org/foundation/policies/conduct)
| https://github.com/apache/dolphinscheduler/issues/6474 | https://github.com/apache/dolphinscheduler/pull/6477 | ea493534df7b924220c9c1e7f6529f548d3912c9 | e091801e05c8e9243ec96f76a2e7cc1f1f5cecab | "2021-10-09T09:23:27Z" | java | "2021-10-11T07:13:38Z" | dolphinscheduler-service/src/main/java/org/apache/dolphinscheduler/service/process/ProcessService.java | }
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());
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) {
Map<Long, TaskDefinitionLog> taskDefinitionLogMap = null; |
closed | apache/dolphinscheduler | https://github.com/apache/dolphinscheduler | 6,474 | [Improvement] [MasterServer] schedule time for process instance optimization | ### Search before asking
- [X] I had searched in the [issues](https://github.com/apache/dolphinscheduler/issues?q=is%3Aissue) and found no similar issues.
### What happened
branch: dev
When I use arthas to trace methods by complete data mode, I found that ProcessService.constructProcessInstance is slow because three point:
- getScheduleTime, which seems like to handle in api is better;
- complete data type handle, delete all the valid tasks when complement data;
- initComplementDataParam, the schedule time again;
### What you expected to happen
construct process instance is more quickly without needless DB operation;
### How to reproduce
use arthas to trace ProcessService.constructProcessInstance
### Anything else
_No response_
### Are you willing to submit PR?
- [X] Yes I am willing to submit a PR!
### Code of Conduct
- [X] I agree to follow this project's [Code of Conduct](https://www.apache.org/foundation/policies/conduct)
| https://github.com/apache/dolphinscheduler/issues/6474 | https://github.com/apache/dolphinscheduler/pull/6477 | ea493534df7b924220c9c1e7f6529f548d3912c9 | e091801e05c8e9243ec96f76a2e7cc1f1f5cecab | "2021-10-09T09:23:27Z" | java | "2021-10-11T07:13:38Z" | dolphinscheduler-service/src/main/java/org/apache/dolphinscheduler/service/process/ProcessService.java | if (CollectionUtils.isNotEmpty(taskDefinitionLogs)) {
taskDefinitionLogMap = taskDefinitionLogs.stream()
.collect(Collectors.toMap(TaskDefinition::getCode, taskDefinitionLog -> taskDefinitionLog));
}
Date now = new Date();
for (ProcessTaskRelationLog processTaskRelationLog : taskRelationList) {
processTaskRelationLog.setProjectCode(projectCode);
processTaskRelationLog.setProcessDefinitionCode(processDefinitionCode);
processTaskRelationLog.setProcessDefinitionVersion(processDefinitionVersion);
if (taskDefinitionLogMap != null) {
TaskDefinitionLog taskDefinitionLog = taskDefinitionLogMap.get(processTaskRelationLog.getPreTaskCode());
if (taskDefinitionLog != null) {
processTaskRelationLog.setPreTaskVersion(taskDefinitionLog.getVersion());
}
processTaskRelationLog.setPostTaskVersion(taskDefinitionLogMap.get(processTaskRelationLog.getPostTaskCode()).getVersion());
}
processTaskRelationLog.setCreateTime(now);
processTaskRelationLog.setUpdateTime(now);
processTaskRelationLog.setOperator(operator.getId());
processTaskRelationLog.setOperateTime(now);
}
List<ProcessTaskRelation> processTaskRelationList = processTaskRelationMapper.queryByProcessCode(projectCode, processDefinitionCode);
if (!processTaskRelationList.isEmpty()) {
Set<Integer> processTaskRelationSet = processTaskRelationList.stream().map(ProcessTaskRelation::hashCode).collect(toSet());
Set<Integer> taskRelationSet = taskRelationList.stream().map(ProcessTaskRelationLog::hashCode).collect(toSet());
if (CollectionUtils.isEqualCollection(processTaskRelationSet, taskRelationSet)) {
return Constants.EXIT_CODE_SUCCESS;
}
processTaskRelationMapper.deleteByCode(projectCode, processDefinitionCode);
} |
closed | apache/dolphinscheduler | https://github.com/apache/dolphinscheduler | 6,474 | [Improvement] [MasterServer] schedule time for process instance optimization | ### Search before asking
- [X] I had searched in the [issues](https://github.com/apache/dolphinscheduler/issues?q=is%3Aissue) and found no similar issues.
### What happened
branch: dev
When I use arthas to trace methods by complete data mode, I found that ProcessService.constructProcessInstance is slow because three point:
- getScheduleTime, which seems like to handle in api is better;
- complete data type handle, delete all the valid tasks when complement data;
- initComplementDataParam, the schedule time again;
### What you expected to happen
construct process instance is more quickly without needless DB operation;
### How to reproduce
use arthas to trace ProcessService.constructProcessInstance
### Anything else
_No response_
### Are you willing to submit PR?
- [X] Yes I am willing to submit a PR!
### Code of Conduct
- [X] I agree to follow this project's [Code of Conduct](https://www.apache.org/foundation/policies/conduct)
| https://github.com/apache/dolphinscheduler/issues/6474 | https://github.com/apache/dolphinscheduler/pull/6477 | ea493534df7b924220c9c1e7f6529f548d3912c9 | e091801e05c8e9243ec96f76a2e7cc1f1f5cecab | "2021-10-09T09:23:27Z" | java | "2021-10-11T07:13:38Z" | dolphinscheduler-service/src/main/java/org/apache/dolphinscheduler/service/process/ProcessService.java | 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);
// c
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()); |
closed | apache/dolphinscheduler | https://github.com/apache/dolphinscheduler | 6,474 | [Improvement] [MasterServer] schedule time for process instance optimization | ### Search before asking
- [X] I had searched in the [issues](https://github.com/apache/dolphinscheduler/issues?q=is%3Aissue) and found no similar issues.
### What happened
branch: dev
When I use arthas to trace methods by complete data mode, I found that ProcessService.constructProcessInstance is slow because three point:
- getScheduleTime, which seems like to handle in api is better;
- complete data type handle, delete all the valid tasks when complement data;
- initComplementDataParam, the schedule time again;
### What you expected to happen
construct process instance is more quickly without needless DB operation;
### How to reproduce
use arthas to trace ProcessService.constructProcessInstance
### Anything else
_No response_
### Are you willing to submit PR?
- [X] Yes I am willing to submit a PR!
### Code of Conduct
- [X] I agree to follow this project's [Code of Conduct](https://www.apache.org/foundation/policies/conduct)
| https://github.com/apache/dolphinscheduler/issues/6474 | https://github.com/apache/dolphinscheduler/pull/6477 | ea493534df7b924220c9c1e7f6529f548d3912c9 | e091801e05c8e9243ec96f76a2e7cc1f1f5cecab | "2021-10-09T09:23:27Z" | java | "2021-10-11T07:13:38Z" | dolphinscheduler-service/src/main/java/org/apache/dolphinscheduler/service/process/ProcessService.java | ProcessDag processDag = DagHelper.getProcessDag(taskNodeList, new ArrayList<>(processTaskRelations));
// G
return DagHelper.buildDagGraph(processDag);
}
/**
* generate DagData
*/
public DagData genDagData(ProcessDefinition processDefinition) {
List<ProcessTaskRelation> processTaskRelations = processTaskRelationMapper.queryByProcessCode(processDefinition.getProjectCode(), processDefinition.getCode());
List<TaskDefinitionLog> taskDefinitionLogList = genTaskDefineList(processTaskRelations);
List<TaskDefinition> taskDefinitions = taskDefinitionLogList.stream()
.map(taskDefinitionLog -> JSONUtils.parseObject(JSONUtils.toJsonString(taskDefinitionLog), TaskDefinition.class))
.collect(Collectors.toList());
return new DagData(processDefinition, processTaskRelations, taskDefinitions);
}
public List<TaskDefinitionLog> genTaskDefineList(List<ProcessTaskRelation> processTaskRelations) {
Set<TaskDefinition> taskDefinitionSet = new HashSet<>();
for (ProcessTaskRelation processTaskRelation : processTaskRelations) {
if (processTaskRelation.getPreTaskCode() > 0) {
taskDefinitionSet.add(new TaskDefinition(processTaskRelation.getPreTaskCode(), processTaskRelation.getPreTaskVersion()));
}
if (processTaskRelation.getPostTaskCode() > 0) {
taskDefinitionSet.add(new TaskDefinition(processTaskRelation.getPostTaskCode(), processTaskRelation.getPostTaskVersion()));
}
}
return taskDefinitionLogMapper.queryByTaskDefinitions(taskDefinitionSet);
}
/**
* find task definition by code and version
*/ |
closed | apache/dolphinscheduler | https://github.com/apache/dolphinscheduler | 6,474 | [Improvement] [MasterServer] schedule time for process instance optimization | ### Search before asking
- [X] I had searched in the [issues](https://github.com/apache/dolphinscheduler/issues?q=is%3Aissue) and found no similar issues.
### What happened
branch: dev
When I use arthas to trace methods by complete data mode, I found that ProcessService.constructProcessInstance is slow because three point:
- getScheduleTime, which seems like to handle in api is better;
- complete data type handle, delete all the valid tasks when complement data;
- initComplementDataParam, the schedule time again;
### What you expected to happen
construct process instance is more quickly without needless DB operation;
### How to reproduce
use arthas to trace ProcessService.constructProcessInstance
### Anything else
_No response_
### Are you willing to submit PR?
- [X] Yes I am willing to submit a PR!
### Code of Conduct
- [X] I agree to follow this project's [Code of Conduct](https://www.apache.org/foundation/policies/conduct)
| https://github.com/apache/dolphinscheduler/issues/6474 | https://github.com/apache/dolphinscheduler/pull/6477 | ea493534df7b924220c9c1e7f6529f548d3912c9 | e091801e05c8e9243ec96f76a2e7cc1f1f5cecab | "2021-10-09T09:23:27Z" | java | "2021-10-11T07:13:38Z" | dolphinscheduler-service/src/main/java/org/apache/dolphinscheduler/service/process/ProcessService.java | 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) {
Map<Long, List<Long>> taskCodeMap = new HashMap<>();
for (ProcessTaskRelation processTaskRelation : taskRelationList) {
taskCodeMap.compute(processTaskRelation.getPostTaskCode(), (k, v) -> {
if (v == null) {
v = new ArrayList<>();
} |
closed | apache/dolphinscheduler | https://github.com/apache/dolphinscheduler | 6,474 | [Improvement] [MasterServer] schedule time for process instance optimization | ### Search before asking
- [X] I had searched in the [issues](https://github.com/apache/dolphinscheduler/issues?q=is%3Aissue) and found no similar issues.
### What happened
branch: dev
When I use arthas to trace methods by complete data mode, I found that ProcessService.constructProcessInstance is slow because three point:
- getScheduleTime, which seems like to handle in api is better;
- complete data type handle, delete all the valid tasks when complement data;
- initComplementDataParam, the schedule time again;
### What you expected to happen
construct process instance is more quickly without needless DB operation;
### How to reproduce
use arthas to trace ProcessService.constructProcessInstance
### Anything else
_No response_
### Are you willing to submit PR?
- [X] Yes I am willing to submit a PR!
### Code of Conduct
- [X] I agree to follow this project's [Code of Conduct](https://www.apache.org/foundation/policies/conduct)
| https://github.com/apache/dolphinscheduler/issues/6474 | https://github.com/apache/dolphinscheduler/pull/6477 | ea493534df7b924220c9c1e7f6529f548d3912c9 | e091801e05c8e9243ec96f76a2e7cc1f1f5cecab | "2021-10-09T09:23:27Z" | java | "2021-10-11T07:13:38Z" | dolphinscheduler-service/src/main/java/org/apache/dolphinscheduler/service/process/ProcessService.java | if (processTaskRelation.getPreTaskCode() != 0L) {
v.add(processTaskRelation.getPreTaskCode());
}
return v;
});
}
if (CollectionUtils.isEmpty(taskDefinitionLogs)) {
taskDefinitionLogs = genTaskDefineList(taskRelationList);
}
Map<Long, TaskDefinitionLog> taskDefinitionLogMap = taskDefinitionLogs.stream()
.collect(Collectors.toMap(TaskDefinitionLog::getCode, taskDefinitionLog -> taskDefinitionLog));
List<TaskNode> taskNodeList = new ArrayList<>();
for (Entry<Long, List<Long>> code : taskCodeMap.entrySet()) {
TaskDefinitionLog taskDefinitionLog = taskDefinitionLogMap.get(code.getKey());
if (taskDefinitionLog != null) {
TaskNode taskNode = new TaskNode();
taskNode.setCode(taskDefinitionLog.getCode());
taskNode.setVersion(taskDefinitionLog.getVersion());
taskNode.setName(taskDefinitionLog.getName());
taskNode.setDesc(taskDefinitionLog.getDescription());
taskNode.setType(taskDefinitionLog.getTaskType().toUpperCase());
taskNode.setRunFlag(taskDefinitionLog.getFlag() == Flag.YES ? Constants.FLOWNODE_RUN_FLAG_NORMAL : Constants.FLOWNODE_RUN_FLAG_FORBIDDEN);
taskNode.setMaxRetryTimes(taskDefinitionLog.getFailRetryTimes());
taskNode.setRetryInterval(taskDefinitionLog.getFailRetryInterval());
Map<String, Object> taskParamsMap = taskNode.taskParamsToJsonObj(taskDefinitionLog.getTaskParams());
taskNode.setConditionResult(JSONUtils.toJsonString(taskParamsMap.get(Constants.CONDITION_RESULT)));
taskNode.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); |
closed | apache/dolphinscheduler | https://github.com/apache/dolphinscheduler | 6,474 | [Improvement] [MasterServer] schedule time for process instance optimization | ### Search before asking
- [X] I had searched in the [issues](https://github.com/apache/dolphinscheduler/issues?q=is%3Aissue) and found no similar issues.
### What happened
branch: dev
When I use arthas to trace methods by complete data mode, I found that ProcessService.constructProcessInstance is slow because three point:
- getScheduleTime, which seems like to handle in api is better;
- complete data type handle, delete all the valid tasks when complement data;
- initComplementDataParam, the schedule time again;
### What you expected to happen
construct process instance is more quickly without needless DB operation;
### How to reproduce
use arthas to trace ProcessService.constructProcessInstance
### Anything else
_No response_
### Are you willing to submit PR?
- [X] Yes I am willing to submit a PR!
### Code of Conduct
- [X] I agree to follow this project's [Code of Conduct](https://www.apache.org/foundation/policies/conduct)
| https://github.com/apache/dolphinscheduler/issues/6474 | https://github.com/apache/dolphinscheduler/pull/6477 | ea493534df7b924220c9c1e7f6529f548d3912c9 | e091801e05c8e9243ec96f76a2e7cc1f1f5cecab | "2021-10-09T09:23:27Z" | java | "2021-10-11T07:13:38Z" | dolphinscheduler-service/src/main/java/org/apache/dolphinscheduler/service/process/ProcessService.java | 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())));
taskNodeList.add(taskNode);
}
}
return taskNodeList;
}
public Map<ProcessInstance, TaskInstance> notifyProcessList(int processId, int taskId) {
HashMap<ProcessInstance, TaskInstance> processTaskMap = new HashMap<>();
//fi
ProcessInstanceMap processInstanceMap = processInstanceMapMapper.queryBySubProcessId(processId);
if (processInstanceMap == null) {
return processTaskMap;
}
ProcessInstance fatherProcess = this.findProcessInstanceById(processInstanceMap.getParentProcessInstanceId());
TaskInstance fatherTask = this.findTaskInstanceById(processInstanceMap.getParentTaskInstanceId());
if (fatherProcess != null) {
processTaskMap.put(fatherProcess, fatherTask);
}
return processTaskMap;
}
} |
closed | apache/dolphinscheduler | https://github.com/apache/dolphinscheduler | 6,478 | [Bug] [API & SERVICE] Missing history data in complement data mode | ### Search before asking
- [X] I had searched in the [issues](https://github.com/apache/dolphinscheduler/issues?q=is%3Aissue) and found no similar issues.
### What happened
1.I have an hourly workflow，the crontab is ："0 0 * * * ? *"
我有一个每小时运行的工作流，crontab 是 :"0 0 * * * ? *"
2. I want to add history data
我去补一个历史数据，数据范围是0点到3点59分
<img width="646" alt="aba7791b47ff5b28599a8f6885eeb52" src="https://user-images.githubusercontent.com/50513095/136656656-e0730af4-d6bc-4835-956a-4881a639230e.png">
3.the history data of 2021-10-09 03:00:00 not works
03点的数据没有运行
### What you expected to happen
I want the data of 2021-10-09 03:00:00 is works
我想要3点的数据执行
### How to reproduce
<img width="646" alt="fd5559070e8152804b241e41a2938b3" src="https://user-images.githubusercontent.com/50513095/136656799-6a19fe41-300e-4ea1-b27b-a680233a76a6.png">
### Anything else
_No response_
### 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/6478 | https://github.com/apache/dolphinscheduler/pull/6491 | e091801e05c8e9243ec96f76a2e7cc1f1f5cecab | 88690462b4b93f8df01ba1952374cdf00c02eda5 | "2021-10-09T11:53:38Z" | java | "2021-10-11T12:03:25Z" | dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/impl/ExecutorServiceImpl.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, |
closed | apache/dolphinscheduler | https://github.com/apache/dolphinscheduler | 6,478 | [Bug] [API & SERVICE] Missing history data in complement data mode | ### Search before asking
- [X] I had searched in the [issues](https://github.com/apache/dolphinscheduler/issues?q=is%3Aissue) and found no similar issues.
### What happened
1.I have an hourly workflow，the crontab is ："0 0 * * * ? *"
我有一个每小时运行的工作流，crontab 是 :"0 0 * * * ? *"
2. I want to add history data
我去补一个历史数据，数据范围是0点到3点59分
<img width="646" alt="aba7791b47ff5b28599a8f6885eeb52" src="https://user-images.githubusercontent.com/50513095/136656656-e0730af4-d6bc-4835-956a-4881a639230e.png">
3.the history data of 2021-10-09 03:00:00 not works
03点的数据没有运行
### What you expected to happen
I want the data of 2021-10-09 03:00:00 is works
我想要3点的数据执行
### How to reproduce
<img width="646" alt="fd5559070e8152804b241e41a2938b3" src="https://user-images.githubusercontent.com/50513095/136656799-6a19fe41-300e-4ea1-b27b-a680233a76a6.png">
### Anything else
_No response_
### 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/6478 | https://github.com/apache/dolphinscheduler/pull/6491 | e091801e05c8e9243ec96f76a2e7cc1f1f5cecab | 88690462b4b93f8df01ba1952374cdf00c02eda5 | "2021-10-09T11:53:38Z" | java | "2021-10-11T12:03:25Z" | dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/impl/ExecutorServiceImpl.java | * 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.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_RECOVER_PROCESS_ID_STRING;
import static org.apache.dolphinscheduler.common.Constants.CMD_PARAM_START_NODE_NAMES;
import static org.apache.dolphinscheduler.common.Constants.CMD_PARAM_START_PARAMS;
import static org.apache.dolphinscheduler.common.Constants.MAX_TASK_TIMEOUT;
import com.fasterxml.jackson.core.type.TypeReference;
import org.apache.dolphinscheduler.api.enums.ExecuteType;
import org.apache.dolphinscheduler.api.enums.Status;
import org.apache.dolphinscheduler.api.service.ExecutorService;
import org.apache.dolphinscheduler.api.service.MonitorService;
import org.apache.dolphinscheduler.api.service.ProjectService;
import org.apache.dolphinscheduler.common.Constants;
import org.apache.dolphinscheduler.common.enums.CommandType;
import org.apache.dolphinscheduler.common.enums.ExecutionStatus;
import org.apache.dolphinscheduler.common.enums.FailureStrategy;
import org.apache.dolphinscheduler.common.enums.Priority;
import org.apache.dolphinscheduler.common.enums.ReleaseState;
import org.apache.dolphinscheduler.common.enums.RunMode;
import org.apache.dolphinscheduler.common.enums.TaskDependType;
import org.apache.dolphinscheduler.common.enums.WarningType;
import org.apache.dolphinscheduler.common.model.Server;
import org.apache.dolphinscheduler.common.utils.CollectionUtils;
import org.apache.dolphinscheduler.common.utils.DateUtils;
import org.apache.dolphinscheduler.common.utils.JSONUtils; |
closed | apache/dolphinscheduler | https://github.com/apache/dolphinscheduler | 6,478 | [Bug] [API & SERVICE] Missing history data in complement data mode | ### Search before asking
- [X] I had searched in the [issues](https://github.com/apache/dolphinscheduler/issues?q=is%3Aissue) and found no similar issues.
### What happened
1.I have an hourly workflow，the crontab is ："0 0 * * * ? *"
我有一个每小时运行的工作流，crontab 是 :"0 0 * * * ? *"
2. I want to add history data
我去补一个历史数据，数据范围是0点到3点59分
<img width="646" alt="aba7791b47ff5b28599a8f6885eeb52" src="https://user-images.githubusercontent.com/50513095/136656656-e0730af4-d6bc-4835-956a-4881a639230e.png">
3.the history data of 2021-10-09 03:00:00 not works
03点的数据没有运行
### What you expected to happen
I want the data of 2021-10-09 03:00:00 is works
我想要3点的数据执行
### How to reproduce
<img width="646" alt="fd5559070e8152804b241e41a2938b3" src="https://user-images.githubusercontent.com/50513095/136656799-6a19fe41-300e-4ea1-b27b-a680233a76a6.png">
### Anything else
_No response_
### 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/6478 | https://github.com/apache/dolphinscheduler/pull/6491 | e091801e05c8e9243ec96f76a2e7cc1f1f5cecab | 88690462b4b93f8df01ba1952374cdf00c02eda5 | "2021-10-09T11:53:38Z" | java | "2021-10-11T12:03:25Z" | dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/impl/ExecutorServiceImpl.java | import org.apache.dolphinscheduler.dao.entity.Command;
import org.apache.dolphinscheduler.dao.entity.ProcessDefinition;
import org.apache.dolphinscheduler.dao.entity.ProcessInstance;
import org.apache.dolphinscheduler.dao.entity.Project;
import org.apache.dolphinscheduler.dao.entity.Schedule;
import org.apache.dolphinscheduler.dao.entity.Tenant;
import org.apache.dolphinscheduler.dao.entity.User;
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.remote.command.StateEventChangeCommand;
import org.apache.dolphinscheduler.remote.processor.StateEventCallbackService;
import org.apache.dolphinscheduler.service.process.ProcessService;
import org.apache.dolphinscheduler.service.quartz.cron.CronUtils;
import org.apache.commons.collections.MapUtils;
import org.apache.commons.lang.StringUtils;
import java.util.ArrayList;
import java.util.Date;
import java.util.HashMap;
import java.util.LinkedList;
import java.util.List;
import java.util.Map;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
/**
* executor service impl
*/
@Service |
closed | apache/dolphinscheduler | https://github.com/apache/dolphinscheduler | 6,478 | [Bug] [API & SERVICE] Missing history data in complement data mode | ### Search before asking
- [X] I had searched in the [issues](https://github.com/apache/dolphinscheduler/issues?q=is%3Aissue) and found no similar issues.
### What happened
1.I have an hourly workflow，the crontab is ："0 0 * * * ? *"
我有一个每小时运行的工作流，crontab 是 :"0 0 * * * ? *"
2. I want to add history data
我去补一个历史数据，数据范围是0点到3点59分
<img width="646" alt="aba7791b47ff5b28599a8f6885eeb52" src="https://user-images.githubusercontent.com/50513095/136656656-e0730af4-d6bc-4835-956a-4881a639230e.png">
3.the history data of 2021-10-09 03:00:00 not works
03点的数据没有运行
### What you expected to happen
I want the data of 2021-10-09 03:00:00 is works
我想要3点的数据执行
### How to reproduce
<img width="646" alt="fd5559070e8152804b241e41a2938b3" src="https://user-images.githubusercontent.com/50513095/136656799-6a19fe41-300e-4ea1-b27b-a680233a76a6.png">
### Anything else
_No response_
### 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/6478 | https://github.com/apache/dolphinscheduler/pull/6491 | e091801e05c8e9243ec96f76a2e7cc1f1f5cecab | 88690462b4b93f8df01ba1952374cdf00c02eda5 | "2021-10-09T11:53:38Z" | java | "2021-10-11T12:03:25Z" | dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/impl/ExecutorServiceImpl.java | public class ExecutorServiceImpl extends BaseServiceImpl implements ExecutorService {
private static final Logger logger = LoggerFactory.getLogger(ExecutorServiceImpl.class);
@Autowired
private ProjectMapper projectMapper;
@Autowired
private ProjectService projectService;
@Autowired
private ProcessDefinitionMapper processDefinitionMapper;
@Autowired
private MonitorService monitorService;
@Autowired
private ProcessInstanceMapper processInstanceMapper;
@Autowired
private ProcessService processService;
@Autowired
StateEventCallbackService stateEventCallbackService;
/**
* execute process instance
*
* @param loginUser login user
* @param projectCode project code |
closed | apache/dolphinscheduler | https://github.com/apache/dolphinscheduler | 6,478 | [Bug] [API & SERVICE] Missing history data in complement data mode | ### Search before asking
- [X] I had searched in the [issues](https://github.com/apache/dolphinscheduler/issues?q=is%3Aissue) and found no similar issues.
### What happened
1.I have an hourly workflow，the crontab is ："0 0 * * * ? *"
我有一个每小时运行的工作流，crontab 是 :"0 0 * * * ? *"
2. I want to add history data
我去补一个历史数据，数据范围是0点到3点59分
<img width="646" alt="aba7791b47ff5b28599a8f6885eeb52" src="https://user-images.githubusercontent.com/50513095/136656656-e0730af4-d6bc-4835-956a-4881a639230e.png">
3.the history data of 2021-10-09 03:00:00 not works
03点的数据没有运行
### What you expected to happen
I want the data of 2021-10-09 03:00:00 is works
我想要3点的数据执行
### How to reproduce
<img width="646" alt="fd5559070e8152804b241e41a2938b3" src="https://user-images.githubusercontent.com/50513095/136656799-6a19fe41-300e-4ea1-b27b-a680233a76a6.png">
### Anything else
_No response_
### 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/6478 | https://github.com/apache/dolphinscheduler/pull/6491 | e091801e05c8e9243ec96f76a2e7cc1f1f5cecab | 88690462b4b93f8df01ba1952374cdf00c02eda5 | "2021-10-09T11:53:38Z" | java | "2021-10-11T12:03:25Z" | dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/impl/ExecutorServiceImpl.java | * @param processDefinitionCode process definition code
* @param cronTime cron time
* @param commandType command type
* @param failureStrategy failure strategy
* @param startNodeList start nodelist
* @param taskDependType node dependency type
* @param warningType warning type
* @param warningGroupId notify group id
* @param processInstancePriority process instance priority
* @param workerGroup worker group name
* @param environmentCode environment code
* @param runMode run mode
* @param timeout timeout
* @param startParams the global param values which pass to new process instance
* @param expectedParallelismNumber the expected parallelism number when execute complement in parallel mode
* @return execute process instance code
*/
@Override
public Map<String, Object> execProcessInstance(User loginUser, long projectCode,
long processDefinitionCode, String cronTime, CommandType commandType,
FailureStrategy failureStrategy, String startNodeList,
TaskDependType taskDependType, WarningType warningType, int warningGroupId,
RunMode runMode,
Priority processInstancePriority, String workerGroup, Long environmentCode,Integer timeout,
Map<String, String> startParams, Integer expectedParallelismNumber,
int dryRun) {
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 | 6,478 | [Bug] [API & SERVICE] Missing history data in complement data mode | ### Search before asking
- [X] I had searched in the [issues](https://github.com/apache/dolphinscheduler/issues?q=is%3Aissue) and found no similar issues.
### What happened
1.I have an hourly workflow，the crontab is ："0 0 * * * ? *"
我有一个每小时运行的工作流，crontab 是 :"0 0 * * * ? *"
2. I want to add history data
我去补一个历史数据，数据范围是0点到3点59分
<img width="646" alt="aba7791b47ff5b28599a8f6885eeb52" src="https://user-images.githubusercontent.com/50513095/136656656-e0730af4-d6bc-4835-956a-4881a639230e.png">
3.the history data of 2021-10-09 03:00:00 not works
03点的数据没有运行
### What you expected to happen
I want the data of 2021-10-09 03:00:00 is works
我想要3点的数据执行
### How to reproduce
<img width="646" alt="fd5559070e8152804b241e41a2938b3" src="https://user-images.githubusercontent.com/50513095/136656799-6a19fe41-300e-4ea1-b27b-a680233a76a6.png">
### Anything else
_No response_
### 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/6478 | https://github.com/apache/dolphinscheduler/pull/6491 | e091801e05c8e9243ec96f76a2e7cc1f1f5cecab | 88690462b4b93f8df01ba1952374cdf00c02eda5 | "2021-10-09T11:53:38Z" | java | "2021-10-11T12:03:25Z" | dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/impl/ExecutorServiceImpl.java | return result;
}
if (timeout <= 0 || timeout > MAX_TASK_TIMEOUT) {
putMsg(result, Status.TASK_TIMEOUT_PARAMS_ERROR);
return result;
}
ProcessDefinition processDefinition = processDefinitionMapper.queryByCode(processDefinitionCode);
result = checkProcessDefinitionValid(processDefinition, processDefinitionCode);
if (result.get(Constants.STATUS) != Status.SUCCESS) {
return result;
}
if (!checkTenantSuitable(processDefinition)) {
logger.error("there is not any valid tenant for the process definition: id:{},name:{}, ",
processDefinition.getId(), processDefinition.getName());
putMsg(result, Status.TENANT_NOT_SUITABLE);
return result;
}
if (!checkMasterExists(result)) {
return result;
}
/**
* create command
*/
int create = this.createCommand(commandType, processDefinition.getCode(),
taskDependType, failureStrategy, startNodeList, cronTime, warningType, loginUser.getId(),
warningGroupId, runMode, processInstancePriority, workerGroup, environmentCode, startParams, expectedParallelismNumber, dryRun);
if (create > 0) { |
closed | apache/dolphinscheduler | https://github.com/apache/dolphinscheduler | 6,478 | [Bug] [API & SERVICE] Missing history data in complement data mode | ### Search before asking
- [X] I had searched in the [issues](https://github.com/apache/dolphinscheduler/issues?q=is%3Aissue) and found no similar issues.
### What happened
1.I have an hourly workflow，the crontab is ："0 0 * * * ? *"
我有一个每小时运行的工作流，crontab 是 :"0 0 * * * ? *"
2. I want to add history data
我去补一个历史数据，数据范围是0点到3点59分
<img width="646" alt="aba7791b47ff5b28599a8f6885eeb52" src="https://user-images.githubusercontent.com/50513095/136656656-e0730af4-d6bc-4835-956a-4881a639230e.png">
3.the history data of 2021-10-09 03:00:00 not works
03点的数据没有运行
### What you expected to happen
I want the data of 2021-10-09 03:00:00 is works
我想要3点的数据执行
### How to reproduce
<img width="646" alt="fd5559070e8152804b241e41a2938b3" src="https://user-images.githubusercontent.com/50513095/136656799-6a19fe41-300e-4ea1-b27b-a680233a76a6.png">
### Anything else
_No response_
### 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/6478 | https://github.com/apache/dolphinscheduler/pull/6491 | e091801e05c8e9243ec96f76a2e7cc1f1f5cecab | 88690462b4b93f8df01ba1952374cdf00c02eda5 | "2021-10-09T11:53:38Z" | java | "2021-10-11T12:03:25Z" | dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/impl/ExecutorServiceImpl.java | processDefinition.setWarningGroupId(warningGroupId);
processDefinitionMapper.updateById(processDefinition);
putMsg(result, Status.SUCCESS);
} else {
putMsg(result, Status.START_PROCESS_INSTANCE_ERROR);
}
return result;
}
/**
* check whether master exists
*
* @param result result
* @return master exists return true , otherwise return false
*/
private boolean checkMasterExists(Map<String, Object> result) {
List<Server> masterServers = monitorService.getServerListFromRegistry(true);
if (masterServers.isEmpty()) {
putMsg(result, Status.MASTER_NOT_EXISTS);
return false;
}
return true;
}
/**
* check whether the process definition can be executed
*
* @param processDefinition process definition
* @param processDefineCode process definition code
* @return check result code |
closed | apache/dolphinscheduler | https://github.com/apache/dolphinscheduler | 6,478 | [Bug] [API & SERVICE] Missing history data in complement data mode | ### Search before asking
- [X] I had searched in the [issues](https://github.com/apache/dolphinscheduler/issues?q=is%3Aissue) and found no similar issues.
### What happened
1.I have an hourly workflow，the crontab is ："0 0 * * * ? *"
我有一个每小时运行的工作流，crontab 是 :"0 0 * * * ? *"
2. I want to add history data
我去补一个历史数据，数据范围是0点到3点59分
<img width="646" alt="aba7791b47ff5b28599a8f6885eeb52" src="https://user-images.githubusercontent.com/50513095/136656656-e0730af4-d6bc-4835-956a-4881a639230e.png">
3.the history data of 2021-10-09 03:00:00 not works
03点的数据没有运行
### What you expected to happen
I want the data of 2021-10-09 03:00:00 is works
我想要3点的数据执行
### How to reproduce
<img width="646" alt="fd5559070e8152804b241e41a2938b3" src="https://user-images.githubusercontent.com/50513095/136656799-6a19fe41-300e-4ea1-b27b-a680233a76a6.png">
### Anything else
_No response_
### 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/6478 | https://github.com/apache/dolphinscheduler/pull/6491 | e091801e05c8e9243ec96f76a2e7cc1f1f5cecab | 88690462b4b93f8df01ba1952374cdf00c02eda5 | "2021-10-09T11:53:38Z" | java | "2021-10-11T12:03:25Z" | dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/impl/ExecutorServiceImpl.java | */
@Override
public Map<String, Object> checkProcessDefinitionValid(ProcessDefinition processDefinition, long processDefineCode) {
Map<String, Object> result = new HashMap<>();
if (processDefinition == null) {
putMsg(result, Status.PROCESS_DEFINE_NOT_EXIST, processDefineCode);
} else if (processDefinition.getReleaseState() != ReleaseState.ONLINE) {
putMsg(result, Status.PROCESS_DEFINE_NOT_RELEASE, processDefineCode);
} else {
result.put(Constants.STATUS, Status.SUCCESS);
}
return result;
}
/**
* do action to process instance：pause, stop, repeat, recover from pause, recover from stop
*
* @param loginUser login user
* @param projectCode project code
* @param processInstanceId process instance id
* @param executeType execute type
* @return execute result code
*/
@Override
public Map<String, Object> execute(User loginUser, long projectCode, Integer processInstanceId, ExecuteType executeType) {
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 | 6,478 | [Bug] [API & SERVICE] Missing history data in complement data mode | ### Search before asking
- [X] I had searched in the [issues](https://github.com/apache/dolphinscheduler/issues?q=is%3Aissue) and found no similar issues.
### What happened
1.I have an hourly workflow，the crontab is ："0 0 * * * ? *"
我有一个每小时运行的工作流，crontab 是 :"0 0 * * * ? *"
2. I want to add history data
我去补一个历史数据，数据范围是0点到3点59分
<img width="646" alt="aba7791b47ff5b28599a8f6885eeb52" src="https://user-images.githubusercontent.com/50513095/136656656-e0730af4-d6bc-4835-956a-4881a639230e.png">
3.the history data of 2021-10-09 03:00:00 not works
03点的数据没有运行
### What you expected to happen
I want the data of 2021-10-09 03:00:00 is works
我想要3点的数据执行
### How to reproduce
<img width="646" alt="fd5559070e8152804b241e41a2938b3" src="https://user-images.githubusercontent.com/50513095/136656799-6a19fe41-300e-4ea1-b27b-a680233a76a6.png">
### Anything else
_No response_
### 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/6478 | https://github.com/apache/dolphinscheduler/pull/6491 | e091801e05c8e9243ec96f76a2e7cc1f1f5cecab | 88690462b4b93f8df01ba1952374cdf00c02eda5 | "2021-10-09T11:53:38Z" | java | "2021-10-11T12:03:25Z" | dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/impl/ExecutorServiceImpl.java | return result;
}
if (!checkMasterExists(result)) {
return result;
}
ProcessInstance processInstance = processService.findProcessInstanceDetailById(processInstanceId);
if (processInstance == null) {
putMsg(result, Status.PROCESS_INSTANCE_NOT_EXIST, processInstanceId);
return result;
}
ProcessDefinition processDefinition = processService.findProcessDefinition(processInstance.getProcessDefinitionCode(),
processInstance.getProcessDefinitionVersion());
if (executeType != ExecuteType.STOP && executeType != ExecuteType.PAUSE) {
result = checkProcessDefinitionValid(processDefinition, processInstance.getProcessDefinitionCode());
if (result.get(Constants.STATUS) != Status.SUCCESS) {
return result;
}
}
result = checkExecuteType(processInstance, executeType);
if (result.get(Constants.STATUS) != Status.SUCCESS) {
return result;
}
if (!checkTenantSuitable(processDefinition)) {
logger.error("there is not any valid tenant for the process definition: id:{},name:{}, ",
processDefinition.getId(), processDefinition.getName());
putMsg(result, Status.TENANT_NOT_SUITABLE);
}
//
Map<String, Object> commandMap = JSONUtils.parseObject(processInstance.getCommandParam(), new TypeReference<Map<String, Object>>() {}); |
closed | apache/dolphinscheduler | https://github.com/apache/dolphinscheduler | 6,478 | [Bug] [API & SERVICE] Missing history data in complement data mode | ### Search before asking
- [X] I had searched in the [issues](https://github.com/apache/dolphinscheduler/issues?q=is%3Aissue) and found no similar issues.
### What happened
1.I have an hourly workflow，the crontab is ："0 0 * * * ? *"
我有一个每小时运行的工作流，crontab 是 :"0 0 * * * ? *"
2. I want to add history data
我去补一个历史数据，数据范围是0点到3点59分
<img width="646" alt="aba7791b47ff5b28599a8f6885eeb52" src="https://user-images.githubusercontent.com/50513095/136656656-e0730af4-d6bc-4835-956a-4881a639230e.png">
3.the history data of 2021-10-09 03:00:00 not works
03点的数据没有运行
### What you expected to happen
I want the data of 2021-10-09 03:00:00 is works
我想要3点的数据执行
### How to reproduce
<img width="646" alt="fd5559070e8152804b241e41a2938b3" src="https://user-images.githubusercontent.com/50513095/136656799-6a19fe41-300e-4ea1-b27b-a680233a76a6.png">
### Anything else
_No response_
### 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/6478 | https://github.com/apache/dolphinscheduler/pull/6491 | e091801e05c8e9243ec96f76a2e7cc1f1f5cecab | 88690462b4b93f8df01ba1952374cdf00c02eda5 | "2021-10-09T11:53:38Z" | java | "2021-10-11T12:03:25Z" | dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/impl/ExecutorServiceImpl.java | String startParams = null;
if (MapUtils.isNotEmpty(commandMap) && executeType == ExecuteType.REPEAT_RUNNING) {
Object startParamsJson = commandMap.get(Constants.CMD_PARAM_START_PARAMS);
if (startParamsJson != null) {
startParams = startParamsJson.toString();
}
}
switch (executeType) {
case REPEAT_RUNNING:
result = insertCommand(loginUser, processInstanceId, processDefinition.getCode(), CommandType.REPEAT_RUNNING, startParams);
break;
case RECOVER_SUSPENDED_PROCESS:
result = insertCommand(loginUser, processInstanceId, processDefinition.getCode(), CommandType.RECOVER_SUSPENDED_PROCESS, startParams);
break;
case START_FAILURE_TASK_PROCESS:
result = insertCommand(loginUser, processInstanceId, processDefinition.getCode(), CommandType.START_FAILURE_TASK_PROCESS, startParams);
break;
case STOP:
if (processInstance.getState() == ExecutionStatus.READY_STOP) {
putMsg(result, Status.PROCESS_INSTANCE_ALREADY_CHANGED, processInstance.getName(), processInstance.getState());
} else {
result = updateProcessInstancePrepare(processInstance, CommandType.STOP, ExecutionStatus.READY_STOP);
}
break;
case PAUSE:
if (processInstance.getState() == ExecutionStatus.READY_PAUSE) {
putMsg(result, Status.PROCESS_INSTANCE_ALREADY_CHANGED, processInstance.getName(), processInstance.getState());
} else {
result = updateProcessInstancePrepare(processInstance, CommandType.PAUSE, ExecutionStatus.READY_PAUSE);
} |
closed | apache/dolphinscheduler | https://github.com/apache/dolphinscheduler | 6,478 | [Bug] [API & SERVICE] Missing history data in complement data mode | ### Search before asking
- [X] I had searched in the [issues](https://github.com/apache/dolphinscheduler/issues?q=is%3Aissue) and found no similar issues.
### What happened
1.I have an hourly workflow，the crontab is ："0 0 * * * ? *"
我有一个每小时运行的工作流，crontab 是 :"0 0 * * * ? *"
2. I want to add history data
我去补一个历史数据，数据范围是0点到3点59分
<img width="646" alt="aba7791b47ff5b28599a8f6885eeb52" src="https://user-images.githubusercontent.com/50513095/136656656-e0730af4-d6bc-4835-956a-4881a639230e.png">
3.the history data of 2021-10-09 03:00:00 not works
03点的数据没有运行
### What you expected to happen
I want the data of 2021-10-09 03:00:00 is works
我想要3点的数据执行
### How to reproduce
<img width="646" alt="fd5559070e8152804b241e41a2938b3" src="https://user-images.githubusercontent.com/50513095/136656799-6a19fe41-300e-4ea1-b27b-a680233a76a6.png">
### Anything else
_No response_
### 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/6478 | https://github.com/apache/dolphinscheduler/pull/6491 | e091801e05c8e9243ec96f76a2e7cc1f1f5cecab | 88690462b4b93f8df01ba1952374cdf00c02eda5 | "2021-10-09T11:53:38Z" | java | "2021-10-11T12:03:25Z" | dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/impl/ExecutorServiceImpl.java | break;
default:
logger.error("unknown execute type : {}", executeType);
putMsg(result, Status.REQUEST_PARAMS_NOT_VALID_ERROR, "unknown execute type");
break;
}
return result;
}
/**
* check tenant suitable
*
* @param processDefinition process definition
* @return true if tenant suitable, otherwise return false
*/
private boolean checkTenantSuitable(ProcessDefinition processDefinition) {
Tenant tenant = processService.getTenantForProcess(processDefinition.getTenantId(),
processDefinition.getUserId());
return tenant != null;
}
/**
* Check the state of process instance and the type of operation match
*
* @param processInstance process instance
* @param executeType execute type
* @return check result code
*/
private Map<String, Object> checkExecuteType(ProcessInstance processInstance, ExecuteType executeType) {
Map<String, Object> result = new HashMap<>();
ExecutionStatus executionStatus = processInstance.getState();
boolean checkResult = false; |
closed | apache/dolphinscheduler | https://github.com/apache/dolphinscheduler | 6,478 | [Bug] [API & SERVICE] Missing history data in complement data mode | ### Search before asking
- [X] I had searched in the [issues](https://github.com/apache/dolphinscheduler/issues?q=is%3Aissue) and found no similar issues.
### What happened
1.I have an hourly workflow，the crontab is ："0 0 * * * ? *"
我有一个每小时运行的工作流，crontab 是 :"0 0 * * * ? *"
2. I want to add history data
我去补一个历史数据，数据范围是0点到3点59分
<img width="646" alt="aba7791b47ff5b28599a8f6885eeb52" src="https://user-images.githubusercontent.com/50513095/136656656-e0730af4-d6bc-4835-956a-4881a639230e.png">
3.the history data of 2021-10-09 03:00:00 not works
03点的数据没有运行
### What you expected to happen
I want the data of 2021-10-09 03:00:00 is works
我想要3点的数据执行
### How to reproduce
<img width="646" alt="fd5559070e8152804b241e41a2938b3" src="https://user-images.githubusercontent.com/50513095/136656799-6a19fe41-300e-4ea1-b27b-a680233a76a6.png">
### Anything else
_No response_
### 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/6478 | https://github.com/apache/dolphinscheduler/pull/6491 | e091801e05c8e9243ec96f76a2e7cc1f1f5cecab | 88690462b4b93f8df01ba1952374cdf00c02eda5 | "2021-10-09T11:53:38Z" | java | "2021-10-11T12:03:25Z" | dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/impl/ExecutorServiceImpl.java | switch (executeType) {
case PAUSE:
case STOP:
if (executionStatus.typeIsRunning()) {
checkResult = true;
}
break;
case REPEAT_RUNNING:
if (executionStatus.typeIsFinished()) {
checkResult = true;
}
break;
case START_FAILURE_TASK_PROCESS:
if (executionStatus.typeIsFailure()) {
checkResult = true;
}
break;
case RECOVER_SUSPENDED_PROCESS:
if (executionStatus.typeIsPause() || executionStatus.typeIsCancel()) {
checkResult = true;
}
break;
default:
break;
}
if (!checkResult) {
putMsg(result, Status.PROCESS_INSTANCE_STATE_OPERATION_ERROR, processInstance.getName(), executionStatus.toString(), executeType.toString());
} else {
putMsg(result, Status.SUCCESS);
} |
closed | apache/dolphinscheduler | https://github.com/apache/dolphinscheduler | 6,478 | [Bug] [API & SERVICE] Missing history data in complement data mode | ### Search before asking
- [X] I had searched in the [issues](https://github.com/apache/dolphinscheduler/issues?q=is%3Aissue) and found no similar issues.
### What happened
1.I have an hourly workflow，the crontab is ："0 0 * * * ? *"
我有一个每小时运行的工作流，crontab 是 :"0 0 * * * ? *"
2. I want to add history data
我去补一个历史数据，数据范围是0点到3点59分
<img width="646" alt="aba7791b47ff5b28599a8f6885eeb52" src="https://user-images.githubusercontent.com/50513095/136656656-e0730af4-d6bc-4835-956a-4881a639230e.png">
3.the history data of 2021-10-09 03:00:00 not works
03点的数据没有运行
### What you expected to happen
I want the data of 2021-10-09 03:00:00 is works
我想要3点的数据执行
### How to reproduce
<img width="646" alt="fd5559070e8152804b241e41a2938b3" src="https://user-images.githubusercontent.com/50513095/136656799-6a19fe41-300e-4ea1-b27b-a680233a76a6.png">
### Anything else
_No response_
### 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/6478 | https://github.com/apache/dolphinscheduler/pull/6491 | e091801e05c8e9243ec96f76a2e7cc1f1f5cecab | 88690462b4b93f8df01ba1952374cdf00c02eda5 | "2021-10-09T11:53:38Z" | java | "2021-10-11T12:03:25Z" | dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/impl/ExecutorServiceImpl.java | return result;
}
/**
* prepare to update process instance command type and status
*
* @param processInstance process instance
* @param commandType command type
* @param executionStatus execute status
* @return update result
*/
private Map<String, Object> updateProcessInstancePrepare(ProcessInstance processInstance, CommandType commandType, ExecutionStatus executionStatus) {
Map<String, Object> result = new HashMap<>();
processInstance.setCommandType(commandType);
processInstance.addHistoryCmd(commandType);
processInstance.setState(executionStatus);
int update = processService.updateProcessInstance(processInstance);
//
if (update > 0) {
String host = processInstance.getHost();
String address = host.split(":")[0];
int port = Integer.parseInt(host.split(":")[1]);
StateEventChangeCommand stateEventChangeCommand = new StateEventChangeCommand(
processInstance.getId(), 0, processInstance.getState(), processInstance.getId(), 0
);
stateEventCallbackService.sendResult(address, port, stateEventChangeCommand.convert2Command());
putMsg(result, Status.SUCCESS);
} else {
putMsg(result, Status.EXECUTE_PROCESS_INSTANCE_ERROR);
}
return result; |
closed | apache/dolphinscheduler | https://github.com/apache/dolphinscheduler | 6,478 | [Bug] [API & SERVICE] Missing history data in complement data mode | ### Search before asking
- [X] I had searched in the [issues](https://github.com/apache/dolphinscheduler/issues?q=is%3Aissue) and found no similar issues.
### What happened
1.I have an hourly workflow，the crontab is ："0 0 * * * ? *"
我有一个每小时运行的工作流，crontab 是 :"0 0 * * * ? *"
2. I want to add history data
我去补一个历史数据，数据范围是0点到3点59分
<img width="646" alt="aba7791b47ff5b28599a8f6885eeb52" src="https://user-images.githubusercontent.com/50513095/136656656-e0730af4-d6bc-4835-956a-4881a639230e.png">
3.the history data of 2021-10-09 03:00:00 not works
03点的数据没有运行
### What you expected to happen
I want the data of 2021-10-09 03:00:00 is works
我想要3点的数据执行
### How to reproduce
<img width="646" alt="fd5559070e8152804b241e41a2938b3" src="https://user-images.githubusercontent.com/50513095/136656799-6a19fe41-300e-4ea1-b27b-a680233a76a6.png">
### Anything else
_No response_
### 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/6478 | https://github.com/apache/dolphinscheduler/pull/6491 | e091801e05c8e9243ec96f76a2e7cc1f1f5cecab | 88690462b4b93f8df01ba1952374cdf00c02eda5 | "2021-10-09T11:53:38Z" | java | "2021-10-11T12:03:25Z" | dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/impl/ExecutorServiceImpl.java | }
/**
* insert command, used in the implementation of the page, re run, recovery (pause / failure) execution
*
* @param loginUser login user
* @param instanceId instance id
* @param processDefinitionCode process definition code
* @param commandType command type
* @return insert result code
*/
private Map<String, Object> insertCommand(User loginUser, Integer instanceId, long processDefinitionCode, CommandType commandType, String startParams) {
Map<String, Object> result = new HashMap<>();
//
Map<String, Object> cmdParam = new HashMap<>();
cmdParam.put(CMD_PARAM_RECOVER_PROCESS_ID_STRING, instanceId);
if (!StringUtils.isEmpty(startParams)) {
cmdParam.put(CMD_PARAM_START_PARAMS, startParams);
}
Command command = new Command();
command.setCommandType(commandType);
command.setProcessDefinitionCode(processDefinitionCode);
command.setCommandParam(JSONUtils.toJsonString(cmdParam));
command.setExecutorId(loginUser.getId());
if (!processService.verifyIsNeedCreateCommand(command)) {
putMsg(result, Status.PROCESS_INSTANCE_EXECUTING_COMMAND, processDefinitionCode);
return result;
}
int create = processService.createCommand(command);
if (create > 0) {
putMsg(result, Status.SUCCESS); |
closed | apache/dolphinscheduler | https://github.com/apache/dolphinscheduler | 6,478 | [Bug] [API & SERVICE] Missing history data in complement data mode | ### Search before asking
- [X] I had searched in the [issues](https://github.com/apache/dolphinscheduler/issues?q=is%3Aissue) and found no similar issues.
### What happened
1.I have an hourly workflow，the crontab is ："0 0 * * * ? *"
我有一个每小时运行的工作流，crontab 是 :"0 0 * * * ? *"
2. I want to add history data
我去补一个历史数据，数据范围是0点到3点59分
<img width="646" alt="aba7791b47ff5b28599a8f6885eeb52" src="https://user-images.githubusercontent.com/50513095/136656656-e0730af4-d6bc-4835-956a-4881a639230e.png">
3.the history data of 2021-10-09 03:00:00 not works
03点的数据没有运行
### What you expected to happen
I want the data of 2021-10-09 03:00:00 is works
我想要3点的数据执行
### How to reproduce
<img width="646" alt="fd5559070e8152804b241e41a2938b3" src="https://user-images.githubusercontent.com/50513095/136656799-6a19fe41-300e-4ea1-b27b-a680233a76a6.png">
### Anything else
_No response_
### 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/6478 | https://github.com/apache/dolphinscheduler/pull/6491 | e091801e05c8e9243ec96f76a2e7cc1f1f5cecab | 88690462b4b93f8df01ba1952374cdf00c02eda5 | "2021-10-09T11:53:38Z" | java | "2021-10-11T12:03:25Z" | dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/impl/ExecutorServiceImpl.java | } else {
putMsg(result, Status.EXECUTE_PROCESS_INSTANCE_ERROR);
}
return result;
}
/**
* check if sub processes are offline before starting process definition
*
* @param processDefinitionCode process definition code
* @return check result code
*/
@Override
public Map<String, Object> startCheckByProcessDefinedCode(long processDefinitionCode) {
Map<String, Object> result = new HashMap<>();
ProcessDefinition processDefinition = processDefinitionMapper.queryByCode(processDefinitionCode);
if (processDefinition == null) {
logger.error("process definition is not found");
putMsg(result, Status.REQUEST_PARAMS_NOT_VALID_ERROR, "processDefinitionCode");
return result;
}
List<Integer> ids = new ArrayList<>();
processService.recurseFindSubProcessId(processDefinition.getId(), ids);
Integer[] idArray = ids.toArray(new Integer[ids.size()]);
if (!ids.isEmpty()) {
List<ProcessDefinition> processDefinitionList = processDefinitionMapper.queryDefinitionListByIdList(idArray);
if (processDefinitionList != null) {
for (ProcessDefinition processDefinitionTmp : processDefinitionList) {
/**
* if there is no online process, exit directly
*/ |
closed | apache/dolphinscheduler | https://github.com/apache/dolphinscheduler | 6,478 | [Bug] [API & SERVICE] Missing history data in complement data mode | ### Search before asking
- [X] I had searched in the [issues](https://github.com/apache/dolphinscheduler/issues?q=is%3Aissue) and found no similar issues.
### What happened
1.I have an hourly workflow，the crontab is ："0 0 * * * ? *"
我有一个每小时运行的工作流，crontab 是 :"0 0 * * * ? *"
2. I want to add history data
我去补一个历史数据，数据范围是0点到3点59分
<img width="646" alt="aba7791b47ff5b28599a8f6885eeb52" src="https://user-images.githubusercontent.com/50513095/136656656-e0730af4-d6bc-4835-956a-4881a639230e.png">
3.the history data of 2021-10-09 03:00:00 not works
03点的数据没有运行
### What you expected to happen
I want the data of 2021-10-09 03:00:00 is works
我想要3点的数据执行
### How to reproduce
<img width="646" alt="fd5559070e8152804b241e41a2938b3" src="https://user-images.githubusercontent.com/50513095/136656799-6a19fe41-300e-4ea1-b27b-a680233a76a6.png">
### Anything else
_No response_
### 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/6478 | https://github.com/apache/dolphinscheduler/pull/6491 | e091801e05c8e9243ec96f76a2e7cc1f1f5cecab | 88690462b4b93f8df01ba1952374cdf00c02eda5 | "2021-10-09T11:53:38Z" | java | "2021-10-11T12:03:25Z" | dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/impl/ExecutorServiceImpl.java | if (processDefinitionTmp.getReleaseState() != ReleaseState.ONLINE) {
putMsg(result, Status.PROCESS_DEFINE_NOT_RELEASE, processDefinitionTmp.getName());
logger.info("not release process definition id: {} , name : {}",
processDefinitionTmp.getId(), processDefinitionTmp.getName());
return result;
}
}
}
}
putMsg(result, Status.SUCCESS);
return result;
}
/**
* create command
*
* @param commandType commandType
* @param processDefineCode processDefineCode
* @param nodeDep nodeDep
* @param failureStrategy failureStrategy
* @param startNodeList startNodeList
* @param schedule schedule
* @param warningType warningType
* @param executorId executorId
* @param warningGroupId warningGroupId
* @param runMode runMode
* @param processInstancePriority processInstancePriority
* @param workerGroup workerGroup
* @param environmentCode environmentCode
* @return command id
*/ |
closed | apache/dolphinscheduler | https://github.com/apache/dolphinscheduler | 6,478 | [Bug] [API & SERVICE] Missing history data in complement data mode | ### Search before asking
- [X] I had searched in the [issues](https://github.com/apache/dolphinscheduler/issues?q=is%3Aissue) and found no similar issues.
### What happened
1.I have an hourly workflow，the crontab is ："0 0 * * * ? *"
我有一个每小时运行的工作流，crontab 是 :"0 0 * * * ? *"
2. I want to add history data
我去补一个历史数据，数据范围是0点到3点59分
<img width="646" alt="aba7791b47ff5b28599a8f6885eeb52" src="https://user-images.githubusercontent.com/50513095/136656656-e0730af4-d6bc-4835-956a-4881a639230e.png">
3.the history data of 2021-10-09 03:00:00 not works
03点的数据没有运行
### What you expected to happen
I want the data of 2021-10-09 03:00:00 is works
我想要3点的数据执行
### How to reproduce
<img width="646" alt="fd5559070e8152804b241e41a2938b3" src="https://user-images.githubusercontent.com/50513095/136656799-6a19fe41-300e-4ea1-b27b-a680233a76a6.png">
### Anything else
_No response_
### 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/6478 | https://github.com/apache/dolphinscheduler/pull/6491 | e091801e05c8e9243ec96f76a2e7cc1f1f5cecab | 88690462b4b93f8df01ba1952374cdf00c02eda5 | "2021-10-09T11:53:38Z" | java | "2021-10-11T12:03:25Z" | dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/impl/ExecutorServiceImpl.java | private int createCommand(CommandType commandType, long processDefineCode,
TaskDependType nodeDep, FailureStrategy failureStrategy,
String startNodeList, String schedule, WarningType warningType,
int executorId, int warningGroupId,
RunMode runMode, Priority processInstancePriority, String workerGroup, Long environmentCode,
Map<String, String> startParams, Integer expectedParallelismNumber, int dryRun) {
/**
* instantiate command schedule instance
*/
Command command = new Command();
Map<String, String> cmdParam = new HashMap<>();
if (commandType == null) {
command.setCommandType(CommandType.START_PROCESS);
} else {
command.setCommandType(commandType);
}
command.setProcessDefinitionCode(processDefineCode);
if (nodeDep != null) {
command.setTaskDependType(nodeDep);
}
if (failureStrategy != null) {
command.setFailureStrategy(failureStrategy);
}
if (!StringUtils.isEmpty(startNodeList)) {
cmdParam.put(CMD_PARAM_START_NODE_NAMES, startNodeList);
}
if (warningType != null) {
command.setWarningType(warningType);
}
if (startParams != null && startParams.size() > 0) { |
closed | apache/dolphinscheduler | https://github.com/apache/dolphinscheduler | 6,478 | [Bug] [API & SERVICE] Missing history data in complement data mode | ### Search before asking
- [X] I had searched in the [issues](https://github.com/apache/dolphinscheduler/issues?q=is%3Aissue) and found no similar issues.
### What happened
1.I have an hourly workflow，the crontab is ："0 0 * * * ? *"
我有一个每小时运行的工作流，crontab 是 :"0 0 * * * ? *"
2. I want to add history data
我去补一个历史数据，数据范围是0点到3点59分
<img width="646" alt="aba7791b47ff5b28599a8f6885eeb52" src="https://user-images.githubusercontent.com/50513095/136656656-e0730af4-d6bc-4835-956a-4881a639230e.png">
3.the history data of 2021-10-09 03:00:00 not works
03点的数据没有运行
### What you expected to happen
I want the data of 2021-10-09 03:00:00 is works
我想要3点的数据执行
### How to reproduce
<img width="646" alt="fd5559070e8152804b241e41a2938b3" src="https://user-images.githubusercontent.com/50513095/136656799-6a19fe41-300e-4ea1-b27b-a680233a76a6.png">
### Anything else
_No response_
### 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/6478 | https://github.com/apache/dolphinscheduler/pull/6491 | e091801e05c8e9243ec96f76a2e7cc1f1f5cecab | 88690462b4b93f8df01ba1952374cdf00c02eda5 | "2021-10-09T11:53:38Z" | java | "2021-10-11T12:03:25Z" | dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/impl/ExecutorServiceImpl.java | cmdParam.put(CMD_PARAM_START_PARAMS, JSONUtils.toJsonString(startParams));
}
command.setCommandParam(JSONUtils.toJsonString(cmdParam));
command.setExecutorId(executorId);
command.setWarningGroupId(warningGroupId);
command.setProcessInstancePriority(processInstancePriority);
command.setWorkerGroup(workerGroup);
command.setEnvironmentCode(environmentCode);
command.setDryRun(dryRun);
Date start = null;
Date end = null;
if (!StringUtils.isEmpty(schedule)) {
String[] interval = schedule.split(",");
if (interval.length == 2) {
start = DateUtils.getScheduleDate(interval[0]);
end = DateUtils.getScheduleDate(interval[1]);
if (start.after(end)) {
logger.info("complement data error, wrong date start:{} and end date:{} ",
start, end
);
return 0;
}
}
}
//
if (commandType == CommandType.COMPLEMENT_DATA) {
if (start == null || end == null) {
return 0;
}
return createComplementCommandList(start, end, runMode, command, expectedParallelismNumber); |
closed | apache/dolphinscheduler | https://github.com/apache/dolphinscheduler | 6,478 | [Bug] [API & SERVICE] Missing history data in complement data mode | ### Search before asking
- [X] I had searched in the [issues](https://github.com/apache/dolphinscheduler/issues?q=is%3Aissue) and found no similar issues.
### What happened
1.I have an hourly workflow，the crontab is ："0 0 * * * ? *"
我有一个每小时运行的工作流，crontab 是 :"0 0 * * * ? *"
2. I want to add history data
我去补一个历史数据，数据范围是0点到3点59分
<img width="646" alt="aba7791b47ff5b28599a8f6885eeb52" src="https://user-images.githubusercontent.com/50513095/136656656-e0730af4-d6bc-4835-956a-4881a639230e.png">
3.the history data of 2021-10-09 03:00:00 not works
03点的数据没有运行
### What you expected to happen
I want the data of 2021-10-09 03:00:00 is works
我想要3点的数据执行
### How to reproduce
<img width="646" alt="fd5559070e8152804b241e41a2938b3" src="https://user-images.githubusercontent.com/50513095/136656799-6a19fe41-300e-4ea1-b27b-a680233a76a6.png">
### Anything else
_No response_
### 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/6478 | https://github.com/apache/dolphinscheduler/pull/6491 | e091801e05c8e9243ec96f76a2e7cc1f1f5cecab | 88690462b4b93f8df01ba1952374cdf00c02eda5 | "2021-10-09T11:53:38Z" | java | "2021-10-11T12:03:25Z" | dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/impl/ExecutorServiceImpl.java | } else {
command.setCommandParam(JSONUtils.toJsonString(cmdParam));
return processService.createCommand(command);
}
}
/**
* create complement command
* close left open right
*
* @param start
* @param end
* @param runMode
* @return
*/
private int createComplementCommandList(Date start, Date end, RunMode runMode, Command command, Integer expectedParallelismNumber) {
int createCount = 0;
runMode = (runMode == null) ? RunMode.RUN_MODE_SERIAL : runMode;
Map<String, String> cmdParam = JSONUtils.toMap(command.getCommandParam());
switch (runMode) {
case RUN_MODE_SERIAL: {
cmdParam.put(CMDPARAM_COMPLEMENT_DATA_START_DATE, DateUtils.dateToString(start));
cmdParam.put(CMDPARAM_COMPLEMENT_DATA_END_DATE, DateUtils.dateToString(end));
command.setCommandParam(JSONUtils.toJsonString(cmdParam));
createCount = processService.createCommand(command);
break;
}
case RUN_MODE_PARALLEL: {
LinkedList<Date> listDate = new LinkedList<>();
List<Schedule> schedules = processService.queryReleaseSchedulerListByProcessDefinitionCode(command.getProcessDefinitionCode());
listDate.addAll(CronUtils.getSelfFireDateList(start, end, schedules)); |
closed | apache/dolphinscheduler | https://github.com/apache/dolphinscheduler | 6,478 | [Bug] [API & SERVICE] Missing history data in complement data mode | ### Search before asking
- [X] I had searched in the [issues](https://github.com/apache/dolphinscheduler/issues?q=is%3Aissue) and found no similar issues.
### What happened
1.I have an hourly workflow，the crontab is ："0 0 * * * ? *"
我有一个每小时运行的工作流，crontab 是 :"0 0 * * * ? *"
2. I want to add history data
我去补一个历史数据，数据范围是0点到3点59分
<img width="646" alt="aba7791b47ff5b28599a8f6885eeb52" src="https://user-images.githubusercontent.com/50513095/136656656-e0730af4-d6bc-4835-956a-4881a639230e.png">
3.the history data of 2021-10-09 03:00:00 not works
03点的数据没有运行
### What you expected to happen
I want the data of 2021-10-09 03:00:00 is works
我想要3点的数据执行
### How to reproduce
<img width="646" alt="fd5559070e8152804b241e41a2938b3" src="https://user-images.githubusercontent.com/50513095/136656799-6a19fe41-300e-4ea1-b27b-a680233a76a6.png">
### Anything else
_No response_
### 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/6478 | https://github.com/apache/dolphinscheduler/pull/6491 | e091801e05c8e9243ec96f76a2e7cc1f1f5cecab | 88690462b4b93f8df01ba1952374cdf00c02eda5 | "2021-10-09T11:53:38Z" | java | "2021-10-11T12:03:25Z" | dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/impl/ExecutorServiceImpl.java | createCount = listDate.size();
if (!CollectionUtils.isEmpty(listDate)) {
if (expectedParallelismNumber != null && expectedParallelismNumber != 0) {
createCount = Math.min(listDate.size(), expectedParallelismNumber);
}
logger.info("In parallel mode, current expectedParallelismNumber:{}", createCount);
int chunkSize = listDate.size() / createCount;
for (int i = 0; i < createCount; i++) {
int rangeStart = i == 0 ? i : (i * chunkSize);
int rangeEnd = i == createCount - 1 ? listDate.size() - 1
: rangeStart + chunkSize;
if (rangeEnd == listDate.size()) {
rangeEnd = listDate.size() - 1;
}
cmdParam.put(CMDPARAM_COMPLEMENT_DATA_START_DATE, DateUtils.dateToString(listDate.get(rangeStart)));
cmdParam.put(CMDPARAM_COMPLEMENT_DATA_END_DATE, DateUtils.dateToString(listDate.get(rangeEnd)));
command.setCommandParam(JSONUtils.toJsonString(cmdParam));
processService.createCommand(command);
}
}
break;
}
default:
break;
}
logger.info("create complement command count: {}", createCount);
return createCount;
}
} |
closed | apache/dolphinscheduler | https://github.com/apache/dolphinscheduler | 6,478 | [Bug] [API & SERVICE] Missing history data in complement data mode | ### Search before asking
- [X] I had searched in the [issues](https://github.com/apache/dolphinscheduler/issues?q=is%3Aissue) and found no similar issues.
### What happened
1.I have an hourly workflow，the crontab is ："0 0 * * * ? *"
我有一个每小时运行的工作流，crontab 是 :"0 0 * * * ? *"
2. I want to add history data
我去补一个历史数据，数据范围是0点到3点59分
<img width="646" alt="aba7791b47ff5b28599a8f6885eeb52" src="https://user-images.githubusercontent.com/50513095/136656656-e0730af4-d6bc-4835-956a-4881a639230e.png">
3.the history data of 2021-10-09 03:00:00 not works
03点的数据没有运行
### What you expected to happen
I want the data of 2021-10-09 03:00:00 is works
我想要3点的数据执行
### How to reproduce
<img width="646" alt="fd5559070e8152804b241e41a2938b3" src="https://user-images.githubusercontent.com/50513095/136656799-6a19fe41-300e-4ea1-b27b-a680233a76a6.png">
### Anything else
_No response_
### 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/6478 | https://github.com/apache/dolphinscheduler/pull/6491 | e091801e05c8e9243ec96f76a2e7cc1f1f5cecab | 88690462b4b93f8df01ba1952374cdf00c02eda5 | "2021-10-09T11:53:38Z" | java | "2021-10-11T12:03:25Z" | dolphinscheduler-api/src/test/java/org/apache/dolphinscheduler/api/service/ExecutorServiceTest.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.api.service;
import static org.mockito.ArgumentMatchers.any;
import static org.mockito.Mockito.times;
import static org.mockito.Mockito.verify;
import org.apache.dolphinscheduler.api.enums.ExecuteType;
import org.apache.dolphinscheduler.api.enums.Status;
import org.apache.dolphinscheduler.api.service.impl.ExecutorServiceImpl;
import org.apache.dolphinscheduler.api.service.impl.ProjectServiceImpl;
import org.apache.dolphinscheduler.common.Constants;
import org.apache.dolphinscheduler.common.enums.CommandType;
import org.apache.dolphinscheduler.common.enums.ExecutionStatus;
import org.apache.dolphinscheduler.common.enums.Priority;
import org.apache.dolphinscheduler.common.enums.ReleaseState;
import org.apache.dolphinscheduler.common.enums.RunMode; |
closed | apache/dolphinscheduler | https://github.com/apache/dolphinscheduler | 6,478 | [Bug] [API & SERVICE] Missing history data in complement data mode | ### Search before asking
- [X] I had searched in the [issues](https://github.com/apache/dolphinscheduler/issues?q=is%3Aissue) and found no similar issues.
### What happened
1.I have an hourly workflow，the crontab is ："0 0 * * * ? *"
我有一个每小时运行的工作流，crontab 是 :"0 0 * * * ? *"
2. I want to add history data
我去补一个历史数据，数据范围是0点到3点59分
<img width="646" alt="aba7791b47ff5b28599a8f6885eeb52" src="https://user-images.githubusercontent.com/50513095/136656656-e0730af4-d6bc-4835-956a-4881a639230e.png">
3.the history data of 2021-10-09 03:00:00 not works
03点的数据没有运行
### What you expected to happen
I want the data of 2021-10-09 03:00:00 is works
我想要3点的数据执行
### How to reproduce
<img width="646" alt="fd5559070e8152804b241e41a2938b3" src="https://user-images.githubusercontent.com/50513095/136656799-6a19fe41-300e-4ea1-b27b-a680233a76a6.png">
### Anything else
_No response_
### 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/6478 | https://github.com/apache/dolphinscheduler/pull/6491 | e091801e05c8e9243ec96f76a2e7cc1f1f5cecab | 88690462b4b93f8df01ba1952374cdf00c02eda5 | "2021-10-09T11:53:38Z" | java | "2021-10-11T12:03:25Z" | dolphinscheduler-api/src/test/java/org/apache/dolphinscheduler/api/service/ExecutorServiceTest.java | import org.apache.dolphinscheduler.common.model.Server;
import org.apache.dolphinscheduler.dao.entity.Command;
import org.apache.dolphinscheduler.dao.entity.ProcessDefinition;
import org.apache.dolphinscheduler.dao.entity.ProcessInstance;
import org.apache.dolphinscheduler.dao.entity.Project;
import org.apache.dolphinscheduler.dao.entity.Schedule;
import org.apache.dolphinscheduler.dao.entity.Tenant;
import org.apache.dolphinscheduler.dao.entity.User;
import org.apache.dolphinscheduler.dao.mapper.ProcessDefinitionMapper;
import org.apache.dolphinscheduler.dao.mapper.ProjectMapper;
import org.apache.dolphinscheduler.service.process.ProcessService;
import java.util.ArrayList;
import java.util.Collections;
import java.util.HashMap;
import java.util.LinkedList;
import java.util.List;
import java.util.Map;
import org.junit.Assert;
import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.mockito.InjectMocks;
import org.mockito.Mock;
import org.mockito.Mockito;
import org.mockito.junit.MockitoJUnitRunner;
/**
* executor service 2 test
*/
@RunWith(MockitoJUnitRunner.Silent.class)
public class ExecutorServiceTest { |
closed | apache/dolphinscheduler | https://github.com/apache/dolphinscheduler | 6,478 | [Bug] [API & SERVICE] Missing history data in complement data mode | ### Search before asking
- [X] I had searched in the [issues](https://github.com/apache/dolphinscheduler/issues?q=is%3Aissue) and found no similar issues.
### What happened
1.I have an hourly workflow，the crontab is ："0 0 * * * ? *"
我有一个每小时运行的工作流，crontab 是 :"0 0 * * * ? *"
2. I want to add history data
我去补一个历史数据，数据范围是0点到3点59分
<img width="646" alt="aba7791b47ff5b28599a8f6885eeb52" src="https://user-images.githubusercontent.com/50513095/136656656-e0730af4-d6bc-4835-956a-4881a639230e.png">
3.the history data of 2021-10-09 03:00:00 not works
03点的数据没有运行
### What you expected to happen
I want the data of 2021-10-09 03:00:00 is works
我想要3点的数据执行
### How to reproduce
<img width="646" alt="fd5559070e8152804b241e41a2938b3" src="https://user-images.githubusercontent.com/50513095/136656799-6a19fe41-300e-4ea1-b27b-a680233a76a6.png">
### Anything else
_No response_
### 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/6478 | https://github.com/apache/dolphinscheduler/pull/6491 | e091801e05c8e9243ec96f76a2e7cc1f1f5cecab | 88690462b4b93f8df01ba1952374cdf00c02eda5 | "2021-10-09T11:53:38Z" | java | "2021-10-11T12:03:25Z" | dolphinscheduler-api/src/test/java/org/apache/dolphinscheduler/api/service/ExecutorServiceTest.java | @InjectMocks
private ExecutorServiceImpl executorService;
@Mock
private ProcessService processService;
@Mock
private ProcessDefinitionMapper processDefinitionMapper;
@Mock
private ProjectMapper projectMapper;
@Mock
private ProjectServiceImpl projectService;
@Mock
private MonitorService monitorService;
private int processDefinitionId = 1;
private long processDefinitionCode = 1L;
private int processInstanceId = 1;
private int tenantId = 1;
private int userId = 1;
private ProcessDefinition processDefinition = new ProcessDefinition();
private ProcessInstance processInstance = new ProcessInstance();
private User loginUser = new User();
private long projectCode = 1L;
private String projectName = "projectName";
private Project project = new Project();
private String cronTime;
@Before
public void init() {
loginUser.setId(userId);
processDefinition.setId(processDefinitionId); |
closed | apache/dolphinscheduler | https://github.com/apache/dolphinscheduler | 6,478 | [Bug] [API & SERVICE] Missing history data in complement data mode | ### Search before asking
- [X] I had searched in the [issues](https://github.com/apache/dolphinscheduler/issues?q=is%3Aissue) and found no similar issues.
### What happened
1.I have an hourly workflow，the crontab is ："0 0 * * * ? *"
我有一个每小时运行的工作流，crontab 是 :"0 0 * * * ? *"
2. I want to add history data
我去补一个历史数据，数据范围是0点到3点59分
<img width="646" alt="aba7791b47ff5b28599a8f6885eeb52" src="https://user-images.githubusercontent.com/50513095/136656656-e0730af4-d6bc-4835-956a-4881a639230e.png">
3.the history data of 2021-10-09 03:00:00 not works
03点的数据没有运行
### What you expected to happen
I want the data of 2021-10-09 03:00:00 is works
我想要3点的数据执行
### How to reproduce
<img width="646" alt="fd5559070e8152804b241e41a2938b3" src="https://user-images.githubusercontent.com/50513095/136656799-6a19fe41-300e-4ea1-b27b-a680233a76a6.png">
### Anything else
_No response_
### 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/6478 | https://github.com/apache/dolphinscheduler/pull/6491 | e091801e05c8e9243ec96f76a2e7cc1f1f5cecab | 88690462b4b93f8df01ba1952374cdf00c02eda5 | "2021-10-09T11:53:38Z" | java | "2021-10-11T12:03:25Z" | dolphinscheduler-api/src/test/java/org/apache/dolphinscheduler/api/service/ExecutorServiceTest.java | processDefinition.setReleaseState(ReleaseState.ONLINE);
processDefinition.setTenantId(tenantId);
processDefinition.setUserId(userId);
processDefinition.setVersion(1);
processDefinition.setCode(1L);
processInstance.setId(processInstanceId);
processInstance.setState(ExecutionStatus.FAILURE);
processInstance.setExecutorId(userId);
processInstance.setTenantId(tenantId);
processInstance.setProcessDefinitionVersion(1);
processInstance.setProcessDefinitionCode(1L);
project.setCode(projectCode);
project.setName(projectName);
cronTime = "2020-01-01 00:00:00,2020-01-31 23:00:00";
Mockito.when(projectMapper.queryByCode(projectCode)).thenReturn(project);
Mockito.when(projectService.checkProjectAndAuth(loginUser, project, projectCode)).thenReturn(checkProjectAndAuth());
Mockito.when(processDefinitionMapper.queryByCode(processDefinitionCode)).thenReturn(processDefinition);
Mockito.when(processService.getTenantForProcess(tenantId, userId)).thenReturn(new Tenant());
Mockito.when(processService.createCommand(any(Command.class))).thenReturn(1);
Mockito.when(monitorService.getServerListFromRegistry(true)).thenReturn(getMasterServersList());
Mockito.when(processService.findProcessInstanceDetailById(processInstanceId)).thenReturn(processInstance);
Mockito.when(processService.findProcessDefinition(1L, 1)).thenReturn(processDefinition);
}
/**
* not complement
*/ |
closed | apache/dolphinscheduler | https://github.com/apache/dolphinscheduler | 6,478 | [Bug] [API & SERVICE] Missing history data in complement data mode | ### Search before asking
- [X] I had searched in the [issues](https://github.com/apache/dolphinscheduler/issues?q=is%3Aissue) and found no similar issues.
### What happened
1.I have an hourly workflow，the crontab is ："0 0 * * * ? *"
我有一个每小时运行的工作流，crontab 是 :"0 0 * * * ? *"
2. I want to add history data
我去补一个历史数据，数据范围是0点到3点59分
<img width="646" alt="aba7791b47ff5b28599a8f6885eeb52" src="https://user-images.githubusercontent.com/50513095/136656656-e0730af4-d6bc-4835-956a-4881a639230e.png">
3.the history data of 2021-10-09 03:00:00 not works
03点的数据没有运行
### What you expected to happen
I want the data of 2021-10-09 03:00:00 is works
我想要3点的数据执行
### How to reproduce
<img width="646" alt="fd5559070e8152804b241e41a2938b3" src="https://user-images.githubusercontent.com/50513095/136656799-6a19fe41-300e-4ea1-b27b-a680233a76a6.png">
### Anything else
_No response_
### 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/6478 | https://github.com/apache/dolphinscheduler/pull/6491 | e091801e05c8e9243ec96f76a2e7cc1f1f5cecab | 88690462b4b93f8df01ba1952374cdf00c02eda5 | "2021-10-09T11:53:38Z" | java | "2021-10-11T12:03:25Z" | dolphinscheduler-api/src/test/java/org/apache/dolphinscheduler/api/service/ExecutorServiceTest.java | @Test
public void testNoComplement() {
Mockito.when(processService.queryReleaseSchedulerListByProcessDefinitionCode(processDefinitionCode)).thenReturn(zeroSchedulerList());
Map<String, Object> result = executorService.execProcessInstance(loginUser, projectCode,
processDefinitionCode, cronTime, CommandType.START_PROCESS,
null, null,
null, null, 0,
RunMode.RUN_MODE_SERIAL,
Priority.LOW, Constants.DEFAULT_WORKER_GROUP, 100L, 10, null, 0, Constants.DRY_RUN_FLAG_NO);
Assert.assertEquals(Status.SUCCESS, result.get(Constants.STATUS));
verify(processService, times(1)).createCommand(any(Command.class));
}
/**
* not complement
*/
@Test
public void testComplementWithStartNodeList() {
Mockito.when(processService.queryReleaseSchedulerListByProcessDefinitionCode(processDefinitionCode)).thenReturn(zeroSchedulerList());
Map<String, Object> result = executorService.execProcessInstance(loginUser, projectCode,
processDefinitionCode, cronTime, CommandType.START_PROCESS,
null, "n1,n2",
null, null, 0,
RunMode.RUN_MODE_SERIAL,
Priority.LOW, Constants.DEFAULT_WORKER_GROUP, 100L,110, null, 0, Constants.DRY_RUN_FLAG_NO);
Assert.assertEquals(Status.SUCCESS, result.get(Constants.STATUS));
verify(processService, times(1)).createCommand(any(Command.class));
}
/**
* date error
*/ |
closed | apache/dolphinscheduler | https://github.com/apache/dolphinscheduler | 6,478 | [Bug] [API & SERVICE] Missing history data in complement data mode | ### Search before asking
- [X] I had searched in the [issues](https://github.com/apache/dolphinscheduler/issues?q=is%3Aissue) and found no similar issues.
### What happened
1.I have an hourly workflow，the crontab is ："0 0 * * * ? *"
我有一个每小时运行的工作流，crontab 是 :"0 0 * * * ? *"
2. I want to add history data
我去补一个历史数据，数据范围是0点到3点59分
<img width="646" alt="aba7791b47ff5b28599a8f6885eeb52" src="https://user-images.githubusercontent.com/50513095/136656656-e0730af4-d6bc-4835-956a-4881a639230e.png">
3.the history data of 2021-10-09 03:00:00 not works
03点的数据没有运行
### What you expected to happen
I want the data of 2021-10-09 03:00:00 is works
我想要3点的数据执行
### How to reproduce
<img width="646" alt="fd5559070e8152804b241e41a2938b3" src="https://user-images.githubusercontent.com/50513095/136656799-6a19fe41-300e-4ea1-b27b-a680233a76a6.png">
### Anything else
_No response_
### 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/6478 | https://github.com/apache/dolphinscheduler/pull/6491 | e091801e05c8e9243ec96f76a2e7cc1f1f5cecab | 88690462b4b93f8df01ba1952374cdf00c02eda5 | "2021-10-09T11:53:38Z" | java | "2021-10-11T12:03:25Z" | dolphinscheduler-api/src/test/java/org/apache/dolphinscheduler/api/service/ExecutorServiceTest.java | @Test
public void testDateError() {
Mockito.when(processService.queryReleaseSchedulerListByProcessDefinitionCode(processDefinitionCode)).thenReturn(zeroSchedulerList());
Map<String, Object> result = executorService.execProcessInstance(loginUser, projectCode,
processDefinitionCode, "2020-01-31 23:00:00,2020-01-01 00:00:00", CommandType.COMPLEMENT_DATA,
null, null,
null, null, 0,
RunMode.RUN_MODE_SERIAL,
Priority.LOW, Constants.DEFAULT_WORKER_GROUP,100L, 110, null, 0, Constants.DRY_RUN_FLAG_NO);
Assert.assertEquals(Status.START_PROCESS_INSTANCE_ERROR, result.get(Constants.STATUS));
verify(processService, times(0)).createCommand(any(Command.class));
}
/**
* serial
*/
@Test
public void testSerial() {
Mockito.when(processService.queryReleaseSchedulerListByProcessDefinitionCode(processDefinitionCode)).thenReturn(zeroSchedulerList());
Map<String, Object> result = executorService.execProcessInstance(loginUser, projectCode,
processDefinitionCode, cronTime, CommandType.COMPLEMENT_DATA,
null, null,
null, null, 0,
RunMode.RUN_MODE_SERIAL,
Priority.LOW, Constants.DEFAULT_WORKER_GROUP,100L, 110, null, 0, Constants.DRY_RUN_FLAG_NO);
Assert.assertEquals(Status.SUCCESS, result.get(Constants.STATUS));
verify(processService, times(1)).createCommand(any(Command.class));
}
/**
* without schedule
*/ |
closed | apache/dolphinscheduler | https://github.com/apache/dolphinscheduler | 6,478 | [Bug] [API & SERVICE] Missing history data in complement data mode | ### Search before asking
- [X] I had searched in the [issues](https://github.com/apache/dolphinscheduler/issues?q=is%3Aissue) and found no similar issues.
### What happened
1.I have an hourly workflow，the crontab is ："0 0 * * * ? *"
我有一个每小时运行的工作流，crontab 是 :"0 0 * * * ? *"
2. I want to add history data
我去补一个历史数据，数据范围是0点到3点59分
<img width="646" alt="aba7791b47ff5b28599a8f6885eeb52" src="https://user-images.githubusercontent.com/50513095/136656656-e0730af4-d6bc-4835-956a-4881a639230e.png">
3.the history data of 2021-10-09 03:00:00 not works
03点的数据没有运行
### What you expected to happen
I want the data of 2021-10-09 03:00:00 is works
我想要3点的数据执行
### How to reproduce
<img width="646" alt="fd5559070e8152804b241e41a2938b3" src="https://user-images.githubusercontent.com/50513095/136656799-6a19fe41-300e-4ea1-b27b-a680233a76a6.png">
### Anything else
_No response_
### 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/6478 | https://github.com/apache/dolphinscheduler/pull/6491 | e091801e05c8e9243ec96f76a2e7cc1f1f5cecab | 88690462b4b93f8df01ba1952374cdf00c02eda5 | "2021-10-09T11:53:38Z" | java | "2021-10-11T12:03:25Z" | dolphinscheduler-api/src/test/java/org/apache/dolphinscheduler/api/service/ExecutorServiceTest.java | @Test
public void testParallelWithOutSchedule() {
Mockito.when(processService.queryReleaseSchedulerListByProcessDefinitionCode(processDefinitionCode)).thenReturn(zeroSchedulerList());
Map<String, Object> result = executorService.execProcessInstance(loginUser, projectCode,
processDefinitionCode, cronTime, CommandType.COMPLEMENT_DATA,
null, null,
null, null, 0,
RunMode.RUN_MODE_PARALLEL,
Priority.LOW, Constants.DEFAULT_WORKER_GROUP,100L, 110, null, 0, Constants.DRY_RUN_FLAG_NO);
Assert.assertEquals(Status.SUCCESS, result.get(Constants.STATUS));
verify(processService, times(31)).createCommand(any(Command.class));
}
/**
* with schedule
*/
@Test
public void testParallelWithSchedule() {
Mockito.when(processService.queryReleaseSchedulerListByProcessDefinitionCode(processDefinitionCode)).thenReturn(oneSchedulerList());
Map<String, Object> result = executorService.execProcessInstance(loginUser, projectCode,
processDefinitionCode, cronTime, CommandType.COMPLEMENT_DATA,
null, null,
null, null, 0,
RunMode.RUN_MODE_PARALLEL,
Priority.LOW, Constants.DEFAULT_WORKER_GROUP, 100L,110, null, 15, Constants.DRY_RUN_FLAG_NO);
Assert.assertEquals(Status.SUCCESS, result.get(Constants.STATUS));
verify(processService, times(15)).createCommand(any(Command.class));
}
@Test
public void testNoMasterServers() {
Mockito.when(monitorService.getServerListFromRegistry(true)).thenReturn(new ArrayList<>()); |
closed | apache/dolphinscheduler | https://github.com/apache/dolphinscheduler | 6,478 | [Bug] [API & SERVICE] Missing history data in complement data mode | ### Search before asking
- [X] I had searched in the [issues](https://github.com/apache/dolphinscheduler/issues?q=is%3Aissue) and found no similar issues.
### What happened
1.I have an hourly workflow，the crontab is ："0 0 * * * ? *"
我有一个每小时运行的工作流，crontab 是 :"0 0 * * * ? *"
2. I want to add history data
我去补一个历史数据，数据范围是0点到3点59分
<img width="646" alt="aba7791b47ff5b28599a8f6885eeb52" src="https://user-images.githubusercontent.com/50513095/136656656-e0730af4-d6bc-4835-956a-4881a639230e.png">
3.the history data of 2021-10-09 03:00:00 not works
03点的数据没有运行
### What you expected to happen
I want the data of 2021-10-09 03:00:00 is works
我想要3点的数据执行
### How to reproduce
<img width="646" alt="fd5559070e8152804b241e41a2938b3" src="https://user-images.githubusercontent.com/50513095/136656799-6a19fe41-300e-4ea1-b27b-a680233a76a6.png">
### Anything else
_No response_
### 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/6478 | https://github.com/apache/dolphinscheduler/pull/6491 | e091801e05c8e9243ec96f76a2e7cc1f1f5cecab | 88690462b4b93f8df01ba1952374cdf00c02eda5 | "2021-10-09T11:53:38Z" | java | "2021-10-11T12:03:25Z" | dolphinscheduler-api/src/test/java/org/apache/dolphinscheduler/api/service/ExecutorServiceTest.java | Map<String, Object> result = executorService.execProcessInstance(loginUser, projectCode,
processDefinitionCode, cronTime, CommandType.COMPLEMENT_DATA,
null, null,
null, null, 0,
RunMode.RUN_MODE_PARALLEL,
Priority.LOW, Constants.DEFAULT_WORKER_GROUP, 100L,110, null, 0, Constants.DRY_RUN_FLAG_NO);
Assert.assertEquals(result.get(Constants.STATUS), Status.MASTER_NOT_EXISTS);
}
@Test
public void testExecuteRepeatRunning() {
Mockito.when(processService.verifyIsNeedCreateCommand(any(Command.class))).thenReturn(true);
Map<String, Object> result = executorService.execute(loginUser, projectCode, processInstanceId, ExecuteType.REPEAT_RUNNING);
Assert.assertEquals(Status.SUCCESS, result.get(Constants.STATUS));
}
@Test
public void testStartCheckByProcessDefinedCode() {
List<Integer> ids = new ArrayList<>();
ids.add(1);
Mockito.doNothing().when(processService).recurseFindSubProcessId(1, ids);
List<ProcessDefinition> processDefinitionList = new ArrayList<>();
ProcessDefinition processDefinition = new ProcessDefinition();
processDefinition.setId(1);
processDefinition.setReleaseState(ReleaseState.ONLINE);
processDefinitionList.add(processDefinition);
Mockito.when(processDefinitionMapper.queryDefinitionListByIdList(new Integer[ids.size()]))
.thenReturn(processDefinitionList);
Map<String, Object> result = executorService.startCheckByProcessDefinedCode(1L);
Assert.assertEquals(Status.SUCCESS, result.get(Constants.STATUS));
}
private List<Server> getMasterServersList() { |
closed | apache/dolphinscheduler | https://github.com/apache/dolphinscheduler | 6,478 | [Bug] [API & SERVICE] Missing history data in complement data mode | ### Search before asking
- [X] I had searched in the [issues](https://github.com/apache/dolphinscheduler/issues?q=is%3Aissue) and found no similar issues.
### What happened
1.I have an hourly workflow，the crontab is ："0 0 * * * ? *"
我有一个每小时运行的工作流，crontab 是 :"0 0 * * * ? *"
2. I want to add history data
我去补一个历史数据，数据范围是0点到3点59分
<img width="646" alt="aba7791b47ff5b28599a8f6885eeb52" src="https://user-images.githubusercontent.com/50513095/136656656-e0730af4-d6bc-4835-956a-4881a639230e.png">
3.the history data of 2021-10-09 03:00:00 not works
03点的数据没有运行
### What you expected to happen
I want the data of 2021-10-09 03:00:00 is works
我想要3点的数据执行
### How to reproduce
<img width="646" alt="fd5559070e8152804b241e41a2938b3" src="https://user-images.githubusercontent.com/50513095/136656799-6a19fe41-300e-4ea1-b27b-a680233a76a6.png">
### Anything else
_No response_
### 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/6478 | https://github.com/apache/dolphinscheduler/pull/6491 | e091801e05c8e9243ec96f76a2e7cc1f1f5cecab | 88690462b4b93f8df01ba1952374cdf00c02eda5 | "2021-10-09T11:53:38Z" | java | "2021-10-11T12:03:25Z" | dolphinscheduler-api/src/test/java/org/apache/dolphinscheduler/api/service/ExecutorServiceTest.java | List<Server> masterServerList = new ArrayList<>();
Server masterServer1 = new Server();
masterServer1.setId(1);
masterServer1.setHost("192.168.220.188");
masterServer1.setPort(1121);
masterServerList.add(masterServer1);
Server masterServer2 = new Server();
masterServer2.setId(2);
masterServer2.setHost("192.168.220.189");
masterServer2.setPort(1122);
masterServerList.add(masterServer2);
return masterServerList;
}
private List zeroSchedulerList() {
return Collections.EMPTY_LIST;
}
private List<Schedule> oneSchedulerList() {
List<Schedule> schedulerList = new LinkedList<>();
Schedule schedule = new Schedule();
schedule.setCrontab("0 0 0 1/2 * ?");
schedulerList.add(schedule);
return schedulerList;
}
private Map<String, Object> checkProjectAndAuth() {
Map<String, Object> result = new HashMap<>();
result.put(Constants.STATUS, Status.SUCCESS);
return result;
}
} |
closed | apache/dolphinscheduler | https://github.com/apache/dolphinscheduler | 6,478 | [Bug] [API & SERVICE] Missing history data in complement data mode | ### Search before asking
- [X] I had searched in the [issues](https://github.com/apache/dolphinscheduler/issues?q=is%3Aissue) and found no similar issues.
### What happened
1.I have an hourly workflow，the crontab is ："0 0 * * * ? *"
我有一个每小时运行的工作流，crontab 是 :"0 0 * * * ? *"
2. I want to add history data
我去补一个历史数据，数据范围是0点到3点59分
<img width="646" alt="aba7791b47ff5b28599a8f6885eeb52" src="https://user-images.githubusercontent.com/50513095/136656656-e0730af4-d6bc-4835-956a-4881a639230e.png">
3.the history data of 2021-10-09 03:00:00 not works
03点的数据没有运行
### What you expected to happen
I want the data of 2021-10-09 03:00:00 is works
我想要3点的数据执行
### How to reproduce
<img width="646" alt="fd5559070e8152804b241e41a2938b3" src="https://user-images.githubusercontent.com/50513095/136656799-6a19fe41-300e-4ea1-b27b-a680233a76a6.png">
### Anything else
_No response_
### 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/6478 | https://github.com/apache/dolphinscheduler/pull/6491 | e091801e05c8e9243ec96f76a2e7cc1f1f5cecab | 88690462b4b93f8df01ba1952374cdf00c02eda5 | "2021-10-09T11:53:38Z" | java | "2021-10-11T12:03:25Z" | dolphinscheduler-service/src/main/java/org/apache/dolphinscheduler/service/quartz/cron/CronUtils.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.
*/ |
closed | apache/dolphinscheduler | https://github.com/apache/dolphinscheduler | 6,478 | [Bug] [API & SERVICE] Missing history data in complement data mode | ### Search before asking
- [X] I had searched in the [issues](https://github.com/apache/dolphinscheduler/issues?q=is%3Aissue) and found no similar issues.
### What happened
1.I have an hourly workflow，the crontab is ："0 0 * * * ? *"
我有一个每小时运行的工作流，crontab 是 :"0 0 * * * ? *"
2. I want to add history data
我去补一个历史数据，数据范围是0点到3点59分
<img width="646" alt="aba7791b47ff5b28599a8f6885eeb52" src="https://user-images.githubusercontent.com/50513095/136656656-e0730af4-d6bc-4835-956a-4881a639230e.png">
3.the history data of 2021-10-09 03:00:00 not works
03点的数据没有运行
### What you expected to happen
I want the data of 2021-10-09 03:00:00 is works
我想要3点的数据执行
### How to reproduce
<img width="646" alt="fd5559070e8152804b241e41a2938b3" src="https://user-images.githubusercontent.com/50513095/136656799-6a19fe41-300e-4ea1-b27b-a680233a76a6.png">
### Anything else
_No response_
### 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/6478 | https://github.com/apache/dolphinscheduler/pull/6491 | e091801e05c8e9243ec96f76a2e7cc1f1f5cecab | 88690462b4b93f8df01ba1952374cdf00c02eda5 | "2021-10-09T11:53:38Z" | java | "2021-10-11T12:03:25Z" | dolphinscheduler-service/src/main/java/org/apache/dolphinscheduler/service/quartz/cron/CronUtils.java | package org.apache.dolphinscheduler.service.quartz.cron;
import static org.apache.dolphinscheduler.service.quartz.cron.CycleFactory.day;
import static org.apache.dolphinscheduler.service.quartz.cron.CycleFactory.hour;
import static org.apache.dolphinscheduler.service.quartz.cron.CycleFactory.min;
import static org.apache.dolphinscheduler.service.quartz.cron.CycleFactory.month;
import static org.apache.dolphinscheduler.service.quartz.cron.CycleFactory.week;
import static com.cronutils.model.CronType.QUARTZ;
import org.apache.dolphinscheduler.common.Constants;
import org.apache.dolphinscheduler.common.enums.CycleEnum;
import org.apache.dolphinscheduler.common.thread.Stopper;
import org.apache.dolphinscheduler.common.utils.CollectionUtils;
import org.apache.dolphinscheduler.common.utils.DateUtils;
import org.apache.dolphinscheduler.dao.entity.Schedule;
import java.text.ParseException;
import java.util.ArrayList;
import java.util.Calendar;
import java.util.Collections;
import java.util.Date;
import java.util.GregorianCalendar;
import java.util.List;
import org.quartz.CronExpression;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import com.cronutils.model.Cron;
import com.cronutils.model.definition.CronDefinitionBuilder;
import com.cronutils.parser.CronParser;
/**
* cron utils
*/
public class CronUtils { |
closed | apache/dolphinscheduler | https://github.com/apache/dolphinscheduler | 6,478 | [Bug] [API & SERVICE] Missing history data in complement data mode | ### Search before asking
- [X] I had searched in the [issues](https://github.com/apache/dolphinscheduler/issues?q=is%3Aissue) and found no similar issues.
### What happened
1.I have an hourly workflow，the crontab is ："0 0 * * * ? *"
我有一个每小时运行的工作流，crontab 是 :"0 0 * * * ? *"
2. I want to add history data
我去补一个历史数据，数据范围是0点到3点59分
<img width="646" alt="aba7791b47ff5b28599a8f6885eeb52" src="https://user-images.githubusercontent.com/50513095/136656656-e0730af4-d6bc-4835-956a-4881a639230e.png">
3.the history data of 2021-10-09 03:00:00 not works
03点的数据没有运行
### What you expected to happen
I want the data of 2021-10-09 03:00:00 is works
我想要3点的数据执行
### How to reproduce
<img width="646" alt="fd5559070e8152804b241e41a2938b3" src="https://user-images.githubusercontent.com/50513095/136656799-6a19fe41-300e-4ea1-b27b-a680233a76a6.png">
### Anything else
_No response_
### 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/6478 | https://github.com/apache/dolphinscheduler/pull/6491 | e091801e05c8e9243ec96f76a2e7cc1f1f5cecab | 88690462b4b93f8df01ba1952374cdf00c02eda5 | "2021-10-09T11:53:38Z" | java | "2021-10-11T12:03:25Z" | dolphinscheduler-service/src/main/java/org/apache/dolphinscheduler/service/quartz/cron/CronUtils.java | private CronUtils() {
throw new IllegalStateException("CronUtils class");
}
private static final Logger logger = LoggerFactory.getLogger(CronUtils.class);
private static final CronParser QUARTZ_CRON_PARSER = new CronParser(CronDefinitionBuilder.instanceDefinitionFor(QUARTZ));
/**
* parse to cron
*
* @param cronExpression cron expression, never null
* @return Cron instance, corresponding to cron expression received
*/
public static Cron parse2Cron(String cronExpression) {
return QUARTZ_CRON_PARSER.parse(cronExpression);
}
/**
* build a new CronExpression based on the string cronExpression
*
* @param cronExpression String representation of the cron expression the new object should represent
* @return CronExpression
* @throws ParseException if the string expression cannot be parsed into a valid
*/
public static CronExpression parse2CronExpression(String cronExpression) throws ParseException {
return new CronExpression(cronExpression);
}
/** |
closed | apache/dolphinscheduler | https://github.com/apache/dolphinscheduler | 6,478 | [Bug] [API & SERVICE] Missing history data in complement data mode | ### Search before asking
- [X] I had searched in the [issues](https://github.com/apache/dolphinscheduler/issues?q=is%3Aissue) and found no similar issues.
### What happened
1.I have an hourly workflow，the crontab is ："0 0 * * * ? *"
我有一个每小时运行的工作流，crontab 是 :"0 0 * * * ? *"
2. I want to add history data
我去补一个历史数据，数据范围是0点到3点59分
<img width="646" alt="aba7791b47ff5b28599a8f6885eeb52" src="https://user-images.githubusercontent.com/50513095/136656656-e0730af4-d6bc-4835-956a-4881a639230e.png">
3.the history data of 2021-10-09 03:00:00 not works
03点的数据没有运行
### What you expected to happen
I want the data of 2021-10-09 03:00:00 is works
我想要3点的数据执行
### How to reproduce
<img width="646" alt="fd5559070e8152804b241e41a2938b3" src="https://user-images.githubusercontent.com/50513095/136656799-6a19fe41-300e-4ea1-b27b-a680233a76a6.png">
### Anything else
_No response_
### 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/6478 | https://github.com/apache/dolphinscheduler/pull/6491 | e091801e05c8e9243ec96f76a2e7cc1f1f5cecab | 88690462b4b93f8df01ba1952374cdf00c02eda5 | "2021-10-09T11:53:38Z" | java | "2021-10-11T12:03:25Z" | dolphinscheduler-service/src/main/java/org/apache/dolphinscheduler/service/quartz/cron/CronUtils.java | * get max cycle
*
* @param cron cron
* @return CycleEnum
*/
public static CycleEnum getMaxCycle(Cron cron) {
return min(cron).addCycle(hour(cron)).addCycle(day(cron)).addCycle(week(cron)).addCycle(month(cron)).getCycle();
}
/**
* get min cycle
*
* @param cron cron
* @return CycleEnum
*/
public static CycleEnum getMiniCycle(Cron cron) {
return min(cron).addCycle(hour(cron)).addCycle(day(cron)).addCycle(week(cron)).addCycle(month(cron)).getMiniCycle();
}
/**
* get max cycle
*
* @param crontab crontab
* @return CycleEnum
*/
public static CycleEnum getMaxCycle(String crontab) {
return getMaxCycle(parse2Cron(crontab));
}
/**
* gets all scheduled times for a period of time based on not self dependency
*
* @param startTime startTime |
closed | apache/dolphinscheduler | https://github.com/apache/dolphinscheduler | 6,478 | [Bug] [API & SERVICE] Missing history data in complement data mode | ### Search before asking
- [X] I had searched in the [issues](https://github.com/apache/dolphinscheduler/issues?q=is%3Aissue) and found no similar issues.
### What happened
1.I have an hourly workflow，the crontab is ："0 0 * * * ? *"
我有一个每小时运行的工作流，crontab 是 :"0 0 * * * ? *"
2. I want to add history data
我去补一个历史数据，数据范围是0点到3点59分
<img width="646" alt="aba7791b47ff5b28599a8f6885eeb52" src="https://user-images.githubusercontent.com/50513095/136656656-e0730af4-d6bc-4835-956a-4881a639230e.png">
3.the history data of 2021-10-09 03:00:00 not works
03点的数据没有运行
### What you expected to happen
I want the data of 2021-10-09 03:00:00 is works
我想要3点的数据执行
### How to reproduce
<img width="646" alt="fd5559070e8152804b241e41a2938b3" src="https://user-images.githubusercontent.com/50513095/136656799-6a19fe41-300e-4ea1-b27b-a680233a76a6.png">
### Anything else
_No response_
### 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/6478 | https://github.com/apache/dolphinscheduler/pull/6491 | e091801e05c8e9243ec96f76a2e7cc1f1f5cecab | 88690462b4b93f8df01ba1952374cdf00c02eda5 | "2021-10-09T11:53:38Z" | java | "2021-10-11T12:03:25Z" | dolphinscheduler-service/src/main/java/org/apache/dolphinscheduler/service/quartz/cron/CronUtils.java | * @param endTime endTime
* @param cronExpression cronExpression
* @return date list
*/
public static List<Date> getFireDateList(Date startTime, Date endTime, CronExpression cronExpression) {
List<Date> dateList = new ArrayList<>();
while (Stopper.isRunning()) {
startTime = cronExpression.getNextValidTimeAfter(startTime);
if (startTime.after(endTime)) {
break;
}
dateList.add(startTime);
}
return dateList;
}
/**
* gets expect scheduled times for a period of time based on self dependency
*
* @param startTime startTime
* @param endTime endTime
* @param cronExpression cronExpression
* @param fireTimes fireTimes
* @return date list
*/
public static List<Date> getSelfFireDateList(Date startTime, Date endTime, CronExpression cronExpression, int fireTimes) {
List<Date> dateList = new ArrayList<>();
while (fireTimes > 0) {
startTime = cronExpression.getNextValidTimeAfter(startTime);
if (startTime.after(endTime) || startTime.equals(endTime)) {
break; |
closed | apache/dolphinscheduler | https://github.com/apache/dolphinscheduler | 6,478 | [Bug] [API & SERVICE] Missing history data in complement data mode | ### Search before asking
- [X] I had searched in the [issues](https://github.com/apache/dolphinscheduler/issues?q=is%3Aissue) and found no similar issues.
### What happened
1.I have an hourly workflow，the crontab is ："0 0 * * * ? *"
我有一个每小时运行的工作流，crontab 是 :"0 0 * * * ? *"
2. I want to add history data
我去补一个历史数据，数据范围是0点到3点59分
<img width="646" alt="aba7791b47ff5b28599a8f6885eeb52" src="https://user-images.githubusercontent.com/50513095/136656656-e0730af4-d6bc-4835-956a-4881a639230e.png">
3.the history data of 2021-10-09 03:00:00 not works
03点的数据没有运行
### What you expected to happen
I want the data of 2021-10-09 03:00:00 is works
我想要3点的数据执行
### How to reproduce
<img width="646" alt="fd5559070e8152804b241e41a2938b3" src="https://user-images.githubusercontent.com/50513095/136656799-6a19fe41-300e-4ea1-b27b-a680233a76a6.png">
### Anything else
_No response_
### 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/6478 | https://github.com/apache/dolphinscheduler/pull/6491 | e091801e05c8e9243ec96f76a2e7cc1f1f5cecab | 88690462b4b93f8df01ba1952374cdf00c02eda5 | "2021-10-09T11:53:38Z" | java | "2021-10-11T12:03:25Z" | dolphinscheduler-service/src/main/java/org/apache/dolphinscheduler/service/quartz/cron/CronUtils.java | }
dateList.add(startTime);
fireTimes--;
}
return dateList;
}
/**
* gets all scheduled times for a period of time based on self dependency
*
* @param startTime startTime
* @param endTime endTime
* @param cronExpression cronExpression
* @return date list
*/
public static List<Date> getSelfFireDateList(Date startTime, Date endTime, CronExpression cronExpression) {
List<Date> dateList = new ArrayList<>();
while (Stopper.isRunning()) {
startTime = cronExpression.getNextValidTimeAfter(startTime);
if (startTime.after(endTime) || startTime.equals(endTime)) {
break;
}
dateList.add(startTime);
}
return dateList;
}
/**
* gets all scheduled times for a period of time based on self dependency
* if schedulers is empty then default scheduler = 1 day
*/
public static List<Date> getSelfFireDateList(final Date startTime, final Date endTime, final List<Schedule> schedules) { |
closed | apache/dolphinscheduler | https://github.com/apache/dolphinscheduler | 6,478 | [Bug] [API & SERVICE] Missing history data in complement data mode | ### Search before asking
- [X] I had searched in the [issues](https://github.com/apache/dolphinscheduler/issues?q=is%3Aissue) and found no similar issues.
### What happened
1.I have an hourly workflow，the crontab is ："0 0 * * * ? *"
我有一个每小时运行的工作流，crontab 是 :"0 0 * * * ? *"
2. I want to add history data
我去补一个历史数据，数据范围是0点到3点59分
<img width="646" alt="aba7791b47ff5b28599a8f6885eeb52" src="https://user-images.githubusercontent.com/50513095/136656656-e0730af4-d6bc-4835-956a-4881a639230e.png">
3.the history data of 2021-10-09 03:00:00 not works
03点的数据没有运行
### What you expected to happen
I want the data of 2021-10-09 03:00:00 is works
我想要3点的数据执行
### How to reproduce
<img width="646" alt="fd5559070e8152804b241e41a2938b3" src="https://user-images.githubusercontent.com/50513095/136656799-6a19fe41-300e-4ea1-b27b-a680233a76a6.png">
### Anything else
_No response_
### 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/6478 | https://github.com/apache/dolphinscheduler/pull/6491 | e091801e05c8e9243ec96f76a2e7cc1f1f5cecab | 88690462b4b93f8df01ba1952374cdf00c02eda5 | "2021-10-09T11:53:38Z" | java | "2021-10-11T12:03:25Z" | dolphinscheduler-service/src/main/java/org/apache/dolphinscheduler/service/quartz/cron/CronUtils.java | List<Date> result = new ArrayList<>();
if(startTime.equals(endTime)){
result.add(startTime);
return result;
}
Date from = new Date(startTime.getTime() - Constants.SECOND_TIME_MILLIS);
Date to = new Date(endTime.getTime() - Constants.SECOND_TIME_MILLIS);
List<Schedule> listSchedule = new ArrayList<>();
listSchedule.addAll(schedules);
if (CollectionUtils.isEmpty(listSchedule)) {
Schedule schedule = new Schedule();
schedule.setCrontab(Constants.DEFAULT_CRON_STRING);
listSchedule.add(schedule);
}
for (Schedule schedule : listSchedule) {
result.addAll(CronUtils.getSelfFireDateList(from, to, schedule.getCrontab()));
}
return result;
}
/**
* gets all scheduled times for a period of time based on self dependency
*
* @param startTime startTime
* @param endTime endTime
* @param cron cron
* @return date list
*/
public static List<Date> getSelfFireDateList(Date startTime, Date endTime, String cron) {
CronExpression cronExpression = null;
try { |
closed | apache/dolphinscheduler | https://github.com/apache/dolphinscheduler | 6,478 | [Bug] [API & SERVICE] Missing history data in complement data mode | ### Search before asking
- [X] I had searched in the [issues](https://github.com/apache/dolphinscheduler/issues?q=is%3Aissue) and found no similar issues.
### What happened
1.I have an hourly workflow，the crontab is ："0 0 * * * ? *"
我有一个每小时运行的工作流，crontab 是 :"0 0 * * * ? *"
2. I want to add history data
我去补一个历史数据，数据范围是0点到3点59分
<img width="646" alt="aba7791b47ff5b28599a8f6885eeb52" src="https://user-images.githubusercontent.com/50513095/136656656-e0730af4-d6bc-4835-956a-4881a639230e.png">
3.the history data of 2021-10-09 03:00:00 not works
03点的数据没有运行
### What you expected to happen
I want the data of 2021-10-09 03:00:00 is works
我想要3点的数据执行
### How to reproduce
<img width="646" alt="fd5559070e8152804b241e41a2938b3" src="https://user-images.githubusercontent.com/50513095/136656799-6a19fe41-300e-4ea1-b27b-a680233a76a6.png">
### Anything else
_No response_
### 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/6478 | https://github.com/apache/dolphinscheduler/pull/6491 | e091801e05c8e9243ec96f76a2e7cc1f1f5cecab | 88690462b4b93f8df01ba1952374cdf00c02eda5 | "2021-10-09T11:53:38Z" | java | "2021-10-11T12:03:25Z" | dolphinscheduler-service/src/main/java/org/apache/dolphinscheduler/service/quartz/cron/CronUtils.java | cronExpression = parse2CronExpression(cron);
} catch (ParseException e) {
logger.error(e.getMessage(), e);
return Collections.emptyList();
}
return getSelfFireDateList(startTime, endTime, cronExpression);
}
/**
* get expiration time
*
* @param startTime startTime
* @param cycleEnum cycleEnum
* @return date
*/
public static Date getExpirationTime(Date startTime, CycleEnum cycleEnum) {
Date maxExpirationTime = null;
Date startTimeMax = null;
try {
startTimeMax = getEndTime(startTime);
Calendar calendar = Calendar.getInstance();
calendar.setTime(startTime);
switch (cycleEnum) {
case HOUR:
calendar.add(Calendar.HOUR, 1);
break;
case DAY:
calendar.add(Calendar.DATE, 1);
break;
case WEEK:
calendar.add(Calendar.DATE, 1); |
closed | apache/dolphinscheduler | https://github.com/apache/dolphinscheduler | 6,478 | [Bug] [API & SERVICE] Missing history data in complement data mode | ### Search before asking
- [X] I had searched in the [issues](https://github.com/apache/dolphinscheduler/issues?q=is%3Aissue) and found no similar issues.
### What happened
1.I have an hourly workflow，the crontab is ："0 0 * * * ? *"
我有一个每小时运行的工作流，crontab 是 :"0 0 * * * ? *"
2. I want to add history data
我去补一个历史数据，数据范围是0点到3点59分
<img width="646" alt="aba7791b47ff5b28599a8f6885eeb52" src="https://user-images.githubusercontent.com/50513095/136656656-e0730af4-d6bc-4835-956a-4881a639230e.png">
3.the history data of 2021-10-09 03:00:00 not works
03点的数据没有运行
### What you expected to happen
I want the data of 2021-10-09 03:00:00 is works
我想要3点的数据执行
### How to reproduce
<img width="646" alt="fd5559070e8152804b241e41a2938b3" src="https://user-images.githubusercontent.com/50513095/136656799-6a19fe41-300e-4ea1-b27b-a680233a76a6.png">
### Anything else
_No response_
### 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/6478 | https://github.com/apache/dolphinscheduler/pull/6491 | e091801e05c8e9243ec96f76a2e7cc1f1f5cecab | 88690462b4b93f8df01ba1952374cdf00c02eda5 | "2021-10-09T11:53:38Z" | java | "2021-10-11T12:03:25Z" | dolphinscheduler-service/src/main/java/org/apache/dolphinscheduler/service/quartz/cron/CronUtils.java | break;
case MONTH:
calendar.add(Calendar.DATE, 1);
break;
default:
logger.error("Dependent process definition's cycleEnum is {},not support!!", cycleEnum);
break;
}
maxExpirationTime = calendar.getTime();
} catch (Exception e) {
logger.error(e.getMessage(), e);
}
return DateUtils.compare(startTimeMax, maxExpirationTime) ? maxExpirationTime : startTimeMax;
}
/**
* get the end time of the day by value of date
*
* @return date
*/
private static Date getEndTime(Date date) {
Calendar end = new GregorianCalendar();
end.setTime(date);
end.set(Calendar.HOUR_OF_DAY, 23);
end.set(Calendar.MINUTE, 59);
end.set(Calendar.SECOND, 59);
end.set(Calendar.MILLISECOND, 999);
return end.getTime();
}
} |
closed | apache/dolphinscheduler | https://github.com/apache/dolphinscheduler | 6,502 | [Bug] [MasterServer] cmdParam NPE when constructProcessInstance on SCHEDULER mode | ### Search before asking
- [X] I had searched in the [issues](https://github.com/apache/dolphinscheduler/issues?q=is%3Aissue) and found no similar issues.
### What happened
```
[ERROR] 2021-10-11 23:38:00.433 org.apache.dolphinscheduler.server.master.runner.MasterSchedulerService:[211] - scan command error
java.lang.NullPointerException: null
at org.apache.dolphinscheduler.service.process.ProcessService.constructProcessInstance(ProcessService.java:804)
at org.apache.dolphinscheduler.service.process.ProcessService.handleCommand(ProcessService.java:216)
at org.apache.dolphinscheduler.service.process.ProcessService$$FastClassBySpringCGLIB$$ed138739.invoke(<generated>)
at org.springframework.cglib.proxy.MethodProxy.invoke(MethodProxy.java:218)
at org.springframework.aop.framework.CglibAopProxy$DynamicAdvisedInterceptor.intercept(CglibAopProxy.java:687)
at org.apache.dolphinscheduler.service.process.ProcessService$$EnhancerBySpringCGLIB$$c9f32f1c.handleCommand(<generated>)
at org.apache.dolphinscheduler.server.master.runner.MasterSchedulerService.scheduleProcess(MasterSchedulerService.java:189)
at org.apache.dolphinscheduler.server.master.runner.MasterSchedulerService.run(MasterSchedulerService.java:169)
```
### What you expected to happen
not NPE when run
### How to reproduce
run some task
### Anything else
_No response_
### Are you willing to submit PR?
- [X] Yes I am willing to submit a PR!
### Code of Conduct
- [X] I agree to follow this project's [Code of Conduct](https://www.apache.org/foundation/policies/conduct)
| https://github.com/apache/dolphinscheduler/issues/6502 | https://github.com/apache/dolphinscheduler/pull/6504 | db04a5b04df8aa5754741c6dd456579d743af1e9 | fea7874f95028325f52300949295260cafab4a64 | "2021-10-12T02:35:18Z" | java | "2021-10-12T06:42:49Z" | dolphinscheduler-service/src/main/java/org/apache/dolphinscheduler/service/process/ProcessService.java | /*
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
* this work for additional information regarding copyright ownership.
* The ASF licenses this file to You under the Apache License, Version 2.0
* (the "License"); you may not use this file except in compliance with
* the License. You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package org.apache.dolphinscheduler.service.process;
import static org.apache.dolphinscheduler.common.Constants.CMDPARAM_COMPLEMENT_DATA_END_DATE;
import static org.apache.dolphinscheduler.common.Constants.CMDPARAM_COMPLEMENT_DATA_START_DATE;
import static org.apache.dolphinscheduler.common.Constants.CMD_PARAM_EMPTY_SUB_PROCESS;
import static org.apache.dolphinscheduler.common.Constants.CMD_PARAM_FATHER_PARAMS;
import static org.apache.dolphinscheduler.common.Constants.CMD_PARAM_RECOVER_PROCESS_ID_STRING;
import static org.apache.dolphinscheduler.common.Constants.CMD_PARAM_SUB_PROCESS;
import static org.apache.dolphinscheduler.common.Constants.CMD_PARAM_SUB_PROCESS_DEFINE_ID;
import static org.apache.dolphinscheduler.common.Constants.CMD_PARAM_SUB_PROCESS_PARENT_INSTANCE_ID;
import static org.apache.dolphinscheduler.common.Constants.LOCAL_PARAMS;
import static java.util.stream.Collectors.toSet; |
closed | apache/dolphinscheduler | https://github.com/apache/dolphinscheduler | 6,502 | [Bug] [MasterServer] cmdParam NPE when constructProcessInstance on SCHEDULER mode | ### Search before asking
- [X] I had searched in the [issues](https://github.com/apache/dolphinscheduler/issues?q=is%3Aissue) and found no similar issues.
### What happened
```
[ERROR] 2021-10-11 23:38:00.433 org.apache.dolphinscheduler.server.master.runner.MasterSchedulerService:[211] - scan command error
java.lang.NullPointerException: null
at org.apache.dolphinscheduler.service.process.ProcessService.constructProcessInstance(ProcessService.java:804)
at org.apache.dolphinscheduler.service.process.ProcessService.handleCommand(ProcessService.java:216)
at org.apache.dolphinscheduler.service.process.ProcessService$$FastClassBySpringCGLIB$$ed138739.invoke(<generated>)
at org.springframework.cglib.proxy.MethodProxy.invoke(MethodProxy.java:218)
at org.springframework.aop.framework.CglibAopProxy$DynamicAdvisedInterceptor.intercept(CglibAopProxy.java:687)
at org.apache.dolphinscheduler.service.process.ProcessService$$EnhancerBySpringCGLIB$$c9f32f1c.handleCommand(<generated>)
at org.apache.dolphinscheduler.server.master.runner.MasterSchedulerService.scheduleProcess(MasterSchedulerService.java:189)
at org.apache.dolphinscheduler.server.master.runner.MasterSchedulerService.run(MasterSchedulerService.java:169)
```
### What you expected to happen
not NPE when run
### How to reproduce
run some task
### Anything else
_No response_
### Are you willing to submit PR?
- [X] Yes I am willing to submit a PR!
### Code of Conduct
- [X] I agree to follow this project's [Code of Conduct](https://www.apache.org/foundation/policies/conduct)
| https://github.com/apache/dolphinscheduler/issues/6502 | https://github.com/apache/dolphinscheduler/pull/6504 | db04a5b04df8aa5754741c6dd456579d743af1e9 | fea7874f95028325f52300949295260cafab4a64 | "2021-10-12T02:35:18Z" | java | "2021-10-12T06:42:49Z" | dolphinscheduler-service/src/main/java/org/apache/dolphinscheduler/service/process/ProcessService.java | import org.apache.dolphinscheduler.common.Constants;
import org.apache.dolphinscheduler.common.enums.AuthorizationType;
import org.apache.dolphinscheduler.common.enums.CommandType;
import org.apache.dolphinscheduler.common.enums.Direct;
import org.apache.dolphinscheduler.common.enums.ExecutionStatus;
import org.apache.dolphinscheduler.common.enums.FailureStrategy;
import org.apache.dolphinscheduler.common.enums.Flag;
import org.apache.dolphinscheduler.common.enums.ReleaseState;
import org.apache.dolphinscheduler.common.enums.ResourceType;
import org.apache.dolphinscheduler.common.enums.TaskDependType;
import org.apache.dolphinscheduler.common.enums.TimeoutFlag;
import org.apache.dolphinscheduler.common.enums.WarningType;
import org.apache.dolphinscheduler.common.graph.DAG;
import org.apache.dolphinscheduler.common.model.DateInterval;
import org.apache.dolphinscheduler.common.model.TaskNode;
import org.apache.dolphinscheduler.common.model.TaskNodeRelation;
import org.apache.dolphinscheduler.common.process.ProcessDag;
import org.apache.dolphinscheduler.common.process.Property;
import org.apache.dolphinscheduler.common.process.ResourceInfo;
import org.apache.dolphinscheduler.common.task.AbstractParameters;
import org.apache.dolphinscheduler.common.task.TaskTimeoutParameter;
import org.apache.dolphinscheduler.common.task.subprocess.SubProcessParameters;
import org.apache.dolphinscheduler.common.utils.CollectionUtils;
import org.apache.dolphinscheduler.common.utils.DateUtils;
import org.apache.dolphinscheduler.common.utils.JSONUtils;
import org.apache.dolphinscheduler.common.utils.ParameterUtils;
import org.apache.dolphinscheduler.common.utils.SnowFlakeUtils;
import org.apache.dolphinscheduler.common.utils.SnowFlakeUtils.SnowFlakeException;
import org.apache.dolphinscheduler.common.utils.TaskParametersUtils;
import org.apache.dolphinscheduler.dao.entity.Command; |
closed | apache/dolphinscheduler | https://github.com/apache/dolphinscheduler | 6,502 | [Bug] [MasterServer] cmdParam NPE when constructProcessInstance on SCHEDULER mode | ### Search before asking
- [X] I had searched in the [issues](https://github.com/apache/dolphinscheduler/issues?q=is%3Aissue) and found no similar issues.
### What happened
```
[ERROR] 2021-10-11 23:38:00.433 org.apache.dolphinscheduler.server.master.runner.MasterSchedulerService:[211] - scan command error
java.lang.NullPointerException: null
at org.apache.dolphinscheduler.service.process.ProcessService.constructProcessInstance(ProcessService.java:804)
at org.apache.dolphinscheduler.service.process.ProcessService.handleCommand(ProcessService.java:216)
at org.apache.dolphinscheduler.service.process.ProcessService$$FastClassBySpringCGLIB$$ed138739.invoke(<generated>)
at org.springframework.cglib.proxy.MethodProxy.invoke(MethodProxy.java:218)
at org.springframework.aop.framework.CglibAopProxy$DynamicAdvisedInterceptor.intercept(CglibAopProxy.java:687)
at org.apache.dolphinscheduler.service.process.ProcessService$$EnhancerBySpringCGLIB$$c9f32f1c.handleCommand(<generated>)
at org.apache.dolphinscheduler.server.master.runner.MasterSchedulerService.scheduleProcess(MasterSchedulerService.java:189)
at org.apache.dolphinscheduler.server.master.runner.MasterSchedulerService.run(MasterSchedulerService.java:169)
```
### What you expected to happen
not NPE when run
### How to reproduce
run some task
### Anything else
_No response_
### Are you willing to submit PR?
- [X] Yes I am willing to submit a PR!
### Code of Conduct
- [X] I agree to follow this project's [Code of Conduct](https://www.apache.org/foundation/policies/conduct)
| https://github.com/apache/dolphinscheduler/issues/6502 | https://github.com/apache/dolphinscheduler/pull/6504 | db04a5b04df8aa5754741c6dd456579d743af1e9 | fea7874f95028325f52300949295260cafab4a64 | "2021-10-12T02:35:18Z" | java | "2021-10-12T06:42:49Z" | dolphinscheduler-service/src/main/java/org/apache/dolphinscheduler/service/process/ProcessService.java | import org.apache.dolphinscheduler.dao.entity.DagData;
import org.apache.dolphinscheduler.dao.entity.DataSource;
import org.apache.dolphinscheduler.dao.entity.Environment;
import org.apache.dolphinscheduler.dao.entity.ErrorCommand;
import org.apache.dolphinscheduler.dao.entity.ProcessDefinition;
import org.apache.dolphinscheduler.dao.entity.ProcessDefinitionLog;
import org.apache.dolphinscheduler.dao.entity.ProcessInstance;
import org.apache.dolphinscheduler.dao.entity.ProcessInstanceMap;
import org.apache.dolphinscheduler.dao.entity.ProcessTaskRelation;
import org.apache.dolphinscheduler.dao.entity.ProcessTaskRelationLog;
import org.apache.dolphinscheduler.dao.entity.Project;
import org.apache.dolphinscheduler.dao.entity.ProjectUser;
import org.apache.dolphinscheduler.dao.entity.Resource;
import org.apache.dolphinscheduler.dao.entity.Schedule;
import org.apache.dolphinscheduler.dao.entity.TaskDefinition;
import org.apache.dolphinscheduler.dao.entity.TaskDefinitionLog;
import org.apache.dolphinscheduler.dao.entity.TaskInstance;
import org.apache.dolphinscheduler.dao.entity.Tenant;
import org.apache.dolphinscheduler.dao.entity.UdfFunc;
import org.apache.dolphinscheduler.dao.entity.User;
import org.apache.dolphinscheduler.dao.mapper.CommandMapper;
import org.apache.dolphinscheduler.dao.mapper.DataSourceMapper;
import org.apache.dolphinscheduler.dao.mapper.EnvironmentMapper;
import org.apache.dolphinscheduler.dao.mapper.ErrorCommandMapper;
import org.apache.dolphinscheduler.dao.mapper.ProcessDefinitionLogMapper;
import org.apache.dolphinscheduler.dao.mapper.ProcessDefinitionMapper;
import org.apache.dolphinscheduler.dao.mapper.ProcessInstanceMapMapper;
import org.apache.dolphinscheduler.dao.mapper.ProcessInstanceMapper;
import org.apache.dolphinscheduler.dao.mapper.ProcessTaskRelationLogMapper;
import org.apache.dolphinscheduler.dao.mapper.ProcessTaskRelationMapper; |
closed | apache/dolphinscheduler | https://github.com/apache/dolphinscheduler | 6,502 | [Bug] [MasterServer] cmdParam NPE when constructProcessInstance on SCHEDULER mode | ### Search before asking
- [X] I had searched in the [issues](https://github.com/apache/dolphinscheduler/issues?q=is%3Aissue) and found no similar issues.
### What happened
```
[ERROR] 2021-10-11 23:38:00.433 org.apache.dolphinscheduler.server.master.runner.MasterSchedulerService:[211] - scan command error
java.lang.NullPointerException: null
at org.apache.dolphinscheduler.service.process.ProcessService.constructProcessInstance(ProcessService.java:804)
at org.apache.dolphinscheduler.service.process.ProcessService.handleCommand(ProcessService.java:216)
at org.apache.dolphinscheduler.service.process.ProcessService$$FastClassBySpringCGLIB$$ed138739.invoke(<generated>)
at org.springframework.cglib.proxy.MethodProxy.invoke(MethodProxy.java:218)
at org.springframework.aop.framework.CglibAopProxy$DynamicAdvisedInterceptor.intercept(CglibAopProxy.java:687)
at org.apache.dolphinscheduler.service.process.ProcessService$$EnhancerBySpringCGLIB$$c9f32f1c.handleCommand(<generated>)
at org.apache.dolphinscheduler.server.master.runner.MasterSchedulerService.scheduleProcess(MasterSchedulerService.java:189)
at org.apache.dolphinscheduler.server.master.runner.MasterSchedulerService.run(MasterSchedulerService.java:169)
```
### What you expected to happen
not NPE when run
### How to reproduce
run some task
### Anything else
_No response_
### Are you willing to submit PR?
- [X] Yes I am willing to submit a PR!
### Code of Conduct
- [X] I agree to follow this project's [Code of Conduct](https://www.apache.org/foundation/policies/conduct)
| https://github.com/apache/dolphinscheduler/issues/6502 | https://github.com/apache/dolphinscheduler/pull/6504 | db04a5b04df8aa5754741c6dd456579d743af1e9 | fea7874f95028325f52300949295260cafab4a64 | "2021-10-12T02:35:18Z" | java | "2021-10-12T06:42:49Z" | dolphinscheduler-service/src/main/java/org/apache/dolphinscheduler/service/process/ProcessService.java | import org.apache.dolphinscheduler.dao.mapper.ProjectMapper;
import org.apache.dolphinscheduler.dao.mapper.ResourceMapper;
import org.apache.dolphinscheduler.dao.mapper.ResourceUserMapper;
import org.apache.dolphinscheduler.dao.mapper.ScheduleMapper;
import org.apache.dolphinscheduler.dao.mapper.TaskDefinitionLogMapper;
import org.apache.dolphinscheduler.dao.mapper.TaskDefinitionMapper;
import org.apache.dolphinscheduler.dao.mapper.TaskInstanceMapper;
import org.apache.dolphinscheduler.dao.mapper.TenantMapper;
import org.apache.dolphinscheduler.dao.mapper.UdfFuncMapper;
import org.apache.dolphinscheduler.dao.mapper.UserMapper;
import org.apache.dolphinscheduler.dao.utils.DagHelper;
import org.apache.dolphinscheduler.remote.utils.Host;
import org.apache.dolphinscheduler.service.log.LogClientService;
import org.apache.dolphinscheduler.service.quartz.cron.CronUtils;
import org.apache.commons.lang.StringUtils;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Date;
import java.util.EnumMap;
import java.util.HashMap;
import java.util.HashSet;
import java.util.List;
import java.util.Map;
import java.util.Map.Entry;
import java.util.Objects;
import java.util.Set;
import java.util.stream.Collectors;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired; |
closed | apache/dolphinscheduler | https://github.com/apache/dolphinscheduler | 6,502 | [Bug] [MasterServer] cmdParam NPE when constructProcessInstance on SCHEDULER mode | ### Search before asking
- [X] I had searched in the [issues](https://github.com/apache/dolphinscheduler/issues?q=is%3Aissue) and found no similar issues.
### What happened
```
[ERROR] 2021-10-11 23:38:00.433 org.apache.dolphinscheduler.server.master.runner.MasterSchedulerService:[211] - scan command error
java.lang.NullPointerException: null
at org.apache.dolphinscheduler.service.process.ProcessService.constructProcessInstance(ProcessService.java:804)
at org.apache.dolphinscheduler.service.process.ProcessService.handleCommand(ProcessService.java:216)
at org.apache.dolphinscheduler.service.process.ProcessService$$FastClassBySpringCGLIB$$ed138739.invoke(<generated>)
at org.springframework.cglib.proxy.MethodProxy.invoke(MethodProxy.java:218)
at org.springframework.aop.framework.CglibAopProxy$DynamicAdvisedInterceptor.intercept(CglibAopProxy.java:687)
at org.apache.dolphinscheduler.service.process.ProcessService$$EnhancerBySpringCGLIB$$c9f32f1c.handleCommand(<generated>)
at org.apache.dolphinscheduler.server.master.runner.MasterSchedulerService.scheduleProcess(MasterSchedulerService.java:189)
at org.apache.dolphinscheduler.server.master.runner.MasterSchedulerService.run(MasterSchedulerService.java:169)
```
### What you expected to happen
not NPE when run
### How to reproduce
run some task
### Anything else
_No response_
### Are you willing to submit PR?
- [X] Yes I am willing to submit a PR!
### Code of Conduct
- [X] I agree to follow this project's [Code of Conduct](https://www.apache.org/foundation/policies/conduct)
| https://github.com/apache/dolphinscheduler/issues/6502 | https://github.com/apache/dolphinscheduler/pull/6504 | db04a5b04df8aa5754741c6dd456579d743af1e9 | fea7874f95028325f52300949295260cafab4a64 | "2021-10-12T02:35:18Z" | java | "2021-10-12T06:42:49Z" | dolphinscheduler-service/src/main/java/org/apache/dolphinscheduler/service/process/ProcessService.java | import org.springframework.stereotype.Component;
import org.springframework.transaction.annotation.Transactional;
import com.facebook.presto.jdbc.internal.guava.collect.Lists;
import com.fasterxml.jackson.core.type.TypeReference;
import com.fasterxml.jackson.databind.node.ObjectNode;
/**
* process relative dao that some mappers in this.
*/
@Component
public class ProcessService {
private final Logger logger = LoggerFactory.getLogger(getClass());
private final int[] stateArray = new int[]{ExecutionStatus.SUBMITTED_SUCCESS.ordinal(),
ExecutionStatus.RUNNING_EXECUTION.ordinal(),
ExecutionStatus.DELAY_EXECUTION.ordinal(),
ExecutionStatus.READY_PAUSE.ordinal(),
ExecutionStatus.READY_STOP.ordinal()};
@Autowired
private UserMapper userMapper;
@Autowired
private ProcessDefinitionMapper processDefineMapper;
@Autowired
private ProcessDefinitionLogMapper processDefineLogMapper;
@Autowired
private ProcessInstanceMapper processInstanceMapper;
@Autowired
private DataSourceMapper dataSourceMapper;
@Autowired
private ProcessInstanceMapMapper processInstanceMapMapper;
@Autowired
private TaskInstanceMapper taskInstanceMapper; |
closed | apache/dolphinscheduler | https://github.com/apache/dolphinscheduler | 6,502 | [Bug] [MasterServer] cmdParam NPE when constructProcessInstance on SCHEDULER mode | ### Search before asking
- [X] I had searched in the [issues](https://github.com/apache/dolphinscheduler/issues?q=is%3Aissue) and found no similar issues.
### What happened
```
[ERROR] 2021-10-11 23:38:00.433 org.apache.dolphinscheduler.server.master.runner.MasterSchedulerService:[211] - scan command error
java.lang.NullPointerException: null
at org.apache.dolphinscheduler.service.process.ProcessService.constructProcessInstance(ProcessService.java:804)
at org.apache.dolphinscheduler.service.process.ProcessService.handleCommand(ProcessService.java:216)
at org.apache.dolphinscheduler.service.process.ProcessService$$FastClassBySpringCGLIB$$ed138739.invoke(<generated>)
at org.springframework.cglib.proxy.MethodProxy.invoke(MethodProxy.java:218)
at org.springframework.aop.framework.CglibAopProxy$DynamicAdvisedInterceptor.intercept(CglibAopProxy.java:687)
at org.apache.dolphinscheduler.service.process.ProcessService$$EnhancerBySpringCGLIB$$c9f32f1c.handleCommand(<generated>)
at org.apache.dolphinscheduler.server.master.runner.MasterSchedulerService.scheduleProcess(MasterSchedulerService.java:189)
at org.apache.dolphinscheduler.server.master.runner.MasterSchedulerService.run(MasterSchedulerService.java:169)
```
### What you expected to happen
not NPE when run
### How to reproduce
run some task
### Anything else
_No response_
### Are you willing to submit PR?
- [X] Yes I am willing to submit a PR!
### Code of Conduct
- [X] I agree to follow this project's [Code of Conduct](https://www.apache.org/foundation/policies/conduct)
| https://github.com/apache/dolphinscheduler/issues/6502 | https://github.com/apache/dolphinscheduler/pull/6504 | db04a5b04df8aa5754741c6dd456579d743af1e9 | fea7874f95028325f52300949295260cafab4a64 | "2021-10-12T02:35:18Z" | java | "2021-10-12T06:42:49Z" | dolphinscheduler-service/src/main/java/org/apache/dolphinscheduler/service/process/ProcessService.java | @Autowired
private CommandMapper commandMapper;
@Autowired
private ScheduleMapper scheduleMapper;
@Autowired
private UdfFuncMapper udfFuncMapper;
@Autowired
private ResourceMapper resourceMapper;
@Autowired
private ResourceUserMapper resourceUserMapper;
@Autowired
private ErrorCommandMapper errorCommandMapper;
@Autowired
private TenantMapper tenantMapper;
@Autowired
private ProjectMapper projectMapper;
@Autowired
private TaskDefinitionMapper taskDefinitionMapper;
@Autowired
private TaskDefinitionLogMapper taskDefinitionLogMapper;
@Autowired
private ProcessTaskRelationMapper processTaskRelationMapper;
@Autowired
private ProcessTaskRelationLogMapper processTaskRelationLogMapper;
@Autowired
private EnvironmentMapper environmentMapper;
/**
* handle Command (construct ProcessInstance from Command) , wrapped in transaction
*
* @param logger logger |
closed | apache/dolphinscheduler | https://github.com/apache/dolphinscheduler | 6,502 | [Bug] [MasterServer] cmdParam NPE when constructProcessInstance on SCHEDULER mode | ### Search before asking
- [X] I had searched in the [issues](https://github.com/apache/dolphinscheduler/issues?q=is%3Aissue) and found no similar issues.
### What happened
```
[ERROR] 2021-10-11 23:38:00.433 org.apache.dolphinscheduler.server.master.runner.MasterSchedulerService:[211] - scan command error
java.lang.NullPointerException: null
at org.apache.dolphinscheduler.service.process.ProcessService.constructProcessInstance(ProcessService.java:804)
at org.apache.dolphinscheduler.service.process.ProcessService.handleCommand(ProcessService.java:216)
at org.apache.dolphinscheduler.service.process.ProcessService$$FastClassBySpringCGLIB$$ed138739.invoke(<generated>)
at org.springframework.cglib.proxy.MethodProxy.invoke(MethodProxy.java:218)
at org.springframework.aop.framework.CglibAopProxy$DynamicAdvisedInterceptor.intercept(CglibAopProxy.java:687)
at org.apache.dolphinscheduler.service.process.ProcessService$$EnhancerBySpringCGLIB$$c9f32f1c.handleCommand(<generated>)
at org.apache.dolphinscheduler.server.master.runner.MasterSchedulerService.scheduleProcess(MasterSchedulerService.java:189)
at org.apache.dolphinscheduler.server.master.runner.MasterSchedulerService.run(MasterSchedulerService.java:169)
```
### What you expected to happen
not NPE when run
### How to reproduce
run some task
### Anything else
_No response_
### Are you willing to submit PR?
- [X] Yes I am willing to submit a PR!
### Code of Conduct
- [X] I agree to follow this project's [Code of Conduct](https://www.apache.org/foundation/policies/conduct)
| https://github.com/apache/dolphinscheduler/issues/6502 | https://github.com/apache/dolphinscheduler/pull/6504 | db04a5b04df8aa5754741c6dd456579d743af1e9 | fea7874f95028325f52300949295260cafab4a64 | "2021-10-12T02:35:18Z" | java | "2021-10-12T06:42:49Z" | dolphinscheduler-service/src/main/java/org/apache/dolphinscheduler/service/process/ProcessService.java | * @param host host
* @param command found command
* @param processDefinitionCacheMaps
* @return process instance
*/
public ProcessInstance handleCommand(Logger logger, String host, Command command, HashMap<String, ProcessDefinition> processDefinitionCacheMaps) {
ProcessInstance processInstance = constructProcessInstance(command, host, processDefinitionCacheMaps);
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());
saveProcessInstance(processInstance);
this.setSubProcessParam(processInstance);
this.commandMapper.deleteById(command.getId());
return processInstance;
}
/**
* 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()); |
closed | apache/dolphinscheduler | https://github.com/apache/dolphinscheduler | 6,502 | [Bug] [MasterServer] cmdParam NPE when constructProcessInstance on SCHEDULER mode | ### Search before asking
- [X] I had searched in the [issues](https://github.com/apache/dolphinscheduler/issues?q=is%3Aissue) and found no similar issues.
### What happened
```
[ERROR] 2021-10-11 23:38:00.433 org.apache.dolphinscheduler.server.master.runner.MasterSchedulerService:[211] - scan command error
java.lang.NullPointerException: null
at org.apache.dolphinscheduler.service.process.ProcessService.constructProcessInstance(ProcessService.java:804)
at org.apache.dolphinscheduler.service.process.ProcessService.handleCommand(ProcessService.java:216)
at org.apache.dolphinscheduler.service.process.ProcessService$$FastClassBySpringCGLIB$$ed138739.invoke(<generated>)
at org.springframework.cglib.proxy.MethodProxy.invoke(MethodProxy.java:218)
at org.springframework.aop.framework.CglibAopProxy$DynamicAdvisedInterceptor.intercept(CglibAopProxy.java:687)
at org.apache.dolphinscheduler.service.process.ProcessService$$EnhancerBySpringCGLIB$$c9f32f1c.handleCommand(<generated>)
at org.apache.dolphinscheduler.server.master.runner.MasterSchedulerService.scheduleProcess(MasterSchedulerService.java:189)
at org.apache.dolphinscheduler.server.master.runner.MasterSchedulerService.run(MasterSchedulerService.java:169)
```
### What you expected to happen
not NPE when run
### How to reproduce
run some task
### Anything else
_No response_
### Are you willing to submit PR?
- [X] Yes I am willing to submit a PR!
### Code of Conduct
- [X] I agree to follow this project's [Code of Conduct](https://www.apache.org/foundation/policies/conduct)
| https://github.com/apache/dolphinscheduler/issues/6502 | https://github.com/apache/dolphinscheduler/pull/6504 | db04a5b04df8aa5754741c6dd456579d743af1e9 | fea7874f95028325f52300949295260cafab4a64 | "2021-10-12T02:35:18Z" | java | "2021-10-12T06:42:49Z" | dolphinscheduler-service/src/main/java/org/apache/dolphinscheduler/service/process/ProcessService.java | }
/**
* set process waiting thread
*
* @param command command
* @param processInstance processInstance
* @return process instance
*/
private ProcessInstance setWaitingThreadProcess(Command command, ProcessInstance processInstance) {
processInstance.setState(ExecutionStatus.WAITING_THREAD);
if (command.getCommandType() != CommandType.RECOVER_WAITING_THREAD) {
processInstance.addHistoryCmd(command.getCommandType());
}
saveProcessInstance(processInstance);
this.setSubProcessParam(processInstance);
createRecoveryWaitingThreadCommand(command, processInstance);
return null;
}
/**
* check thread num
*
* @param command command
* @param validThreadNum validThreadNum
* @return if thread is enough
*/
private boolean checkThreadNum(Command command, int validThreadNum) {
int commandThreadCount = this.workProcessThreadNumCount(command.getProcessDefinitionCode());
return validThreadNum >= commandThreadCount;
}
/** |
closed | apache/dolphinscheduler | https://github.com/apache/dolphinscheduler | 6,502 | [Bug] [MasterServer] cmdParam NPE when constructProcessInstance on SCHEDULER mode | ### Search before asking
- [X] I had searched in the [issues](https://github.com/apache/dolphinscheduler/issues?q=is%3Aissue) and found no similar issues.
### What happened
```
[ERROR] 2021-10-11 23:38:00.433 org.apache.dolphinscheduler.server.master.runner.MasterSchedulerService:[211] - scan command error
java.lang.NullPointerException: null
at org.apache.dolphinscheduler.service.process.ProcessService.constructProcessInstance(ProcessService.java:804)
at org.apache.dolphinscheduler.service.process.ProcessService.handleCommand(ProcessService.java:216)
at org.apache.dolphinscheduler.service.process.ProcessService$$FastClassBySpringCGLIB$$ed138739.invoke(<generated>)
at org.springframework.cglib.proxy.MethodProxy.invoke(MethodProxy.java:218)
at org.springframework.aop.framework.CglibAopProxy$DynamicAdvisedInterceptor.intercept(CglibAopProxy.java:687)
at org.apache.dolphinscheduler.service.process.ProcessService$$EnhancerBySpringCGLIB$$c9f32f1c.handleCommand(<generated>)
at org.apache.dolphinscheduler.server.master.runner.MasterSchedulerService.scheduleProcess(MasterSchedulerService.java:189)
at org.apache.dolphinscheduler.server.master.runner.MasterSchedulerService.run(MasterSchedulerService.java:169)
```
### What you expected to happen
not NPE when run
### How to reproduce
run some task
### Anything else
_No response_
### Are you willing to submit PR?
- [X] Yes I am willing to submit a PR!
### Code of Conduct
- [X] I agree to follow this project's [Code of Conduct](https://www.apache.org/foundation/policies/conduct)
| https://github.com/apache/dolphinscheduler/issues/6502 | https://github.com/apache/dolphinscheduler/pull/6504 | db04a5b04df8aa5754741c6dd456579d743af1e9 | fea7874f95028325f52300949295260cafab4a64 | "2021-10-12T02:35:18Z" | java | "2021-10-12T06:42:49Z" | dolphinscheduler-service/src/main/java/org/apache/dolphinscheduler/service/process/ProcessService.java | * 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
*
* @param pageSize
* @param pageNumber
* @return
*/
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
*/
public boolean verifyIsNeedCreateCommand(Command command) {
boolean isNeedCreate = true; |
closed | apache/dolphinscheduler | https://github.com/apache/dolphinscheduler | 6,502 | [Bug] [MasterServer] cmdParam NPE when constructProcessInstance on SCHEDULER mode | ### Search before asking
- [X] I had searched in the [issues](https://github.com/apache/dolphinscheduler/issues?q=is%3Aissue) and found no similar issues.
### What happened
```
[ERROR] 2021-10-11 23:38:00.433 org.apache.dolphinscheduler.server.master.runner.MasterSchedulerService:[211] - scan command error
java.lang.NullPointerException: null
at org.apache.dolphinscheduler.service.process.ProcessService.constructProcessInstance(ProcessService.java:804)
at org.apache.dolphinscheduler.service.process.ProcessService.handleCommand(ProcessService.java:216)
at org.apache.dolphinscheduler.service.process.ProcessService$$FastClassBySpringCGLIB$$ed138739.invoke(<generated>)
at org.springframework.cglib.proxy.MethodProxy.invoke(MethodProxy.java:218)
at org.springframework.aop.framework.CglibAopProxy$DynamicAdvisedInterceptor.intercept(CglibAopProxy.java:687)
at org.apache.dolphinscheduler.service.process.ProcessService$$EnhancerBySpringCGLIB$$c9f32f1c.handleCommand(<generated>)
at org.apache.dolphinscheduler.server.master.runner.MasterSchedulerService.scheduleProcess(MasterSchedulerService.java:189)
at org.apache.dolphinscheduler.server.master.runner.MasterSchedulerService.run(MasterSchedulerService.java:169)
```
### What you expected to happen
not NPE when run
### How to reproduce
run some task
### Anything else
_No response_
### Are you willing to submit PR?
- [X] Yes I am willing to submit a PR!
### Code of Conduct
- [X] I agree to follow this project's [Code of Conduct](https://www.apache.org/foundation/policies/conduct)
| https://github.com/apache/dolphinscheduler/issues/6502 | https://github.com/apache/dolphinscheduler/pull/6504 | db04a5b04df8aa5754741c6dd456579d743af1e9 | fea7874f95028325f52300949295260cafab4a64 | "2021-10-12T02:35:18Z" | java | "2021-10-12T06:42:49Z" | dolphinscheduler-service/src/main/java/org/apache/dolphinscheduler/service/process/ProcessService.java | 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
*/
public ProcessInstance findProcessInstanceDetailById(int processId) {
return processInstanceMapper.queryDetailById(processId); |
closed | apache/dolphinscheduler | https://github.com/apache/dolphinscheduler | 6,502 | [Bug] [MasterServer] cmdParam NPE when constructProcessInstance on SCHEDULER mode | ### Search before asking
- [X] I had searched in the [issues](https://github.com/apache/dolphinscheduler/issues?q=is%3Aissue) and found no similar issues.
### What happened
```
[ERROR] 2021-10-11 23:38:00.433 org.apache.dolphinscheduler.server.master.runner.MasterSchedulerService:[211] - scan command error
java.lang.NullPointerException: null
at org.apache.dolphinscheduler.service.process.ProcessService.constructProcessInstance(ProcessService.java:804)
at org.apache.dolphinscheduler.service.process.ProcessService.handleCommand(ProcessService.java:216)
at org.apache.dolphinscheduler.service.process.ProcessService$$FastClassBySpringCGLIB$$ed138739.invoke(<generated>)
at org.springframework.cglib.proxy.MethodProxy.invoke(MethodProxy.java:218)
at org.springframework.aop.framework.CglibAopProxy$DynamicAdvisedInterceptor.intercept(CglibAopProxy.java:687)
at org.apache.dolphinscheduler.service.process.ProcessService$$EnhancerBySpringCGLIB$$c9f32f1c.handleCommand(<generated>)
at org.apache.dolphinscheduler.server.master.runner.MasterSchedulerService.scheduleProcess(MasterSchedulerService.java:189)
at org.apache.dolphinscheduler.server.master.runner.MasterSchedulerService.run(MasterSchedulerService.java:169)
```
### What you expected to happen
not NPE when run
### How to reproduce
run some task
### Anything else
_No response_
### Are you willing to submit PR?
- [X] Yes I am willing to submit a PR!
### Code of Conduct
- [X] I agree to follow this project's [Code of Conduct](https://www.apache.org/foundation/policies/conduct)
| https://github.com/apache/dolphinscheduler/issues/6502 | https://github.com/apache/dolphinscheduler/pull/6504 | db04a5b04df8aa5754741c6dd456579d743af1e9 | fea7874f95028325f52300949295260cafab4a64 | "2021-10-12T02:35:18Z" | java | "2021-10-12T06:42:49Z" | dolphinscheduler-service/src/main/java/org/apache/dolphinscheduler/service/process/ProcessService.java | }
/**
* get task node list by definitionId
*/
public List<TaskDefinition> getTaskNodeListByDefinitionId(Integer defineId) {
ProcessDefinition processDefinition = processDefineMapper.selectById(defineId);
if (processDefinition == null) {
logger.error("process define not exists");
return new ArrayList<>();
}
List<ProcessTaskRelationLog> processTaskRelations = processTaskRelationLogMapper.queryByProcessCodeAndVersion(processDefinition.getCode(), processDefinition.getVersion());
Set<TaskDefinition> taskDefinitionSet = new HashSet<>();
for (ProcessTaskRelationLog processTaskRelation : processTaskRelations) {
if (processTaskRelation.getPostTaskCode() > 0) {
taskDefinitionSet.add(new TaskDefinition(processTaskRelation.getPostTaskCode(), processTaskRelation.getPostTaskVersion()));
}
}
List<TaskDefinitionLog> taskDefinitionLogs = taskDefinitionLogMapper.queryByTaskDefinitions(taskDefinitionSet);
return new ArrayList<>(taskDefinitionLogs);
}
/**
* find process instance by id
*
* @param processId processId
* @return process instance
*/
public ProcessInstance findProcessInstanceById(int processId) {
return processInstanceMapper.selectById(processId);
}
/** |
closed | apache/dolphinscheduler | https://github.com/apache/dolphinscheduler | 6,502 | [Bug] [MasterServer] cmdParam NPE when constructProcessInstance on SCHEDULER mode | ### Search before asking
- [X] I had searched in the [issues](https://github.com/apache/dolphinscheduler/issues?q=is%3Aissue) and found no similar issues.
### What happened
```
[ERROR] 2021-10-11 23:38:00.433 org.apache.dolphinscheduler.server.master.runner.MasterSchedulerService:[211] - scan command error
java.lang.NullPointerException: null
at org.apache.dolphinscheduler.service.process.ProcessService.constructProcessInstance(ProcessService.java:804)
at org.apache.dolphinscheduler.service.process.ProcessService.handleCommand(ProcessService.java:216)
at org.apache.dolphinscheduler.service.process.ProcessService$$FastClassBySpringCGLIB$$ed138739.invoke(<generated>)
at org.springframework.cglib.proxy.MethodProxy.invoke(MethodProxy.java:218)
at org.springframework.aop.framework.CglibAopProxy$DynamicAdvisedInterceptor.intercept(CglibAopProxy.java:687)
at org.apache.dolphinscheduler.service.process.ProcessService$$EnhancerBySpringCGLIB$$c9f32f1c.handleCommand(<generated>)
at org.apache.dolphinscheduler.server.master.runner.MasterSchedulerService.scheduleProcess(MasterSchedulerService.java:189)
at org.apache.dolphinscheduler.server.master.runner.MasterSchedulerService.run(MasterSchedulerService.java:169)
```
### What you expected to happen
not NPE when run
### How to reproduce
run some task
### Anything else
_No response_
### Are you willing to submit PR?
- [X] Yes I am willing to submit a PR!
### Code of Conduct
- [X] I agree to follow this project's [Code of Conduct](https://www.apache.org/foundation/policies/conduct)
| https://github.com/apache/dolphinscheduler/issues/6502 | https://github.com/apache/dolphinscheduler/pull/6504 | db04a5b04df8aa5754741c6dd456579d743af1e9 | fea7874f95028325f52300949295260cafab4a64 | "2021-10-12T02:35:18Z" | java | "2021-10-12T06:42:49Z" | dolphinscheduler-service/src/main/java/org/apache/dolphinscheduler/service/process/ProcessService.java | * 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;
}
/**
* find process define by code.
*
* @param processDefinitionCode processDefinitionCode
* @return process definition
*/ |
closed | apache/dolphinscheduler | https://github.com/apache/dolphinscheduler | 6,502 | [Bug] [MasterServer] cmdParam NPE when constructProcessInstance on SCHEDULER mode | ### Search before asking
- [X] I had searched in the [issues](https://github.com/apache/dolphinscheduler/issues?q=is%3Aissue) and found no similar issues.
### What happened
```
[ERROR] 2021-10-11 23:38:00.433 org.apache.dolphinscheduler.server.master.runner.MasterSchedulerService:[211] - scan command error
java.lang.NullPointerException: null
at org.apache.dolphinscheduler.service.process.ProcessService.constructProcessInstance(ProcessService.java:804)
at org.apache.dolphinscheduler.service.process.ProcessService.handleCommand(ProcessService.java:216)
at org.apache.dolphinscheduler.service.process.ProcessService$$FastClassBySpringCGLIB$$ed138739.invoke(<generated>)
at org.springframework.cglib.proxy.MethodProxy.invoke(MethodProxy.java:218)
at org.springframework.aop.framework.CglibAopProxy$DynamicAdvisedInterceptor.intercept(CglibAopProxy.java:687)
at org.apache.dolphinscheduler.service.process.ProcessService$$EnhancerBySpringCGLIB$$c9f32f1c.handleCommand(<generated>)
at org.apache.dolphinscheduler.server.master.runner.MasterSchedulerService.scheduleProcess(MasterSchedulerService.java:189)
at org.apache.dolphinscheduler.server.master.runner.MasterSchedulerService.run(MasterSchedulerService.java:169)
```
### What you expected to happen
not NPE when run
### How to reproduce
run some task
### Anything else
_No response_
### Are you willing to submit PR?
- [X] Yes I am willing to submit a PR!
### Code of Conduct
- [X] I agree to follow this project's [Code of Conduct](https://www.apache.org/foundation/policies/conduct)
| https://github.com/apache/dolphinscheduler/issues/6502 | https://github.com/apache/dolphinscheduler/pull/6504 | db04a5b04df8aa5754741c6dd456579d743af1e9 | fea7874f95028325f52300949295260cafab4a64 | "2021-10-12T02:35:18Z" | java | "2021-10-12T06:42:49Z" | dolphinscheduler-service/src/main/java/org/apache/dolphinscheduler/service/process/ProcessService.java | 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);
deleteWorkProcessInstanceById(subId);
}
return 1;
}
/**
* remove task log file |
closed | apache/dolphinscheduler | https://github.com/apache/dolphinscheduler | 6,502 | [Bug] [MasterServer] cmdParam NPE when constructProcessInstance on SCHEDULER mode | ### Search before asking
- [X] I had searched in the [issues](https://github.com/apache/dolphinscheduler/issues?q=is%3Aissue) and found no similar issues.
### What happened
```
[ERROR] 2021-10-11 23:38:00.433 org.apache.dolphinscheduler.server.master.runner.MasterSchedulerService:[211] - scan command error
java.lang.NullPointerException: null
at org.apache.dolphinscheduler.service.process.ProcessService.constructProcessInstance(ProcessService.java:804)
at org.apache.dolphinscheduler.service.process.ProcessService.handleCommand(ProcessService.java:216)
at org.apache.dolphinscheduler.service.process.ProcessService$$FastClassBySpringCGLIB$$ed138739.invoke(<generated>)
at org.springframework.cglib.proxy.MethodProxy.invoke(MethodProxy.java:218)
at org.springframework.aop.framework.CglibAopProxy$DynamicAdvisedInterceptor.intercept(CglibAopProxy.java:687)
at org.apache.dolphinscheduler.service.process.ProcessService$$EnhancerBySpringCGLIB$$c9f32f1c.handleCommand(<generated>)
at org.apache.dolphinscheduler.server.master.runner.MasterSchedulerService.scheduleProcess(MasterSchedulerService.java:189)
at org.apache.dolphinscheduler.server.master.runner.MasterSchedulerService.run(MasterSchedulerService.java:169)
```
### What you expected to happen
not NPE when run
### How to reproduce
run some task
### Anything else
_No response_
### Are you willing to submit PR?
- [X] Yes I am willing to submit a PR!
### Code of Conduct
- [X] I agree to follow this project's [Code of Conduct](https://www.apache.org/foundation/policies/conduct)
| https://github.com/apache/dolphinscheduler/issues/6502 | https://github.com/apache/dolphinscheduler/pull/6504 | db04a5b04df8aa5754741c6dd456579d743af1e9 | fea7874f95028325f52300949295260cafab4a64 | "2021-10-12T02:35:18Z" | java | "2021-10-12T06:42:49Z" | dolphinscheduler-service/src/main/java/org/apache/dolphinscheduler/service/process/ProcessService.java | *
* @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;
}
int port = Constants.RPC_PORT;
String ip = "";
try {
ip = Host.of(taskInstance.getHost()).getIp();
} catch (Exception e) {
ip = taskInstance.getHost();
}
logClient.removeTaskLog(ip, port, taskLogPath);
}
}
}
/**
* calculate sub process number in the process define.
* |
closed | apache/dolphinscheduler | https://github.com/apache/dolphinscheduler | 6,502 | [Bug] [MasterServer] cmdParam NPE when constructProcessInstance on SCHEDULER mode | ### Search before asking
- [X] I had searched in the [issues](https://github.com/apache/dolphinscheduler/issues?q=is%3Aissue) and found no similar issues.
### What happened
```
[ERROR] 2021-10-11 23:38:00.433 org.apache.dolphinscheduler.server.master.runner.MasterSchedulerService:[211] - scan command error
java.lang.NullPointerException: null
at org.apache.dolphinscheduler.service.process.ProcessService.constructProcessInstance(ProcessService.java:804)
at org.apache.dolphinscheduler.service.process.ProcessService.handleCommand(ProcessService.java:216)
at org.apache.dolphinscheduler.service.process.ProcessService$$FastClassBySpringCGLIB$$ed138739.invoke(<generated>)
at org.springframework.cglib.proxy.MethodProxy.invoke(MethodProxy.java:218)
at org.springframework.aop.framework.CglibAopProxy$DynamicAdvisedInterceptor.intercept(CglibAopProxy.java:687)
at org.apache.dolphinscheduler.service.process.ProcessService$$EnhancerBySpringCGLIB$$c9f32f1c.handleCommand(<generated>)
at org.apache.dolphinscheduler.server.master.runner.MasterSchedulerService.scheduleProcess(MasterSchedulerService.java:189)
at org.apache.dolphinscheduler.server.master.runner.MasterSchedulerService.run(MasterSchedulerService.java:169)
```
### What you expected to happen
not NPE when run
### How to reproduce
run some task
### Anything else
_No response_
### Are you willing to submit PR?
- [X] Yes I am willing to submit a PR!
### Code of Conduct
- [X] I agree to follow this project's [Code of Conduct](https://www.apache.org/foundation/policies/conduct)
| https://github.com/apache/dolphinscheduler/issues/6502 | https://github.com/apache/dolphinscheduler/pull/6504 | db04a5b04df8aa5754741c6dd456579d743af1e9 | fea7874f95028325f52300949295260cafab4a64 | "2021-10-12T02:35:18Z" | java | "2021-10-12T06:42:49Z" | dolphinscheduler-service/src/main/java/org/apache/dolphinscheduler/service/process/ProcessService.java | * @param processDefinitionCode processDefinitionCode
* @return process thread num count
*/
private Integer workProcessThreadNumCount(long processDefinitionCode) {
ProcessDefinition processDefinition = processDefineMapper.queryByCode(processDefinitionCode);
List<Integer> ids = new ArrayList<>();
recurseFindSubProcessId(processDefinition.getId(), ids);
return ids.size() + 1;
}
/**
* recursive query sub process definition id by parent id.
*
* @param parentId parentId
* @param ids ids
*/
public void recurseFindSubProcessId(int parentId, List<Integer> ids) {
List<TaskDefinition> taskNodeList = this.getTaskNodeListByDefinitionId(parentId);
if (taskNodeList != null && !taskNodeList.isEmpty()) {
for (TaskDefinition taskNode : taskNodeList) {
String parameter = taskNode.getTaskParams();
ObjectNode parameterJson = JSONUtils.parseObject(parameter);
if (parameterJson.get(CMD_PARAM_SUB_PROCESS_DEFINE_ID) != null) {
SubProcessParameters subProcessParam = JSONUtils.parseObject(parameter, SubProcessParameters.class);
ids.add(subProcessParam.getProcessDefinitionId());
recurseFindSubProcessId(subProcessParam.getProcessDefinitionId(), ids);
}
}
}
}
/** |
closed | apache/dolphinscheduler | https://github.com/apache/dolphinscheduler | 6,502 | [Bug] [MasterServer] cmdParam NPE when constructProcessInstance on SCHEDULER mode | ### Search before asking
- [X] I had searched in the [issues](https://github.com/apache/dolphinscheduler/issues?q=is%3Aissue) and found no similar issues.
### What happened
```
[ERROR] 2021-10-11 23:38:00.433 org.apache.dolphinscheduler.server.master.runner.MasterSchedulerService:[211] - scan command error
java.lang.NullPointerException: null
at org.apache.dolphinscheduler.service.process.ProcessService.constructProcessInstance(ProcessService.java:804)
at org.apache.dolphinscheduler.service.process.ProcessService.handleCommand(ProcessService.java:216)
at org.apache.dolphinscheduler.service.process.ProcessService$$FastClassBySpringCGLIB$$ed138739.invoke(<generated>)
at org.springframework.cglib.proxy.MethodProxy.invoke(MethodProxy.java:218)
at org.springframework.aop.framework.CglibAopProxy$DynamicAdvisedInterceptor.intercept(CglibAopProxy.java:687)
at org.apache.dolphinscheduler.service.process.ProcessService$$EnhancerBySpringCGLIB$$c9f32f1c.handleCommand(<generated>)
at org.apache.dolphinscheduler.server.master.runner.MasterSchedulerService.scheduleProcess(MasterSchedulerService.java:189)
at org.apache.dolphinscheduler.server.master.runner.MasterSchedulerService.run(MasterSchedulerService.java:169)
```
### What you expected to happen
not NPE when run
### How to reproduce
run some task
### Anything else
_No response_
### Are you willing to submit PR?
- [X] Yes I am willing to submit a PR!
### Code of Conduct
- [X] I agree to follow this project's [Code of Conduct](https://www.apache.org/foundation/policies/conduct)
| https://github.com/apache/dolphinscheduler/issues/6502 | https://github.com/apache/dolphinscheduler/pull/6504 | db04a5b04df8aa5754741c6dd456579d743af1e9 | fea7874f95028325f52300949295260cafab4a64 | "2021-10-12T02:35:18Z" | java | "2021-10-12T06:42:49Z" | dolphinscheduler-service/src/main/java/org/apache/dolphinscheduler/service/process/ProcessService.java | * create recovery waiting thread command when thread pool is not enough for the process instance.
* sub work process instance need not to create recovery command.
* create recovery waiting thread command and delete origin command at the same time.
* if the recovery command is exists, only update the field update_time
*
* @param originCommand originCommand
* @param processInstance processInstance
*/
public void createRecoveryWaitingThreadCommand(Command originCommand, ProcessInstance processInstance) {
if (processInstance.getIsSubProcess() == Flag.YES) {
if (originCommand != null) {
commandMapper.deleteById(originCommand.getId());
}
return;
}
Map<String, String> cmdParam = new HashMap<>();
cmdParam.put(Constants.CMD_PARAM_RECOVERY_WAITING_THREAD, String.valueOf(processInstance.getId()));
if (originCommand == null) {
Command command = new Command(
CommandType.RECOVER_WAITING_THREAD,
processInstance.getTaskDependType(),
processInstance.getFailureStrategy(),
processInstance.getExecutorId(),
processInstance.getProcessDefinition().getCode(),
JSONUtils.toJsonString(cmdParam),
processInstance.getWarningType(),
processInstance.getWarningGroupId(),
processInstance.getScheduleTime(), |
closed | apache/dolphinscheduler | https://github.com/apache/dolphinscheduler | 6,502 | [Bug] [MasterServer] cmdParam NPE when constructProcessInstance on SCHEDULER mode | ### Search before asking
- [X] I had searched in the [issues](https://github.com/apache/dolphinscheduler/issues?q=is%3Aissue) and found no similar issues.
### What happened
```
[ERROR] 2021-10-11 23:38:00.433 org.apache.dolphinscheduler.server.master.runner.MasterSchedulerService:[211] - scan command error
java.lang.NullPointerException: null
at org.apache.dolphinscheduler.service.process.ProcessService.constructProcessInstance(ProcessService.java:804)
at org.apache.dolphinscheduler.service.process.ProcessService.handleCommand(ProcessService.java:216)
at org.apache.dolphinscheduler.service.process.ProcessService$$FastClassBySpringCGLIB$$ed138739.invoke(<generated>)
at org.springframework.cglib.proxy.MethodProxy.invoke(MethodProxy.java:218)
at org.springframework.aop.framework.CglibAopProxy$DynamicAdvisedInterceptor.intercept(CglibAopProxy.java:687)
at org.apache.dolphinscheduler.service.process.ProcessService$$EnhancerBySpringCGLIB$$c9f32f1c.handleCommand(<generated>)
at org.apache.dolphinscheduler.server.master.runner.MasterSchedulerService.scheduleProcess(MasterSchedulerService.java:189)
at org.apache.dolphinscheduler.server.master.runner.MasterSchedulerService.run(MasterSchedulerService.java:169)
```
### What you expected to happen
not NPE when run
### How to reproduce
run some task
### Anything else
_No response_
### Are you willing to submit PR?
- [X] Yes I am willing to submit a PR!
### Code of Conduct
- [X] I agree to follow this project's [Code of Conduct](https://www.apache.org/foundation/policies/conduct)
| https://github.com/apache/dolphinscheduler/issues/6502 | https://github.com/apache/dolphinscheduler/pull/6504 | db04a5b04df8aa5754741c6dd456579d743af1e9 | fea7874f95028325f52300949295260cafab4a64 | "2021-10-12T02:35:18Z" | java | "2021-10-12T06:42:49Z" | dolphinscheduler-service/src/main/java/org/apache/dolphinscheduler/service/process/ProcessService.java | processInstance.getWorkerGroup(),
processInstance.getEnvironmentCode(),
processInstance.getProcessInstancePriority(),
processInstance.getDryRun(),
processInstance.getId(),
processInstance.getProcessDefinitionVersion()
);
saveCommand(command);
return;
}
if (originCommand.getCommandType() == CommandType.RECOVER_WAITING_THREAD) {
originCommand.setUpdateTime(new Date());
saveCommand(originCommand);
} else {
commandMapper.deleteById(originCommand.getId());
originCommand.setId(0);
originCommand.setCommandType(CommandType.RECOVER_WAITING_THREAD);
originCommand.setUpdateTime(new Date());
originCommand.setCommandParam(JSONUtils.toJsonString(cmdParam));
originCommand.setProcessInstancePriority(processInstance.getProcessInstancePriority());
saveCommand(originCommand);
}
}
/**
* get schedule time from command
*
* @param command command
* @param cmdParam cmdParam map |
closed | apache/dolphinscheduler | https://github.com/apache/dolphinscheduler | 6,502 | [Bug] [MasterServer] cmdParam NPE when constructProcessInstance on SCHEDULER mode | ### Search before asking
- [X] I had searched in the [issues](https://github.com/apache/dolphinscheduler/issues?q=is%3Aissue) and found no similar issues.
### What happened
```
[ERROR] 2021-10-11 23:38:00.433 org.apache.dolphinscheduler.server.master.runner.MasterSchedulerService:[211] - scan command error
java.lang.NullPointerException: null
at org.apache.dolphinscheduler.service.process.ProcessService.constructProcessInstance(ProcessService.java:804)
at org.apache.dolphinscheduler.service.process.ProcessService.handleCommand(ProcessService.java:216)
at org.apache.dolphinscheduler.service.process.ProcessService$$FastClassBySpringCGLIB$$ed138739.invoke(<generated>)
at org.springframework.cglib.proxy.MethodProxy.invoke(MethodProxy.java:218)
at org.springframework.aop.framework.CglibAopProxy$DynamicAdvisedInterceptor.intercept(CglibAopProxy.java:687)
at org.apache.dolphinscheduler.service.process.ProcessService$$EnhancerBySpringCGLIB$$c9f32f1c.handleCommand(<generated>)
at org.apache.dolphinscheduler.server.master.runner.MasterSchedulerService.scheduleProcess(MasterSchedulerService.java:189)
at org.apache.dolphinscheduler.server.master.runner.MasterSchedulerService.run(MasterSchedulerService.java:169)
```
### What you expected to happen
not NPE when run
### How to reproduce
run some task
### Anything else
_No response_
### Are you willing to submit PR?
- [X] Yes I am willing to submit a PR!
### Code of Conduct
- [X] I agree to follow this project's [Code of Conduct](https://www.apache.org/foundation/policies/conduct)
| https://github.com/apache/dolphinscheduler/issues/6502 | https://github.com/apache/dolphinscheduler/pull/6504 | db04a5b04df8aa5754741c6dd456579d743af1e9 | fea7874f95028325f52300949295260cafab4a64 | "2021-10-12T02:35:18Z" | java | "2021-10-12T06:42:49Z" | dolphinscheduler-service/src/main/java/org/apache/dolphinscheduler/service/process/ProcessService.java | * @return date
*/
private Date getScheduleTime(Command command, Map<String, String> cmdParam) {
Date scheduleTime = command.getScheduleTime();
if (scheduleTime == null
&& cmdParam != null
&& cmdParam.containsKey(CMDPARAM_COMPLEMENT_DATA_START_DATE)) {
Date start = DateUtils.stringToDate(cmdParam.get(CMDPARAM_COMPLEMENT_DATA_START_DATE));
Date end = DateUtils.stringToDate(cmdParam.get(CMDPARAM_COMPLEMENT_DATA_END_DATE));
List<Schedule> schedules = queryReleaseSchedulerListByProcessDefinitionCode(command.getProcessDefinitionCode());
List<Date> complementDateList = CronUtils.getSelfFireDateList(start, end, schedules);
if (complementDateList.size() > 0) {
scheduleTime = complementDateList.get(0);
} else {
logger.error("set scheduler time error: complement date list is empty, command: {}",
command.toString());
}
}
return scheduleTime;
}
/**
* generate a new work process instance from command.
*
* @param processDefinition processDefinition
* @param command command
* @param cmdParam cmdParam map
* @return process instance
*/
private ProcessInstance generateNewProcessInstance(ProcessDefinition processDefinition,
Command command, |
closed | apache/dolphinscheduler | https://github.com/apache/dolphinscheduler | 6,502 | [Bug] [MasterServer] cmdParam NPE when constructProcessInstance on SCHEDULER mode | ### Search before asking
- [X] I had searched in the [issues](https://github.com/apache/dolphinscheduler/issues?q=is%3Aissue) and found no similar issues.
### What happened
```
[ERROR] 2021-10-11 23:38:00.433 org.apache.dolphinscheduler.server.master.runner.MasterSchedulerService:[211] - scan command error
java.lang.NullPointerException: null
at org.apache.dolphinscheduler.service.process.ProcessService.constructProcessInstance(ProcessService.java:804)
at org.apache.dolphinscheduler.service.process.ProcessService.handleCommand(ProcessService.java:216)
at org.apache.dolphinscheduler.service.process.ProcessService$$FastClassBySpringCGLIB$$ed138739.invoke(<generated>)
at org.springframework.cglib.proxy.MethodProxy.invoke(MethodProxy.java:218)
at org.springframework.aop.framework.CglibAopProxy$DynamicAdvisedInterceptor.intercept(CglibAopProxy.java:687)
at org.apache.dolphinscheduler.service.process.ProcessService$$EnhancerBySpringCGLIB$$c9f32f1c.handleCommand(<generated>)
at org.apache.dolphinscheduler.server.master.runner.MasterSchedulerService.scheduleProcess(MasterSchedulerService.java:189)
at org.apache.dolphinscheduler.server.master.runner.MasterSchedulerService.run(MasterSchedulerService.java:169)
```
### What you expected to happen
not NPE when run
### How to reproduce
run some task
### Anything else
_No response_
### Are you willing to submit PR?
- [X] Yes I am willing to submit a PR!
### Code of Conduct
- [X] I agree to follow this project's [Code of Conduct](https://www.apache.org/foundation/policies/conduct)
| https://github.com/apache/dolphinscheduler/issues/6502 | https://github.com/apache/dolphinscheduler/pull/6504 | db04a5b04df8aa5754741c6dd456579d743af1e9 | fea7874f95028325f52300949295260cafab4a64 | "2021-10-12T02:35:18Z" | java | "2021-10-12T06:42:49Z" | dolphinscheduler-service/src/main/java/org/apache/dolphinscheduler/service/process/ProcessService.java | Map<String, String> cmdParam) {
ProcessInstance processInstance = new ProcessInstance(processDefinition);
processInstance.setProcessDefinitionCode(processDefinition.getCode());
processInstance.setProcessDefinitionVersion(processDefinition.getVersion());
processInstance.setState(ExecutionStatus.RUNNING_EXECUTION);
processInstance.setRecovery(Flag.NO);
processInstance.setStartTime(new Date());
processInstance.setRunTimes(1);
processInstance.setMaxTryTimes(0);
processInstance.setCommandParam(command.getCommandParam());
processInstance.setCommandType(command.getCommandType());
processInstance.setIsSubProcess(Flag.NO);
processInstance.setTaskDependType(command.getTaskDependType());
processInstance.setFailureStrategy(command.getFailureStrategy());
processInstance.setExecutorId(command.getExecutorId());
WarningType warningType = command.getWarningType() == null ? WarningType.NONE : command.getWarningType();
processInstance.setWarningType(warningType);
Integer warningGroupId = command.getWarningGroupId() == null ? 0 : command.getWarningGroupId();
processInstance.setWarningGroupId(warningGroupId);
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( |
closed | apache/dolphinscheduler | https://github.com/apache/dolphinscheduler | 6,502 | [Bug] [MasterServer] cmdParam NPE when constructProcessInstance on SCHEDULER mode | ### Search before asking
- [X] I had searched in the [issues](https://github.com/apache/dolphinscheduler/issues?q=is%3Aissue) and found no similar issues.
### What happened
```
[ERROR] 2021-10-11 23:38:00.433 org.apache.dolphinscheduler.server.master.runner.MasterSchedulerService:[211] - scan command error
java.lang.NullPointerException: null
at org.apache.dolphinscheduler.service.process.ProcessService.constructProcessInstance(ProcessService.java:804)
at org.apache.dolphinscheduler.service.process.ProcessService.handleCommand(ProcessService.java:216)
at org.apache.dolphinscheduler.service.process.ProcessService$$FastClassBySpringCGLIB$$ed138739.invoke(<generated>)
at org.springframework.cglib.proxy.MethodProxy.invoke(MethodProxy.java:218)
at org.springframework.aop.framework.CglibAopProxy$DynamicAdvisedInterceptor.intercept(CglibAopProxy.java:687)
at org.apache.dolphinscheduler.service.process.ProcessService$$EnhancerBySpringCGLIB$$c9f32f1c.handleCommand(<generated>)
at org.apache.dolphinscheduler.server.master.runner.MasterSchedulerService.scheduleProcess(MasterSchedulerService.java:189)
at org.apache.dolphinscheduler.server.master.runner.MasterSchedulerService.run(MasterSchedulerService.java:169)
```
### What you expected to happen
not NPE when run
### How to reproduce
run some task
### Anything else
_No response_
### Are you willing to submit PR?
- [X] Yes I am willing to submit a PR!
### Code of Conduct
- [X] I agree to follow this project's [Code of Conduct](https://www.apache.org/foundation/policies/conduct)
| https://github.com/apache/dolphinscheduler/issues/6502 | https://github.com/apache/dolphinscheduler/pull/6504 | db04a5b04df8aa5754741c6dd456579d743af1e9 | fea7874f95028325f52300949295260cafab4a64 | "2021-10-12T02:35:18Z" | java | "2021-10-12T06:42:49Z" | dolphinscheduler-service/src/main/java/org/apache/dolphinscheduler/service/process/ProcessService.java | processDefinition.getGlobalParamMap(),
processDefinition.getGlobalParamList(),
getCommandTypeIfComplement(processInstance, command),
processInstance.getScheduleTime()));
processInstance.setProcessInstancePriority(command.getProcessInstancePriority());
String workerGroup = StringUtils.isBlank(command.getWorkerGroup()) ? Constants.DEFAULT_WORKER_GROUP : command.getWorkerGroup();
processInstance.setWorkerGroup(workerGroup);
processInstance.setEnvironmentCode(Objects.isNull(command.getEnvironmentCode()) ? -1 : command.getEnvironmentCode());
processInstance.setTimeout(processDefinition.getTimeout());
processInstance.setTenantId(processDefinition.getTenantId());
return processInstance;
}
private void setGlobalParamIfCommanded(ProcessDefinition processDefinition, Map<String, String> cmdParam) {
Map<String, String> startParamMap = new HashMap<>();
if (cmdParam != null && cmdParam.containsKey(Constants.CMD_PARAM_START_PARAMS)) {
String startParamJson = cmdParam.get(Constants.CMD_PARAM_START_PARAMS);
startParamMap = JSONUtils.toMap(startParamJson);
}
Map<String, String> fatherParamMap = new HashMap<>();
if (cmdParam != null && cmdParam.containsKey(Constants.CMD_PARAM_FATHER_PARAMS)) {
String fatherParamJson = cmdParam.get(Constants.CMD_PARAM_FATHER_PARAMS);
fatherParamMap = JSONUtils.toMap(fatherParamJson);
}
startParamMap.putAll(fatherParamMap);
if (startParamMap.size() > 0
&& processDefinition.getGlobalParamMap() != null) {
for (Map.Entry<String, String> param : processDefinition.getGlobalParamMap().entrySet()) { |
closed | apache/dolphinscheduler | https://github.com/apache/dolphinscheduler | 6,502 | [Bug] [MasterServer] cmdParam NPE when constructProcessInstance on SCHEDULER mode | ### Search before asking
- [X] I had searched in the [issues](https://github.com/apache/dolphinscheduler/issues?q=is%3Aissue) and found no similar issues.
### What happened
```
[ERROR] 2021-10-11 23:38:00.433 org.apache.dolphinscheduler.server.master.runner.MasterSchedulerService:[211] - scan command error
java.lang.NullPointerException: null
at org.apache.dolphinscheduler.service.process.ProcessService.constructProcessInstance(ProcessService.java:804)
at org.apache.dolphinscheduler.service.process.ProcessService.handleCommand(ProcessService.java:216)
at org.apache.dolphinscheduler.service.process.ProcessService$$FastClassBySpringCGLIB$$ed138739.invoke(<generated>)
at org.springframework.cglib.proxy.MethodProxy.invoke(MethodProxy.java:218)
at org.springframework.aop.framework.CglibAopProxy$DynamicAdvisedInterceptor.intercept(CglibAopProxy.java:687)
at org.apache.dolphinscheduler.service.process.ProcessService$$EnhancerBySpringCGLIB$$c9f32f1c.handleCommand(<generated>)
at org.apache.dolphinscheduler.server.master.runner.MasterSchedulerService.scheduleProcess(MasterSchedulerService.java:189)
at org.apache.dolphinscheduler.server.master.runner.MasterSchedulerService.run(MasterSchedulerService.java:169)
```
### What you expected to happen
not NPE when run
### How to reproduce
run some task
### Anything else
_No response_
### Are you willing to submit PR?
- [X] Yes I am willing to submit a PR!
### Code of Conduct
- [X] I agree to follow this project's [Code of Conduct](https://www.apache.org/foundation/policies/conduct)
| https://github.com/apache/dolphinscheduler/issues/6502 | https://github.com/apache/dolphinscheduler/pull/6504 | db04a5b04df8aa5754741c6dd456579d743af1e9 | fea7874f95028325f52300949295260cafab4a64 | "2021-10-12T02:35:18Z" | java | "2021-10-12T06:42:49Z" | dolphinscheduler-service/src/main/java/org/apache/dolphinscheduler/service/process/ProcessService.java | String val = startParamMap.get(param.getKey());
if (val != null) {
param.setValue(val);
}
}
}
}
/**
* get process tenant
* there is tenant id in definition, use the tenant of the definition.
* if there is not tenant id in the definiton or the tenant not exist
* use definition creator's tenant.
*
* @param tenantId tenantId
* @param userId userId
* @return tenant
*/
public Tenant getTenantForProcess(int tenantId, int userId) {
Tenant tenant = null;
if (tenantId >= 0) {
tenant = tenantMapper.queryById(tenantId);
}
if (userId == 0) {
return null;
}
if (tenant == null) {
User user = userMapper.selectById(userId);
tenant = tenantMapper.queryById(user.getTenantId());
}
return tenant; |
closed | apache/dolphinscheduler | https://github.com/apache/dolphinscheduler | 6,502 | [Bug] [MasterServer] cmdParam NPE when constructProcessInstance on SCHEDULER mode | ### Search before asking
- [X] I had searched in the [issues](https://github.com/apache/dolphinscheduler/issues?q=is%3Aissue) and found no similar issues.
### What happened
```
[ERROR] 2021-10-11 23:38:00.433 org.apache.dolphinscheduler.server.master.runner.MasterSchedulerService:[211] - scan command error
java.lang.NullPointerException: null
at org.apache.dolphinscheduler.service.process.ProcessService.constructProcessInstance(ProcessService.java:804)
at org.apache.dolphinscheduler.service.process.ProcessService.handleCommand(ProcessService.java:216)
at org.apache.dolphinscheduler.service.process.ProcessService$$FastClassBySpringCGLIB$$ed138739.invoke(<generated>)
at org.springframework.cglib.proxy.MethodProxy.invoke(MethodProxy.java:218)
at org.springframework.aop.framework.CglibAopProxy$DynamicAdvisedInterceptor.intercept(CglibAopProxy.java:687)
at org.apache.dolphinscheduler.service.process.ProcessService$$EnhancerBySpringCGLIB$$c9f32f1c.handleCommand(<generated>)
at org.apache.dolphinscheduler.server.master.runner.MasterSchedulerService.scheduleProcess(MasterSchedulerService.java:189)
at org.apache.dolphinscheduler.server.master.runner.MasterSchedulerService.run(MasterSchedulerService.java:169)
```
### What you expected to happen
not NPE when run
### How to reproduce
run some task
### Anything else
_No response_
### Are you willing to submit PR?
- [X] Yes I am willing to submit a PR!
### Code of Conduct
- [X] I agree to follow this project's [Code of Conduct](https://www.apache.org/foundation/policies/conduct)
| https://github.com/apache/dolphinscheduler/issues/6502 | https://github.com/apache/dolphinscheduler/pull/6504 | db04a5b04df8aa5754741c6dd456579d743af1e9 | fea7874f95028325f52300949295260cafab4a64 | "2021-10-12T02:35:18Z" | java | "2021-10-12T06:42:49Z" | dolphinscheduler-service/src/main/java/org/apache/dolphinscheduler/service/process/ProcessService.java | }
/**
* get an environment
* use the code of the environment to find a environment.
*
* @param environmentCode environmentCode
* @return Environment
*/
public Environment findEnvironmentByCode(Long environmentCode) {
Environment environment = null;
if (environmentCode >= 0) {
environment = environmentMapper.queryByEnvironmentCode(environmentCode);
}
return environment;
}
/**
* check command parameters is valid
*
* @param command command
* @param cmdParam cmdParam map
* @return whether command param is valid
*/
private Boolean checkCmdParam(Command command, Map<String, String> cmdParam) {
if (command.getTaskDependType() == TaskDependType.TASK_ONLY || command.getTaskDependType() == TaskDependType.TASK_PRE) {
if (cmdParam == null
|| !cmdParam.containsKey(Constants.CMD_PARAM_START_NODE_NAMES)
|| cmdParam.get(Constants.CMD_PARAM_START_NODE_NAMES).isEmpty()) {
logger.error("command node depend type is {}, but start nodes is null ", command.getTaskDependType());
return false;
} |
closed | apache/dolphinscheduler | https://github.com/apache/dolphinscheduler | 6,502 | [Bug] [MasterServer] cmdParam NPE when constructProcessInstance on SCHEDULER mode | ### Search before asking
- [X] I had searched in the [issues](https://github.com/apache/dolphinscheduler/issues?q=is%3Aissue) and found no similar issues.
### What happened
```
[ERROR] 2021-10-11 23:38:00.433 org.apache.dolphinscheduler.server.master.runner.MasterSchedulerService:[211] - scan command error
java.lang.NullPointerException: null
at org.apache.dolphinscheduler.service.process.ProcessService.constructProcessInstance(ProcessService.java:804)
at org.apache.dolphinscheduler.service.process.ProcessService.handleCommand(ProcessService.java:216)
at org.apache.dolphinscheduler.service.process.ProcessService$$FastClassBySpringCGLIB$$ed138739.invoke(<generated>)
at org.springframework.cglib.proxy.MethodProxy.invoke(MethodProxy.java:218)
at org.springframework.aop.framework.CglibAopProxy$DynamicAdvisedInterceptor.intercept(CglibAopProxy.java:687)
at org.apache.dolphinscheduler.service.process.ProcessService$$EnhancerBySpringCGLIB$$c9f32f1c.handleCommand(<generated>)
at org.apache.dolphinscheduler.server.master.runner.MasterSchedulerService.scheduleProcess(MasterSchedulerService.java:189)
at org.apache.dolphinscheduler.server.master.runner.MasterSchedulerService.run(MasterSchedulerService.java:169)
```
### What you expected to happen
not NPE when run
### How to reproduce
run some task
### Anything else
_No response_
### Are you willing to submit PR?
- [X] Yes I am willing to submit a PR!
### Code of Conduct
- [X] I agree to follow this project's [Code of Conduct](https://www.apache.org/foundation/policies/conduct)
| https://github.com/apache/dolphinscheduler/issues/6502 | https://github.com/apache/dolphinscheduler/pull/6504 | db04a5b04df8aa5754741c6dd456579d743af1e9 | fea7874f95028325f52300949295260cafab4a64 | "2021-10-12T02:35:18Z" | java | "2021-10-12T06:42:49Z" | dolphinscheduler-service/src/main/java/org/apache/dolphinscheduler/service/process/ProcessService.java | }
return true;
}
/**
* construct process instance according to one command.
*
* @param command command
* @param host host
* @param processDefinitionCacheMaps
* @return process instance
*/
private ProcessInstance constructProcessInstance(Command command, String host, HashMap<String, ProcessDefinition> processDefinitionCacheMaps) {
ProcessInstance processInstance;
ProcessDefinition processDefinition;
CommandType commandType = command.getCommandType();
String key = String.format("%d-%d", command.getProcessDefinitionCode(), command.getProcessDefinitionVersion());
if (processDefinitionCacheMaps.containsKey(key)) {
processDefinition = processDefinitionCacheMaps.get(key);
} else {
processDefinition = this.findProcessDefinition(command.getProcessDefinitionCode(), command.getProcessDefinitionVersion());
if (processDefinition != null) {
processDefinitionCacheMaps.put(key, processDefinition);
}
}
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(); |
closed | apache/dolphinscheduler | https://github.com/apache/dolphinscheduler | 6,502 | [Bug] [MasterServer] cmdParam NPE when constructProcessInstance on SCHEDULER mode | ### Search before asking
- [X] I had searched in the [issues](https://github.com/apache/dolphinscheduler/issues?q=is%3Aissue) and found no similar issues.
### What happened
```
[ERROR] 2021-10-11 23:38:00.433 org.apache.dolphinscheduler.server.master.runner.MasterSchedulerService:[211] - scan command error
java.lang.NullPointerException: null
at org.apache.dolphinscheduler.service.process.ProcessService.constructProcessInstance(ProcessService.java:804)
at org.apache.dolphinscheduler.service.process.ProcessService.handleCommand(ProcessService.java:216)
at org.apache.dolphinscheduler.service.process.ProcessService$$FastClassBySpringCGLIB$$ed138739.invoke(<generated>)
at org.springframework.cglib.proxy.MethodProxy.invoke(MethodProxy.java:218)
at org.springframework.aop.framework.CglibAopProxy$DynamicAdvisedInterceptor.intercept(CglibAopProxy.java:687)
at org.apache.dolphinscheduler.service.process.ProcessService$$EnhancerBySpringCGLIB$$c9f32f1c.handleCommand(<generated>)
at org.apache.dolphinscheduler.server.master.runner.MasterSchedulerService.scheduleProcess(MasterSchedulerService.java:189)
at org.apache.dolphinscheduler.server.master.runner.MasterSchedulerService.run(MasterSchedulerService.java:169)
```
### What you expected to happen
not NPE when run
### How to reproduce
run some task
### Anything else
_No response_
### Are you willing to submit PR?
- [X] Yes I am willing to submit a PR!
### Code of Conduct
- [X] I agree to follow this project's [Code of Conduct](https://www.apache.org/foundation/policies/conduct)
| https://github.com/apache/dolphinscheduler/issues/6502 | https://github.com/apache/dolphinscheduler/pull/6504 | db04a5b04df8aa5754741c6dd456579d743af1e9 | fea7874f95028325f52300949295260cafab4a64 | "2021-10-12T02:35:18Z" | java | "2021-10-12T06:42:49Z" | dolphinscheduler-service/src/main/java/org/apache/dolphinscheduler/service/process/ProcessService.java | 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);
}
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());
}
} |
closed | apache/dolphinscheduler | https://github.com/apache/dolphinscheduler | 6,502 | [Bug] [MasterServer] cmdParam NPE when constructProcessInstance on SCHEDULER mode | ### Search before asking
- [X] I had searched in the [issues](https://github.com/apache/dolphinscheduler/issues?q=is%3Aissue) and found no similar issues.
### What happened
```
[ERROR] 2021-10-11 23:38:00.433 org.apache.dolphinscheduler.server.master.runner.MasterSchedulerService:[211] - scan command error
java.lang.NullPointerException: null
at org.apache.dolphinscheduler.service.process.ProcessService.constructProcessInstance(ProcessService.java:804)
at org.apache.dolphinscheduler.service.process.ProcessService.handleCommand(ProcessService.java:216)
at org.apache.dolphinscheduler.service.process.ProcessService$$FastClassBySpringCGLIB$$ed138739.invoke(<generated>)
at org.springframework.cglib.proxy.MethodProxy.invoke(MethodProxy.java:218)
at org.springframework.aop.framework.CglibAopProxy$DynamicAdvisedInterceptor.intercept(CglibAopProxy.java:687)
at org.apache.dolphinscheduler.service.process.ProcessService$$EnhancerBySpringCGLIB$$c9f32f1c.handleCommand(<generated>)
at org.apache.dolphinscheduler.server.master.runner.MasterSchedulerService.scheduleProcess(MasterSchedulerService.java:189)
at org.apache.dolphinscheduler.server.master.runner.MasterSchedulerService.run(MasterSchedulerService.java:169)
```
### What you expected to happen
not NPE when run
### How to reproduce
run some task
### Anything else
_No response_
### Are you willing to submit PR?
- [X] Yes I am willing to submit a PR!
### Code of Conduct
- [X] I agree to follow this project's [Code of Conduct](https://www.apache.org/foundation/policies/conduct)
| https://github.com/apache/dolphinscheduler/issues/6502 | https://github.com/apache/dolphinscheduler/pull/6504 | db04a5b04df8aa5754741c6dd456579d743af1e9 | fea7874f95028325f52300949295260cafab4a64 | "2021-10-12T02:35:18Z" | java | "2021-10-12T06:42:49Z" | dolphinscheduler-service/src/main/java/org/apache/dolphinscheduler/service/process/ProcessService.java | }
if (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);
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);
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, |
closed | apache/dolphinscheduler | https://github.com/apache/dolphinscheduler | 6,502 | [Bug] [MasterServer] cmdParam NPE when constructProcessInstance on SCHEDULER mode | ### Search before asking
- [X] I had searched in the [issues](https://github.com/apache/dolphinscheduler/issues?q=is%3Aissue) and found no similar issues.
### What happened
```
[ERROR] 2021-10-11 23:38:00.433 org.apache.dolphinscheduler.server.master.runner.MasterSchedulerService:[211] - scan command error
java.lang.NullPointerException: null
at org.apache.dolphinscheduler.service.process.ProcessService.constructProcessInstance(ProcessService.java:804)
at org.apache.dolphinscheduler.service.process.ProcessService.handleCommand(ProcessService.java:216)
at org.apache.dolphinscheduler.service.process.ProcessService$$FastClassBySpringCGLIB$$ed138739.invoke(<generated>)
at org.springframework.cglib.proxy.MethodProxy.invoke(MethodProxy.java:218)
at org.springframework.aop.framework.CglibAopProxy$DynamicAdvisedInterceptor.intercept(CglibAopProxy.java:687)
at org.apache.dolphinscheduler.service.process.ProcessService$$EnhancerBySpringCGLIB$$c9f32f1c.handleCommand(<generated>)
at org.apache.dolphinscheduler.server.master.runner.MasterSchedulerService.scheduleProcess(MasterSchedulerService.java:189)
at org.apache.dolphinscheduler.server.master.runner.MasterSchedulerService.run(MasterSchedulerService.java:169)
```
### What you expected to happen
not NPE when run
### How to reproduce
run some task
### Anything else
_No response_
### Are you willing to submit PR?
- [X] Yes I am willing to submit a PR!
### Code of Conduct
- [X] I agree to follow this project's [Code of Conduct](https://www.apache.org/foundation/policies/conduct)
| https://github.com/apache/dolphinscheduler/issues/6502 | https://github.com/apache/dolphinscheduler/pull/6504 | db04a5b04df8aa5754741c6dd456579d743af1e9 | fea7874f95028325f52300949295260cafab4a64 | "2021-10-12T02:35:18Z" | java | "2021-10-12T06:42:49Z" | dolphinscheduler-service/src/main/java/org/apache/dolphinscheduler/service/process/ProcessService.java | 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));
processInstance.setRunTimes(runTime + 1);
break;
case RECOVER_TOLERANCE_FAULT_PROCESS:
processInstance.setRecovery(Flag.YES);
runStatus = processInstance.getState();
break;
case COMPLEMENT_DATA: |
closed | apache/dolphinscheduler | https://github.com/apache/dolphinscheduler | 6,502 | [Bug] [MasterServer] cmdParam NPE when constructProcessInstance on SCHEDULER mode | ### Search before asking
- [X] I had searched in the [issues](https://github.com/apache/dolphinscheduler/issues?q=is%3Aissue) and found no similar issues.
### What happened
```
[ERROR] 2021-10-11 23:38:00.433 org.apache.dolphinscheduler.server.master.runner.MasterSchedulerService:[211] - scan command error
java.lang.NullPointerException: null
at org.apache.dolphinscheduler.service.process.ProcessService.constructProcessInstance(ProcessService.java:804)
at org.apache.dolphinscheduler.service.process.ProcessService.handleCommand(ProcessService.java:216)
at org.apache.dolphinscheduler.service.process.ProcessService$$FastClassBySpringCGLIB$$ed138739.invoke(<generated>)
at org.springframework.cglib.proxy.MethodProxy.invoke(MethodProxy.java:218)
at org.springframework.aop.framework.CglibAopProxy$DynamicAdvisedInterceptor.intercept(CglibAopProxy.java:687)
at org.apache.dolphinscheduler.service.process.ProcessService$$EnhancerBySpringCGLIB$$c9f32f1c.handleCommand(<generated>)
at org.apache.dolphinscheduler.server.master.runner.MasterSchedulerService.scheduleProcess(MasterSchedulerService.java:189)
at org.apache.dolphinscheduler.server.master.runner.MasterSchedulerService.run(MasterSchedulerService.java:169)
```
### What you expected to happen
not NPE when run
### How to reproduce
run some task
### Anything else
_No response_
### Are you willing to submit PR?
- [X] Yes I am willing to submit a PR!
### Code of Conduct
- [X] I agree to follow this project's [Code of Conduct](https://www.apache.org/foundation/policies/conduct)
| https://github.com/apache/dolphinscheduler/issues/6502 | https://github.com/apache/dolphinscheduler/pull/6504 | db04a5b04df8aa5754741c6dd456579d743af1e9 | fea7874f95028325f52300949295260cafab4a64 | "2021-10-12T02:35:18Z" | java | "2021-10-12T06:42:49Z" | dolphinscheduler-service/src/main/java/org/apache/dolphinscheduler/service/process/ProcessService.java | 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());
processInstance.setEndTime(null);
processInstance.setRunTimes(runTime + 1);
initComplementDataParam(processDefinition, processInstance, cmdParam);
break;
case SCHEDULER:
break;
default:
break;
} |
closed | apache/dolphinscheduler | https://github.com/apache/dolphinscheduler | 6,502 | [Bug] [MasterServer] cmdParam NPE when constructProcessInstance on SCHEDULER mode | ### Search before asking
- [X] I had searched in the [issues](https://github.com/apache/dolphinscheduler/issues?q=is%3Aissue) and found no similar issues.
### What happened
```
[ERROR] 2021-10-11 23:38:00.433 org.apache.dolphinscheduler.server.master.runner.MasterSchedulerService:[211] - scan command error
java.lang.NullPointerException: null
at org.apache.dolphinscheduler.service.process.ProcessService.constructProcessInstance(ProcessService.java:804)
at org.apache.dolphinscheduler.service.process.ProcessService.handleCommand(ProcessService.java:216)
at org.apache.dolphinscheduler.service.process.ProcessService$$FastClassBySpringCGLIB$$ed138739.invoke(<generated>)
at org.springframework.cglib.proxy.MethodProxy.invoke(MethodProxy.java:218)
at org.springframework.aop.framework.CglibAopProxy$DynamicAdvisedInterceptor.intercept(CglibAopProxy.java:687)
at org.apache.dolphinscheduler.service.process.ProcessService$$EnhancerBySpringCGLIB$$c9f32f1c.handleCommand(<generated>)
at org.apache.dolphinscheduler.server.master.runner.MasterSchedulerService.scheduleProcess(MasterSchedulerService.java:189)
at org.apache.dolphinscheduler.server.master.runner.MasterSchedulerService.run(MasterSchedulerService.java:169)
```
### What you expected to happen
not NPE when run
### How to reproduce
run some task
### Anything else
_No response_
### Are you willing to submit PR?
- [X] Yes I am willing to submit a PR!
### Code of Conduct
- [X] I agree to follow this project's [Code of Conduct](https://www.apache.org/foundation/policies/conduct)
| https://github.com/apache/dolphinscheduler/issues/6502 | https://github.com/apache/dolphinscheduler/pull/6504 | db04a5b04df8aa5754741c6dd456579d743af1e9 | fea7874f95028325f52300949295260cafab4a64 | "2021-10-12T02:35:18Z" | java | "2021-10-12T06:42:49Z" | dolphinscheduler-service/src/main/java/org/apache/dolphinscheduler/service/process/ProcessService.java | 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));
}
if (processInstanceId != 0) {
ProcessInstance processInstance = this.findProcessInstanceDetailById(processInstanceId);
if (processInstance == null) {
return null;
}
return processDefineLogMapper.queryByDefinitionCodeAndVersion(
processInstance.getProcessDefinitionCode(), processInstance.getProcessDefinitionVersion());
}
}
return processDefineMapper.queryByCode(processDefinitionCode); |
closed | apache/dolphinscheduler | https://github.com/apache/dolphinscheduler | 6,502 | [Bug] [MasterServer] cmdParam NPE when constructProcessInstance on SCHEDULER mode | ### Search before asking
- [X] I had searched in the [issues](https://github.com/apache/dolphinscheduler/issues?q=is%3Aissue) and found no similar issues.
### What happened
```
[ERROR] 2021-10-11 23:38:00.433 org.apache.dolphinscheduler.server.master.runner.MasterSchedulerService:[211] - scan command error
java.lang.NullPointerException: null
at org.apache.dolphinscheduler.service.process.ProcessService.constructProcessInstance(ProcessService.java:804)
at org.apache.dolphinscheduler.service.process.ProcessService.handleCommand(ProcessService.java:216)
at org.apache.dolphinscheduler.service.process.ProcessService$$FastClassBySpringCGLIB$$ed138739.invoke(<generated>)
at org.springframework.cglib.proxy.MethodProxy.invoke(MethodProxy.java:218)
at org.springframework.aop.framework.CglibAopProxy$DynamicAdvisedInterceptor.intercept(CglibAopProxy.java:687)
at org.apache.dolphinscheduler.service.process.ProcessService$$EnhancerBySpringCGLIB$$c9f32f1c.handleCommand(<generated>)
at org.apache.dolphinscheduler.server.master.runner.MasterSchedulerService.scheduleProcess(MasterSchedulerService.java:189)
at org.apache.dolphinscheduler.server.master.runner.MasterSchedulerService.run(MasterSchedulerService.java:169)
```
### What you expected to happen
not NPE when run
### How to reproduce
run some task
### Anything else
_No response_
### Are you willing to submit PR?
- [X] Yes I am willing to submit a PR!
### Code of Conduct
- [X] I agree to follow this project's [Code of Conduct](https://www.apache.org/foundation/policies/conduct)
| https://github.com/apache/dolphinscheduler/issues/6502 | https://github.com/apache/dolphinscheduler/pull/6504 | db04a5b04df8aa5754741c6dd456579d743af1e9 | fea7874f95028325f52300949295260cafab4a64 | "2021-10-12T02:35:18Z" | java | "2021-10-12T06:42:49Z" | dolphinscheduler-service/src/main/java/org/apache/dolphinscheduler/service/process/ProcessService.java | }
/**
* 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
* @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)); |
closed | apache/dolphinscheduler | https://github.com/apache/dolphinscheduler | 6,502 | [Bug] [MasterServer] cmdParam NPE when constructProcessInstance on SCHEDULER mode | ### Search before asking
- [X] I had searched in the [issues](https://github.com/apache/dolphinscheduler/issues?q=is%3Aissue) and found no similar issues.
### What happened
```
[ERROR] 2021-10-11 23:38:00.433 org.apache.dolphinscheduler.server.master.runner.MasterSchedulerService:[211] - scan command error
java.lang.NullPointerException: null
at org.apache.dolphinscheduler.service.process.ProcessService.constructProcessInstance(ProcessService.java:804)
at org.apache.dolphinscheduler.service.process.ProcessService.handleCommand(ProcessService.java:216)
at org.apache.dolphinscheduler.service.process.ProcessService$$FastClassBySpringCGLIB$$ed138739.invoke(<generated>)
at org.springframework.cglib.proxy.MethodProxy.invoke(MethodProxy.java:218)
at org.springframework.aop.framework.CglibAopProxy$DynamicAdvisedInterceptor.intercept(CglibAopProxy.java:687)
at org.apache.dolphinscheduler.service.process.ProcessService$$EnhancerBySpringCGLIB$$c9f32f1c.handleCommand(<generated>)
at org.apache.dolphinscheduler.server.master.runner.MasterSchedulerService.scheduleProcess(MasterSchedulerService.java:189)
at org.apache.dolphinscheduler.server.master.runner.MasterSchedulerService.run(MasterSchedulerService.java:169)
```
### What you expected to happen
not NPE when run
### How to reproduce
run some task
### Anything else
_No response_
### Are you willing to submit PR?
- [X] Yes I am willing to submit a PR!
### Code of Conduct
- [X] I agree to follow this project's [Code of Conduct](https://www.apache.org/foundation/policies/conduct)
| https://github.com/apache/dolphinscheduler/issues/6502 | https://github.com/apache/dolphinscheduler/pull/6504 | db04a5b04df8aa5754741c6dd456579d743af1e9 | fea7874f95028325f52300949295260cafab4a64 | "2021-10-12T02:35:18Z" | java | "2021-10-12T06:42:49Z" | dolphinscheduler-service/src/main/java/org/apache/dolphinscheduler/service/process/ProcessService.java | 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();
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)); |
closed | apache/dolphinscheduler | https://github.com/apache/dolphinscheduler | 6,502 | [Bug] [MasterServer] cmdParam NPE when constructProcessInstance on SCHEDULER mode | ### Search before asking
- [X] I had searched in the [issues](https://github.com/apache/dolphinscheduler/issues?q=is%3Aissue) and found no similar issues.
### What happened
```
[ERROR] 2021-10-11 23:38:00.433 org.apache.dolphinscheduler.server.master.runner.MasterSchedulerService:[211] - scan command error
java.lang.NullPointerException: null
at org.apache.dolphinscheduler.service.process.ProcessService.constructProcessInstance(ProcessService.java:804)
at org.apache.dolphinscheduler.service.process.ProcessService.handleCommand(ProcessService.java:216)
at org.apache.dolphinscheduler.service.process.ProcessService$$FastClassBySpringCGLIB$$ed138739.invoke(<generated>)
at org.springframework.cglib.proxy.MethodProxy.invoke(MethodProxy.java:218)
at org.springframework.aop.framework.CglibAopProxy$DynamicAdvisedInterceptor.intercept(CglibAopProxy.java:687)
at org.apache.dolphinscheduler.service.process.ProcessService$$EnhancerBySpringCGLIB$$c9f32f1c.handleCommand(<generated>)
at org.apache.dolphinscheduler.server.master.runner.MasterSchedulerService.scheduleProcess(MasterSchedulerService.java:189)
at org.apache.dolphinscheduler.server.master.runner.MasterSchedulerService.run(MasterSchedulerService.java:169)
```
### What you expected to happen
not NPE when run
### How to reproduce
run some task
### Anything else
_No response_
### Are you willing to submit PR?
- [X] Yes I am willing to submit a PR!
### Code of Conduct
- [X] I agree to follow this project's [Code of Conduct](https://www.apache.org/foundation/policies/conduct)
| https://github.com/apache/dolphinscheduler/issues/6502 | https://github.com/apache/dolphinscheduler/pull/6504 | db04a5b04df8aa5754741c6dd456579d743af1e9 | fea7874f95028325f52300949295260cafab4a64 | "2021-10-12T02:35:18Z" | java | "2021-10-12T06:42:49Z" | dolphinscheduler-service/src/main/java/org/apache/dolphinscheduler/service/process/ProcessService.java | subProcessInstance.setIsSubProcess(Flag.YES);
this.saveProcessInstance(subProcessInstance);
}
String parentInstanceId = paramMap.get(CMD_PARAM_SUB_PROCESS_PARENT_INSTANCE_ID);
if (StringUtils.isNotEmpty(parentInstanceId)) {
ProcessInstance parentInstance = findProcessInstanceDetailById(Integer.parseInt(parentInstanceId));
if (parentInstance != null) {
subProcessInstance.setGlobalParams(
joinGlobalParams(parentInstance.getGlobalParams(), subProcessInstance.getGlobalParams()));
this.saveProcessInstance(subProcessInstance);
} else {
logger.error("sub process command params error, cannot find parent instance: {} ", cmdParam);
}
}
ProcessInstanceMap processInstanceMap = JSONUtils.parseObject(cmdParam, ProcessInstanceMap.class);
if (processInstanceMap == null || processInstanceMap.getParentProcessInstanceId() == 0) {
return;
}
processInstanceMap.setProcessInstanceId(subProcessInstance.getId());
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 |
closed | apache/dolphinscheduler | https://github.com/apache/dolphinscheduler | 6,502 | [Bug] [MasterServer] cmdParam NPE when constructProcessInstance on SCHEDULER mode | ### Search before asking
- [X] I had searched in the [issues](https://github.com/apache/dolphinscheduler/issues?q=is%3Aissue) and found no similar issues.
### What happened
```
[ERROR] 2021-10-11 23:38:00.433 org.apache.dolphinscheduler.server.master.runner.MasterSchedulerService:[211] - scan command error
java.lang.NullPointerException: null
at org.apache.dolphinscheduler.service.process.ProcessService.constructProcessInstance(ProcessService.java:804)
at org.apache.dolphinscheduler.service.process.ProcessService.handleCommand(ProcessService.java:216)
at org.apache.dolphinscheduler.service.process.ProcessService$$FastClassBySpringCGLIB$$ed138739.invoke(<generated>)
at org.springframework.cglib.proxy.MethodProxy.invoke(MethodProxy.java:218)
at org.springframework.aop.framework.CglibAopProxy$DynamicAdvisedInterceptor.intercept(CglibAopProxy.java:687)
at org.apache.dolphinscheduler.service.process.ProcessService$$EnhancerBySpringCGLIB$$c9f32f1c.handleCommand(<generated>)
at org.apache.dolphinscheduler.server.master.runner.MasterSchedulerService.scheduleProcess(MasterSchedulerService.java:189)
at org.apache.dolphinscheduler.server.master.runner.MasterSchedulerService.run(MasterSchedulerService.java:169)
```
### What you expected to happen
not NPE when run
### How to reproduce
run some task
### Anything else
_No response_
### Are you willing to submit PR?
- [X] Yes I am willing to submit a PR!
### Code of Conduct
- [X] I agree to follow this project's [Code of Conduct](https://www.apache.org/foundation/policies/conduct)
| https://github.com/apache/dolphinscheduler/issues/6502 | https://github.com/apache/dolphinscheduler/pull/6504 | db04a5b04df8aa5754741c6dd456579d743af1e9 | fea7874f95028325f52300949295260cafab4a64 | "2021-10-12T02:35:18Z" | java | "2021-10-12T06:42:49Z" | dolphinscheduler-service/src/main/java/org/apache/dolphinscheduler/service/process/ProcessService.java | */
private String joinGlobalParams(String parentGlobalParams, String subGlobalParams) {
List<Property> parentPropertyList = JSONUtils.toList(parentGlobalParams, Property.class);
List<Property> subPropertyList = JSONUtils.toList(subGlobalParams, Property.class);
Map<String, String> subMap = subPropertyList.stream().collect(Collectors.toMap(Property::getProp, Property::getValue));
for (Property parent : parentPropertyList) {
if (!subMap.containsKey(parent.getProp())) {
subPropertyList.add(parent);
}
}
return JSONUtils.toJsonString(subPropertyList);
}
/**
* initialize task instance
*
* @param taskInstance taskInstance
*/
private void initTaskInstance(TaskInstance taskInstance) {
if (!taskInstance.isSubProcess()
&& (taskInstance.getState().typeIsCancel() || taskInstance.getState().typeIsFailure())) {
taskInstance.setFlag(Flag.NO);
updateTaskInstance(taskInstance);
return;
}
taskInstance.setState(ExecutionStatus.SUBMITTED_SUCCESS);
updateTaskInstance(taskInstance);
}
/**
* retry submit task to db
* |
closed | apache/dolphinscheduler | https://github.com/apache/dolphinscheduler | 6,502 | [Bug] [MasterServer] cmdParam NPE when constructProcessInstance on SCHEDULER mode | ### Search before asking
- [X] I had searched in the [issues](https://github.com/apache/dolphinscheduler/issues?q=is%3Aissue) and found no similar issues.
### What happened
```
[ERROR] 2021-10-11 23:38:00.433 org.apache.dolphinscheduler.server.master.runner.MasterSchedulerService:[211] - scan command error
java.lang.NullPointerException: null
at org.apache.dolphinscheduler.service.process.ProcessService.constructProcessInstance(ProcessService.java:804)
at org.apache.dolphinscheduler.service.process.ProcessService.handleCommand(ProcessService.java:216)
at org.apache.dolphinscheduler.service.process.ProcessService$$FastClassBySpringCGLIB$$ed138739.invoke(<generated>)
at org.springframework.cglib.proxy.MethodProxy.invoke(MethodProxy.java:218)
at org.springframework.aop.framework.CglibAopProxy$DynamicAdvisedInterceptor.intercept(CglibAopProxy.java:687)
at org.apache.dolphinscheduler.service.process.ProcessService$$EnhancerBySpringCGLIB$$c9f32f1c.handleCommand(<generated>)
at org.apache.dolphinscheduler.server.master.runner.MasterSchedulerService.scheduleProcess(MasterSchedulerService.java:189)
at org.apache.dolphinscheduler.server.master.runner.MasterSchedulerService.run(MasterSchedulerService.java:169)
```
### What you expected to happen
not NPE when run
### How to reproduce
run some task
### Anything else
_No response_
### Are you willing to submit PR?
- [X] Yes I am willing to submit a PR!
### Code of Conduct
- [X] I agree to follow this project's [Code of Conduct](https://www.apache.org/foundation/policies/conduct)
| https://github.com/apache/dolphinscheduler/issues/6502 | https://github.com/apache/dolphinscheduler/pull/6504 | db04a5b04df8aa5754741c6dd456579d743af1e9 | fea7874f95028325f52300949295260cafab4a64 | "2021-10-12T02:35:18Z" | java | "2021-10-12T06:42:49Z" | dolphinscheduler-service/src/main/java/org/apache/dolphinscheduler/service/process/ProcessService.java | * @param taskInstance
* @param commitRetryTimes
* @param commitInterval
* @return
*/
public TaskInstance submitTask(TaskInstance taskInstance, int commitRetryTimes, int commitInterval) {
int retryTimes = 1;
boolean submitDB = false;
TaskInstance task = null;
while (retryTimes <= commitRetryTimes) {
try {
if (!submitDB) {
task = submitTask(taskInstance);
if (task != null && task.getId() != 0) {
submitDB = true;
break;
}
}
if (!submitDB) {
logger.error("task commit to db failed , taskId {} has already retry {} times, please check the database", taskInstance.getId(), retryTimes);
}
Thread.sleep(commitInterval);
} catch (Exception e) {
logger.error("task commit to mysql failed", e);
}
retryTimes += 1;
}
return task;
} |
closed | apache/dolphinscheduler | https://github.com/apache/dolphinscheduler | 6,502 | [Bug] [MasterServer] cmdParam NPE when constructProcessInstance on SCHEDULER mode | ### Search before asking
- [X] I had searched in the [issues](https://github.com/apache/dolphinscheduler/issues?q=is%3Aissue) and found no similar issues.
### What happened
```
[ERROR] 2021-10-11 23:38:00.433 org.apache.dolphinscheduler.server.master.runner.MasterSchedulerService:[211] - scan command error
java.lang.NullPointerException: null
at org.apache.dolphinscheduler.service.process.ProcessService.constructProcessInstance(ProcessService.java:804)
at org.apache.dolphinscheduler.service.process.ProcessService.handleCommand(ProcessService.java:216)
at org.apache.dolphinscheduler.service.process.ProcessService$$FastClassBySpringCGLIB$$ed138739.invoke(<generated>)
at org.springframework.cglib.proxy.MethodProxy.invoke(MethodProxy.java:218)
at org.springframework.aop.framework.CglibAopProxy$DynamicAdvisedInterceptor.intercept(CglibAopProxy.java:687)
at org.apache.dolphinscheduler.service.process.ProcessService$$EnhancerBySpringCGLIB$$c9f32f1c.handleCommand(<generated>)
at org.apache.dolphinscheduler.server.master.runner.MasterSchedulerService.scheduleProcess(MasterSchedulerService.java:189)
at org.apache.dolphinscheduler.server.master.runner.MasterSchedulerService.run(MasterSchedulerService.java:169)
```
### What you expected to happen
not NPE when run
### How to reproduce
run some task
### Anything else
_No response_
### Are you willing to submit PR?
- [X] Yes I am willing to submit a PR!
### Code of Conduct
- [X] I agree to follow this project's [Code of Conduct](https://www.apache.org/foundation/policies/conduct)
| https://github.com/apache/dolphinscheduler/issues/6502 | https://github.com/apache/dolphinscheduler/pull/6504 | db04a5b04df8aa5754741c6dd456579d743af1e9 | fea7874f95028325f52300949295260cafab4a64 | "2021-10-12T02:35:18Z" | java | "2021-10-12T06:42:49Z" | dolphinscheduler-service/src/main/java/org/apache/dolphinscheduler/service/process/ProcessService.java | /**
* submit task to db
* submit sub process to command
*
* @param taskInstance taskInstance
* @return task instance
*/
@Transactional(rollbackFor = Exception.class)
public TaskInstance submitTask(TaskInstance taskInstance) {
ProcessInstance processInstance = this.findProcessInstanceDetailById(taskInstance.getProcessInstanceId());
logger.info("start submit task : {}, instance id:{}, state: {}",
taskInstance.getName(), taskInstance.getProcessInstanceId(), processInstance.getState());
TaskInstance task = submitTaskInstanceToDB(taskInstance, processInstance);
if (task == null) {
logger.error("end submit task to db error, task name:{}, process id:{} state: {} ",
taskInstance.getName(), taskInstance.getProcessInstance(), processInstance.getState());
return task;
}
if (!task.getState().typeIsFinished()) {
createSubWorkProcess(processInstance, task);
}
logger.info("end submit task to db successfully:{} {} state:{} complete, instance id:{} state: {} ",
taskInstance.getId(), taskInstance.getName(), task.getState(), processInstance.getId(), processInstance.getState());
return task;
}
/**
* set work process instance map
* consider o
* repeat running does not generate new sub process instance |
closed | apache/dolphinscheduler | https://github.com/apache/dolphinscheduler | 6,502 | [Bug] [MasterServer] cmdParam NPE when constructProcessInstance on SCHEDULER mode | ### Search before asking
- [X] I had searched in the [issues](https://github.com/apache/dolphinscheduler/issues?q=is%3Aissue) and found no similar issues.
### What happened
```
[ERROR] 2021-10-11 23:38:00.433 org.apache.dolphinscheduler.server.master.runner.MasterSchedulerService:[211] - scan command error
java.lang.NullPointerException: null
at org.apache.dolphinscheduler.service.process.ProcessService.constructProcessInstance(ProcessService.java:804)
at org.apache.dolphinscheduler.service.process.ProcessService.handleCommand(ProcessService.java:216)
at org.apache.dolphinscheduler.service.process.ProcessService$$FastClassBySpringCGLIB$$ed138739.invoke(<generated>)
at org.springframework.cglib.proxy.MethodProxy.invoke(MethodProxy.java:218)
at org.springframework.aop.framework.CglibAopProxy$DynamicAdvisedInterceptor.intercept(CglibAopProxy.java:687)
at org.apache.dolphinscheduler.service.process.ProcessService$$EnhancerBySpringCGLIB$$c9f32f1c.handleCommand(<generated>)
at org.apache.dolphinscheduler.server.master.runner.MasterSchedulerService.scheduleProcess(MasterSchedulerService.java:189)
at org.apache.dolphinscheduler.server.master.runner.MasterSchedulerService.run(MasterSchedulerService.java:169)
```
### What you expected to happen
not NPE when run
### How to reproduce
run some task
### Anything else
_No response_
### Are you willing to submit PR?
- [X] Yes I am willing to submit a PR!
### Code of Conduct
- [X] I agree to follow this project's [Code of Conduct](https://www.apache.org/foundation/policies/conduct)
| https://github.com/apache/dolphinscheduler/issues/6502 | https://github.com/apache/dolphinscheduler/pull/6504 | db04a5b04df8aa5754741c6dd456579d743af1e9 | fea7874f95028325f52300949295260cafab4a64 | "2021-10-12T02:35:18Z" | java | "2021-10-12T06:42:49Z" | dolphinscheduler-service/src/main/java/org/apache/dolphinscheduler/service/process/ProcessService.java | * set map {parent instance id, task instance id, 0(child instance id)}
*
* @param parentInstance parentInstance
* @param parentTask parentTask
* @return process instance map
*/
private ProcessInstanceMap setProcessInstanceMap(ProcessInstance parentInstance, TaskInstance parentTask) {
ProcessInstanceMap processMap = findWorkProcessMapByParent(parentInstance.getId(), parentTask.getId());
if (processMap != null) {
return processMap;
}
if (parentInstance.getCommandType() == CommandType.REPEAT_RUNNING) {
processMap = findPreviousTaskProcessMap(parentInstance, parentTask);
if (processMap != null) {
processMap.setParentTaskInstanceId(parentTask.getId());
updateWorkProcessInstanceMap(processMap);
return processMap;
}
}
processMap = new ProcessInstanceMap();
processMap.setParentProcessInstanceId(parentInstance.getId());
processMap.setParentTaskInstanceId(parentTask.getId());
createWorkProcessInstanceMap(processMap);
return processMap;
}
/**
* find previous task work process map.
* |
closed | apache/dolphinscheduler | https://github.com/apache/dolphinscheduler | 6,502 | [Bug] [MasterServer] cmdParam NPE when constructProcessInstance on SCHEDULER mode | ### Search before asking
- [X] I had searched in the [issues](https://github.com/apache/dolphinscheduler/issues?q=is%3Aissue) and found no similar issues.
### What happened
```
[ERROR] 2021-10-11 23:38:00.433 org.apache.dolphinscheduler.server.master.runner.MasterSchedulerService:[211] - scan command error
java.lang.NullPointerException: null
at org.apache.dolphinscheduler.service.process.ProcessService.constructProcessInstance(ProcessService.java:804)
at org.apache.dolphinscheduler.service.process.ProcessService.handleCommand(ProcessService.java:216)
at org.apache.dolphinscheduler.service.process.ProcessService$$FastClassBySpringCGLIB$$ed138739.invoke(<generated>)
at org.springframework.cglib.proxy.MethodProxy.invoke(MethodProxy.java:218)
at org.springframework.aop.framework.CglibAopProxy$DynamicAdvisedInterceptor.intercept(CglibAopProxy.java:687)
at org.apache.dolphinscheduler.service.process.ProcessService$$EnhancerBySpringCGLIB$$c9f32f1c.handleCommand(<generated>)
at org.apache.dolphinscheduler.server.master.runner.MasterSchedulerService.scheduleProcess(MasterSchedulerService.java:189)
at org.apache.dolphinscheduler.server.master.runner.MasterSchedulerService.run(MasterSchedulerService.java:169)
```
### What you expected to happen
not NPE when run
### How to reproduce
run some task
### Anything else
_No response_
### Are you willing to submit PR?
- [X] Yes I am willing to submit a PR!
### Code of Conduct
- [X] I agree to follow this project's [Code of Conduct](https://www.apache.org/foundation/policies/conduct)
| https://github.com/apache/dolphinscheduler/issues/6502 | https://github.com/apache/dolphinscheduler/pull/6504 | db04a5b04df8aa5754741c6dd456579d743af1e9 | fea7874f95028325f52300949295260cafab4a64 | "2021-10-12T02:35:18Z" | java | "2021-10-12T06:42:49Z" | dolphinscheduler-service/src/main/java/org/apache/dolphinscheduler/service/process/ProcessService.java | * @param parentProcessInstance parentProcessInstance
* @param parentTask parentTask
* @return process instance map
*/
private ProcessInstanceMap findPreviousTaskProcessMap(ProcessInstance parentProcessInstance,
TaskInstance parentTask) {
Integer preTaskId = 0;
List<TaskInstance> preTaskList = this.findPreviousTaskListByWorkProcessId(parentProcessInstance.getId());
for (TaskInstance task : preTaskList) {
if (task.getName().equals(parentTask.getName())) {
preTaskId = task.getId();
ProcessInstanceMap map = findWorkProcessMapByParent(parentProcessInstance.getId(), preTaskId);
if (map != null) {
return map;
}
}
}
logger.info("sub process instance is not found,parent task:{},parent instance:{}",
parentTask.getId(), parentProcessInstance.getId());
return null;
}
/**
* create sub work process command
*
* @param parentProcessInstance parentProcessInstance
* @param task task
*/
public void createSubWorkProcess(ProcessInstance parentProcessInstance, TaskInstance task) {
if (!task.isSubProcess()) {
return; |
closed | apache/dolphinscheduler | https://github.com/apache/dolphinscheduler | 6,502 | [Bug] [MasterServer] cmdParam NPE when constructProcessInstance on SCHEDULER mode | ### Search before asking
- [X] I had searched in the [issues](https://github.com/apache/dolphinscheduler/issues?q=is%3Aissue) and found no similar issues.
### What happened
```
[ERROR] 2021-10-11 23:38:00.433 org.apache.dolphinscheduler.server.master.runner.MasterSchedulerService:[211] - scan command error
java.lang.NullPointerException: null
at org.apache.dolphinscheduler.service.process.ProcessService.constructProcessInstance(ProcessService.java:804)
at org.apache.dolphinscheduler.service.process.ProcessService.handleCommand(ProcessService.java:216)
at org.apache.dolphinscheduler.service.process.ProcessService$$FastClassBySpringCGLIB$$ed138739.invoke(<generated>)
at org.springframework.cglib.proxy.MethodProxy.invoke(MethodProxy.java:218)
at org.springframework.aop.framework.CglibAopProxy$DynamicAdvisedInterceptor.intercept(CglibAopProxy.java:687)
at org.apache.dolphinscheduler.service.process.ProcessService$$EnhancerBySpringCGLIB$$c9f32f1c.handleCommand(<generated>)
at org.apache.dolphinscheduler.server.master.runner.MasterSchedulerService.scheduleProcess(MasterSchedulerService.java:189)
at org.apache.dolphinscheduler.server.master.runner.MasterSchedulerService.run(MasterSchedulerService.java:169)
```
### What you expected to happen
not NPE when run
### How to reproduce
run some task
### Anything else
_No response_
### Are you willing to submit PR?
- [X] Yes I am willing to submit a PR!
### Code of Conduct
- [X] I agree to follow this project's [Code of Conduct](https://www.apache.org/foundation/policies/conduct)
| https://github.com/apache/dolphinscheduler/issues/6502 | https://github.com/apache/dolphinscheduler/pull/6504 | db04a5b04df8aa5754741c6dd456579d743af1e9 | fea7874f95028325f52300949295260cafab4a64 | "2021-10-12T02:35:18Z" | java | "2021-10-12T06:42:49Z" | dolphinscheduler-service/src/main/java/org/apache/dolphinscheduler/service/process/ProcessService.java | }
ProcessInstanceMap instanceMap = findWorkProcessMapByParent(parentProcessInstance.getId(), task.getId());
if (null != instanceMap && CommandType.RECOVER_TOLERANCE_FAULT_PROCESS == parentProcessInstance.getCommandType()) {
return;
}
instanceMap = setProcessInstanceMap(parentProcessInstance, task);
ProcessInstance childInstance = null;
if (instanceMap.getProcessInstanceId() != 0) {
childInstance = findProcessInstanceById(instanceMap.getProcessInstanceId());
}
Command subProcessCommand = createSubProcessCommand(parentProcessInstance, childInstance, instanceMap, task);
updateSubProcessDefinitionByParent(parentProcessInstance, subProcessCommand.getProcessDefinitionCode());
initSubInstanceState(childInstance);
createCommand(subProcessCommand);
logger.info("sub process command created: {} ", subProcessCommand);
}
/**
* complement data needs transform parent parameter to child.
*/
private String getSubWorkFlowParam(ProcessInstanceMap instanceMap, ProcessInstance parentProcessInstance, Map<String, String> fatherParams) {
String processMapStr = JSONUtils.toJsonString(instanceMap);
Map<String, String> cmdParam = JSONUtils.toMap(processMapStr);
if (parentProcessInstance.isComplementData()) {
Map<String, String> parentParam = JSONUtils.toMap(parentProcessInstance.getCommandParam());
String endTime = parentParam.get(CMDPARAM_COMPLEMENT_DATA_END_DATE);
String startTime = parentParam.get(CMDPARAM_COMPLEMENT_DATA_START_DATE);
cmdParam.put(CMDPARAM_COMPLEMENT_DATA_END_DATE, endTime); |
closed | apache/dolphinscheduler | https://github.com/apache/dolphinscheduler | 6,502 | [Bug] [MasterServer] cmdParam NPE when constructProcessInstance on SCHEDULER mode | ### Search before asking
- [X] I had searched in the [issues](https://github.com/apache/dolphinscheduler/issues?q=is%3Aissue) and found no similar issues.
### What happened
```
[ERROR] 2021-10-11 23:38:00.433 org.apache.dolphinscheduler.server.master.runner.MasterSchedulerService:[211] - scan command error
java.lang.NullPointerException: null
at org.apache.dolphinscheduler.service.process.ProcessService.constructProcessInstance(ProcessService.java:804)
at org.apache.dolphinscheduler.service.process.ProcessService.handleCommand(ProcessService.java:216)
at org.apache.dolphinscheduler.service.process.ProcessService$$FastClassBySpringCGLIB$$ed138739.invoke(<generated>)
at org.springframework.cglib.proxy.MethodProxy.invoke(MethodProxy.java:218)
at org.springframework.aop.framework.CglibAopProxy$DynamicAdvisedInterceptor.intercept(CglibAopProxy.java:687)
at org.apache.dolphinscheduler.service.process.ProcessService$$EnhancerBySpringCGLIB$$c9f32f1c.handleCommand(<generated>)
at org.apache.dolphinscheduler.server.master.runner.MasterSchedulerService.scheduleProcess(MasterSchedulerService.java:189)
at org.apache.dolphinscheduler.server.master.runner.MasterSchedulerService.run(MasterSchedulerService.java:169)
```
### What you expected to happen
not NPE when run
### How to reproduce
run some task
### Anything else
_No response_
### Are you willing to submit PR?
- [X] Yes I am willing to submit a PR!
### Code of Conduct
- [X] I agree to follow this project's [Code of Conduct](https://www.apache.org/foundation/policies/conduct)
| https://github.com/apache/dolphinscheduler/issues/6502 | https://github.com/apache/dolphinscheduler/pull/6504 | db04a5b04df8aa5754741c6dd456579d743af1e9 | fea7874f95028325f52300949295260cafab4a64 | "2021-10-12T02:35:18Z" | java | "2021-10-12T06:42:49Z" | dolphinscheduler-service/src/main/java/org/apache/dolphinscheduler/service/process/ProcessService.java | cmdParam.put(CMDPARAM_COMPLEMENT_DATA_START_DATE, startTime);
processMapStr = JSONUtils.toJsonString(cmdParam);
}
if (fatherParams.size() != 0) {
cmdParam.put(CMD_PARAM_FATHER_PARAMS, JSONUtils.toJsonString(fatherParams));
processMapStr = JSONUtils.toJsonString(cmdParam);
}
return processMapStr;
}
public Map<String, String> getGlobalParamMap(String globalParams) {
List<Property> propList;
Map<String, String> globalParamMap = new HashMap<>();
if (StringUtils.isNotEmpty(globalParams)) {
propList = JSONUtils.toList(globalParams, Property.class);
globalParamMap = propList.stream().collect(Collectors.toMap(Property::getProp, Property::getValue));
}
return globalParamMap;
}
/**
* create sub work process command
*/
public Command createSubProcessCommand(ProcessInstance parentProcessInstance,
ProcessInstance childInstance,
ProcessInstanceMap instanceMap,
TaskInstance task) {
CommandType commandType = getSubCommandType(parentProcessInstance, childInstance);
Map<String, String> subProcessParam = JSONUtils.toMap(task.getTaskParams());
int childDefineId = Integer.parseInt(subProcessParam.get(Constants.CMD_PARAM_SUB_PROCESS_DEFINE_ID));
ProcessDefinition processDefinition = processDefineMapper.queryByDefineId(childDefineId);
Object localParams = subProcessParam.get(Constants.LOCAL_PARAMS); |
closed | apache/dolphinscheduler | https://github.com/apache/dolphinscheduler | 6,502 | [Bug] [MasterServer] cmdParam NPE when constructProcessInstance on SCHEDULER mode | ### Search before asking
- [X] I had searched in the [issues](https://github.com/apache/dolphinscheduler/issues?q=is%3Aissue) and found no similar issues.
### What happened
```
[ERROR] 2021-10-11 23:38:00.433 org.apache.dolphinscheduler.server.master.runner.MasterSchedulerService:[211] - scan command error
java.lang.NullPointerException: null
at org.apache.dolphinscheduler.service.process.ProcessService.constructProcessInstance(ProcessService.java:804)
at org.apache.dolphinscheduler.service.process.ProcessService.handleCommand(ProcessService.java:216)
at org.apache.dolphinscheduler.service.process.ProcessService$$FastClassBySpringCGLIB$$ed138739.invoke(<generated>)
at org.springframework.cglib.proxy.MethodProxy.invoke(MethodProxy.java:218)
at org.springframework.aop.framework.CglibAopProxy$DynamicAdvisedInterceptor.intercept(CglibAopProxy.java:687)
at org.apache.dolphinscheduler.service.process.ProcessService$$EnhancerBySpringCGLIB$$c9f32f1c.handleCommand(<generated>)
at org.apache.dolphinscheduler.server.master.runner.MasterSchedulerService.scheduleProcess(MasterSchedulerService.java:189)
at org.apache.dolphinscheduler.server.master.runner.MasterSchedulerService.run(MasterSchedulerService.java:169)
```
### What you expected to happen
not NPE when run
### How to reproduce
run some task
### Anything else
_No response_
### Are you willing to submit PR?
- [X] Yes I am willing to submit a PR!
### Code of Conduct
- [X] I agree to follow this project's [Code of Conduct](https://www.apache.org/foundation/policies/conduct)
| https://github.com/apache/dolphinscheduler/issues/6502 | https://github.com/apache/dolphinscheduler/pull/6504 | db04a5b04df8aa5754741c6dd456579d743af1e9 | fea7874f95028325f52300949295260cafab4a64 | "2021-10-12T02:35:18Z" | java | "2021-10-12T06:42:49Z" | dolphinscheduler-service/src/main/java/org/apache/dolphinscheduler/service/process/ProcessService.java | List<Property> allParam = JSONUtils.toList(JSONUtils.toJsonString(localParams), Property.class);
Map<String, String> globalMap = this.getGlobalParamMap(parentProcessInstance.getGlobalParams());
Map<String, String> fatherParams = new HashMap<>();
if (CollectionUtils.isNotEmpty(allParam)) {
for (Property info : allParam) {
fatherParams.put(info.getProp(), globalMap.get(info.getProp()));
}
}
String processParam = getSubWorkFlowParam(instanceMap, parentProcessInstance, fatherParams);
int subProcessInstanceId = childInstance == null ? 0 : childInstance.getId();
return new Command(
commandType,
TaskDependType.TASK_POST,
parentProcessInstance.getFailureStrategy(),
parentProcessInstance.getExecutorId(),
processDefinition.getCode(),
processParam,
parentProcessInstance.getWarningType(),
parentProcessInstance.getWarningGroupId(),
parentProcessInstance.getScheduleTime(),
task.getWorkerGroup(),
task.getEnvironmentCode(),
parentProcessInstance.getProcessInstancePriority(),
parentProcessInstance.getDryRun(),
subProcessInstanceId,
parentProcessInstance.getProcessDefinitionVersion()
);
}
/**
* initialize sub work flow state |
closed | apache/dolphinscheduler | https://github.com/apache/dolphinscheduler | 6,502 | [Bug] [MasterServer] cmdParam NPE when constructProcessInstance on SCHEDULER mode | ### Search before asking
- [X] I had searched in the [issues](https://github.com/apache/dolphinscheduler/issues?q=is%3Aissue) and found no similar issues.
### What happened
```
[ERROR] 2021-10-11 23:38:00.433 org.apache.dolphinscheduler.server.master.runner.MasterSchedulerService:[211] - scan command error
java.lang.NullPointerException: null
at org.apache.dolphinscheduler.service.process.ProcessService.constructProcessInstance(ProcessService.java:804)
at org.apache.dolphinscheduler.service.process.ProcessService.handleCommand(ProcessService.java:216)
at org.apache.dolphinscheduler.service.process.ProcessService$$FastClassBySpringCGLIB$$ed138739.invoke(<generated>)
at org.springframework.cglib.proxy.MethodProxy.invoke(MethodProxy.java:218)
at org.springframework.aop.framework.CglibAopProxy$DynamicAdvisedInterceptor.intercept(CglibAopProxy.java:687)
at org.apache.dolphinscheduler.service.process.ProcessService$$EnhancerBySpringCGLIB$$c9f32f1c.handleCommand(<generated>)
at org.apache.dolphinscheduler.server.master.runner.MasterSchedulerService.scheduleProcess(MasterSchedulerService.java:189)
at org.apache.dolphinscheduler.server.master.runner.MasterSchedulerService.run(MasterSchedulerService.java:169)
```
### What you expected to happen
not NPE when run
### How to reproduce
run some task
### Anything else
_No response_
### Are you willing to submit PR?
- [X] Yes I am willing to submit a PR!
### Code of Conduct
- [X] I agree to follow this project's [Code of Conduct](https://www.apache.org/foundation/policies/conduct)
| https://github.com/apache/dolphinscheduler/issues/6502 | https://github.com/apache/dolphinscheduler/pull/6504 | db04a5b04df8aa5754741c6dd456579d743af1e9 | fea7874f95028325f52300949295260cafab4a64 | "2021-10-12T02:35:18Z" | java | "2021-10-12T06:42:49Z" | dolphinscheduler-service/src/main/java/org/apache/dolphinscheduler/service/process/ProcessService.java | * child instance state would be initialized when 'recovery from pause/stop/failure'
*/
private void initSubInstanceState(ProcessInstance childInstance) {
if (childInstance != null) {
childInstance.setState(ExecutionStatus.RUNNING_EXECUTION);
updateProcessInstance(childInstance);
}
}
/**
* get sub work flow command type
* child instance exist: child command = fatherCommand
* child instance not exists: child command = fatherCommand[0]
*/
private CommandType getSubCommandType(ProcessInstance parentProcessInstance, ProcessInstance childInstance) {
CommandType commandType = parentProcessInstance.getCommandType();
if (childInstance == null) {
String fatherHistoryCommand = parentProcessInstance.getHistoryCmd();
commandType = CommandType.valueOf(fatherHistoryCommand.split(Constants.COMMA)[0]);
}
return commandType;
}
/**
* update sub process definition
*
* @param parentProcessInstance parentProcessInstance
* @param childDefinitionCode childDefinitionId
*/
private void updateSubProcessDefinitionByParent(ProcessInstance parentProcessInstance, long childDefinitionCode) {
ProcessDefinition fatherDefinition = this.findProcessDefinition(parentProcessInstance.getProcessDefinitionCode(),
parentProcessInstance.getProcessDefinitionVersion()); |
closed | apache/dolphinscheduler | https://github.com/apache/dolphinscheduler | 6,502 | [Bug] [MasterServer] cmdParam NPE when constructProcessInstance on SCHEDULER mode | ### Search before asking
- [X] I had searched in the [issues](https://github.com/apache/dolphinscheduler/issues?q=is%3Aissue) and found no similar issues.
### What happened
```
[ERROR] 2021-10-11 23:38:00.433 org.apache.dolphinscheduler.server.master.runner.MasterSchedulerService:[211] - scan command error
java.lang.NullPointerException: null
at org.apache.dolphinscheduler.service.process.ProcessService.constructProcessInstance(ProcessService.java:804)
at org.apache.dolphinscheduler.service.process.ProcessService.handleCommand(ProcessService.java:216)
at org.apache.dolphinscheduler.service.process.ProcessService$$FastClassBySpringCGLIB$$ed138739.invoke(<generated>)
at org.springframework.cglib.proxy.MethodProxy.invoke(MethodProxy.java:218)
at org.springframework.aop.framework.CglibAopProxy$DynamicAdvisedInterceptor.intercept(CglibAopProxy.java:687)
at org.apache.dolphinscheduler.service.process.ProcessService$$EnhancerBySpringCGLIB$$c9f32f1c.handleCommand(<generated>)
at org.apache.dolphinscheduler.server.master.runner.MasterSchedulerService.scheduleProcess(MasterSchedulerService.java:189)
at org.apache.dolphinscheduler.server.master.runner.MasterSchedulerService.run(MasterSchedulerService.java:169)
```
### What you expected to happen
not NPE when run
### How to reproduce
run some task
### Anything else
_No response_
### Are you willing to submit PR?
- [X] Yes I am willing to submit a PR!
### Code of Conduct
- [X] I agree to follow this project's [Code of Conduct](https://www.apache.org/foundation/policies/conduct)
| https://github.com/apache/dolphinscheduler/issues/6502 | https://github.com/apache/dolphinscheduler/pull/6504 | db04a5b04df8aa5754741c6dd456579d743af1e9 | fea7874f95028325f52300949295260cafab4a64 | "2021-10-12T02:35:18Z" | java | "2021-10-12T06:42:49Z" | dolphinscheduler-service/src/main/java/org/apache/dolphinscheduler/service/process/ProcessService.java | ProcessDefinition childDefinition = this.findProcessDefinitionByCode(childDefinitionCode);
if (childDefinition != null && fatherDefinition != null) {
childDefinition.setWarningGroupId(fatherDefinition.getWarningGroupId());
processDefineMapper.updateById(childDefinition);
}
}
/**
* submit task to mysql
*
* @param taskInstance taskInstance
* @param processInstance processInstance
* @return task instance
*/
public TaskInstance submitTaskInstanceToDB(TaskInstance taskInstance, ProcessInstance processInstance) {
ExecutionStatus processInstanceState = processInstance.getState();
if (taskInstance.getState().typeIsFailure()) {
if (taskInstance.isSubProcess()) {
taskInstance.setRetryTimes(taskInstance.getRetryTimes() + 1);
} else {
if (processInstanceState != ExecutionStatus.READY_STOP
&& processInstanceState != ExecutionStatus.READY_PAUSE) {
taskInstance.setFlag(Flag.NO);
updateTaskInstance(taskInstance);
if (taskInstance.getState() != ExecutionStatus.NEED_FAULT_TOLERANCE) {
taskInstance.setRetryTimes(taskInstance.getRetryTimes() + 1);
}
taskInstance.setSubmitTime(null);
taskInstance.setStartTime(null); |
closed | apache/dolphinscheduler | https://github.com/apache/dolphinscheduler | 6,502 | [Bug] [MasterServer] cmdParam NPE when constructProcessInstance on SCHEDULER mode | ### Search before asking
- [X] I had searched in the [issues](https://github.com/apache/dolphinscheduler/issues?q=is%3Aissue) and found no similar issues.
### What happened
```
[ERROR] 2021-10-11 23:38:00.433 org.apache.dolphinscheduler.server.master.runner.MasterSchedulerService:[211] - scan command error
java.lang.NullPointerException: null
at org.apache.dolphinscheduler.service.process.ProcessService.constructProcessInstance(ProcessService.java:804)
at org.apache.dolphinscheduler.service.process.ProcessService.handleCommand(ProcessService.java:216)
at org.apache.dolphinscheduler.service.process.ProcessService$$FastClassBySpringCGLIB$$ed138739.invoke(<generated>)
at org.springframework.cglib.proxy.MethodProxy.invoke(MethodProxy.java:218)
at org.springframework.aop.framework.CglibAopProxy$DynamicAdvisedInterceptor.intercept(CglibAopProxy.java:687)
at org.apache.dolphinscheduler.service.process.ProcessService$$EnhancerBySpringCGLIB$$c9f32f1c.handleCommand(<generated>)
at org.apache.dolphinscheduler.server.master.runner.MasterSchedulerService.scheduleProcess(MasterSchedulerService.java:189)
at org.apache.dolphinscheduler.server.master.runner.MasterSchedulerService.run(MasterSchedulerService.java:169)
```
### What you expected to happen
not NPE when run
### How to reproduce
run some task
### Anything else
_No response_
### Are you willing to submit PR?
- [X] Yes I am willing to submit a PR!
### Code of Conduct
- [X] I agree to follow this project's [Code of Conduct](https://www.apache.org/foundation/policies/conduct)
| https://github.com/apache/dolphinscheduler/issues/6502 | https://github.com/apache/dolphinscheduler/pull/6504 | db04a5b04df8aa5754741c6dd456579d743af1e9 | fea7874f95028325f52300949295260cafab4a64 | "2021-10-12T02:35:18Z" | java | "2021-10-12T06:42:49Z" | dolphinscheduler-service/src/main/java/org/apache/dolphinscheduler/service/process/ProcessService.java | taskInstance.setEndTime(null);
taskInstance.setFlag(Flag.YES);
taskInstance.setHost(null);
taskInstance.setId(0);
}
}
}
taskInstance.setExecutorId(processInstance.getExecutorId());
taskInstance.setProcessInstancePriority(processInstance.getProcessInstancePriority());
taskInstance.setState(getSubmitTaskState(taskInstance, processInstanceState));
if (taskInstance.getSubmitTime() == null) {
taskInstance.setSubmitTime(new Date());
}
if (taskInstance.getFirstSubmitTime() == null) {
taskInstance.setFirstSubmitTime(taskInstance.getSubmitTime());
}
boolean saveResult = saveTaskInstance(taskInstance);
if (!saveResult) {
return null;
}
return taskInstance;
}
/**
* get submit task instance state by the work process state
* cannot modify the task state when running/kill/submit success, or this
* task instance is already exists in task queue .
* 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
* |
closed | apache/dolphinscheduler | https://github.com/apache/dolphinscheduler | 6,502 | [Bug] [MasterServer] cmdParam NPE when constructProcessInstance on SCHEDULER mode | ### Search before asking
- [X] I had searched in the [issues](https://github.com/apache/dolphinscheduler/issues?q=is%3Aissue) and found no similar issues.
### What happened
```
[ERROR] 2021-10-11 23:38:00.433 org.apache.dolphinscheduler.server.master.runner.MasterSchedulerService:[211] - scan command error
java.lang.NullPointerException: null
at org.apache.dolphinscheduler.service.process.ProcessService.constructProcessInstance(ProcessService.java:804)
at org.apache.dolphinscheduler.service.process.ProcessService.handleCommand(ProcessService.java:216)
at org.apache.dolphinscheduler.service.process.ProcessService$$FastClassBySpringCGLIB$$ed138739.invoke(<generated>)
at org.springframework.cglib.proxy.MethodProxy.invoke(MethodProxy.java:218)
at org.springframework.aop.framework.CglibAopProxy$DynamicAdvisedInterceptor.intercept(CglibAopProxy.java:687)
at org.apache.dolphinscheduler.service.process.ProcessService$$EnhancerBySpringCGLIB$$c9f32f1c.handleCommand(<generated>)
at org.apache.dolphinscheduler.server.master.runner.MasterSchedulerService.scheduleProcess(MasterSchedulerService.java:189)
at org.apache.dolphinscheduler.server.master.runner.MasterSchedulerService.run(MasterSchedulerService.java:169)
```
### What you expected to happen
not NPE when run
### How to reproduce
run some task
### Anything else
_No response_
### Are you willing to submit PR?
- [X] Yes I am willing to submit a PR!
### Code of Conduct
- [X] I agree to follow this project's [Code of Conduct](https://www.apache.org/foundation/policies/conduct)
| https://github.com/apache/dolphinscheduler/issues/6502 | https://github.com/apache/dolphinscheduler/pull/6504 | db04a5b04df8aa5754741c6dd456579d743af1e9 | fea7874f95028325f52300949295260cafab4a64 | "2021-10-12T02:35:18Z" | java | "2021-10-12T06:42:49Z" | dolphinscheduler-service/src/main/java/org/apache/dolphinscheduler/service/process/ProcessService.java | * @param taskInstance taskInstance
* @param processInstanceState processInstanceState
* @return process instance state
*/
public ExecutionStatus getSubmitTaskState(TaskInstance taskInstance, ExecutionStatus processInstanceState) {
ExecutionStatus state = taskInstance.getState();
if (
state == ExecutionStatus.RUNNING_EXECUTION
|| state == ExecutionStatus.DELAY_EXECUTION
|| state == ExecutionStatus.KILL
) {
return state;
}
if (processInstanceState == ExecutionStatus.READY_PAUSE) {
state = ExecutionStatus.PAUSE;
} else if (processInstanceState == ExecutionStatus.READY_STOP
|| !checkProcessStrategy(taskInstance)) {
state = ExecutionStatus.KILL;
} else {
state = ExecutionStatus.SUBMITTED_SUCCESS;
}
return state;
}
/**
* check process instance strategy |
closed | apache/dolphinscheduler | https://github.com/apache/dolphinscheduler | 6,502 | [Bug] [MasterServer] cmdParam NPE when constructProcessInstance on SCHEDULER mode | ### Search before asking
- [X] I had searched in the [issues](https://github.com/apache/dolphinscheduler/issues?q=is%3Aissue) and found no similar issues.
### What happened
```
[ERROR] 2021-10-11 23:38:00.433 org.apache.dolphinscheduler.server.master.runner.MasterSchedulerService:[211] - scan command error
java.lang.NullPointerException: null
at org.apache.dolphinscheduler.service.process.ProcessService.constructProcessInstance(ProcessService.java:804)
at org.apache.dolphinscheduler.service.process.ProcessService.handleCommand(ProcessService.java:216)
at org.apache.dolphinscheduler.service.process.ProcessService$$FastClassBySpringCGLIB$$ed138739.invoke(<generated>)
at org.springframework.cglib.proxy.MethodProxy.invoke(MethodProxy.java:218)
at org.springframework.aop.framework.CglibAopProxy$DynamicAdvisedInterceptor.intercept(CglibAopProxy.java:687)
at org.apache.dolphinscheduler.service.process.ProcessService$$EnhancerBySpringCGLIB$$c9f32f1c.handleCommand(<generated>)
at org.apache.dolphinscheduler.server.master.runner.MasterSchedulerService.scheduleProcess(MasterSchedulerService.java:189)
at org.apache.dolphinscheduler.server.master.runner.MasterSchedulerService.run(MasterSchedulerService.java:169)
```
### What you expected to happen
not NPE when run
### How to reproduce
run some task
### Anything else
_No response_
### Are you willing to submit PR?
- [X] Yes I am willing to submit a PR!
### Code of Conduct
- [X] I agree to follow this project's [Code of Conduct](https://www.apache.org/foundation/policies/conduct)
| https://github.com/apache/dolphinscheduler/issues/6502 | https://github.com/apache/dolphinscheduler/pull/6504 | db04a5b04df8aa5754741c6dd456579d743af1e9 | fea7874f95028325f52300949295260cafab4a64 | "2021-10-12T02:35:18Z" | java | "2021-10-12T06:42:49Z" | dolphinscheduler-service/src/main/java/org/apache/dolphinscheduler/service/process/ProcessService.java | *
* @param taskInstance taskInstance
* @return check strategy result
*/
private boolean checkProcessStrategy(TaskInstance taskInstance) {
ProcessInstance processInstance = this.findProcessInstanceById(taskInstance.getProcessInstanceId());
FailureStrategy failureStrategy = processInstance.getFailureStrategy();
if (failureStrategy == FailureStrategy.CONTINUE) {
return true;
}
List<TaskInstance> taskInstances = this.findValidTaskListByProcessId(taskInstance.getProcessInstanceId());
for (TaskInstance task : taskInstances) {
if (task.getState() == ExecutionStatus.FAILURE
&& task.getRetryTimes() >= task.getMaxRetryTimes()) {
return false;
}
}
return true;
}
/**
* insert or update work process instance to data base
*
* @param processInstance processInstance
*/
public void saveProcessInstance(ProcessInstance processInstance) {
if (processInstance == null) {
logger.error("save error, process instance is null!");
return;
}
if (processInstance.getId() != 0) { |
closed | apache/dolphinscheduler | https://github.com/apache/dolphinscheduler | 6,502 | [Bug] [MasterServer] cmdParam NPE when constructProcessInstance on SCHEDULER mode | ### Search before asking
- [X] I had searched in the [issues](https://github.com/apache/dolphinscheduler/issues?q=is%3Aissue) and found no similar issues.
### What happened
```
[ERROR] 2021-10-11 23:38:00.433 org.apache.dolphinscheduler.server.master.runner.MasterSchedulerService:[211] - scan command error
java.lang.NullPointerException: null
at org.apache.dolphinscheduler.service.process.ProcessService.constructProcessInstance(ProcessService.java:804)
at org.apache.dolphinscheduler.service.process.ProcessService.handleCommand(ProcessService.java:216)
at org.apache.dolphinscheduler.service.process.ProcessService$$FastClassBySpringCGLIB$$ed138739.invoke(<generated>)
at org.springframework.cglib.proxy.MethodProxy.invoke(MethodProxy.java:218)
at org.springframework.aop.framework.CglibAopProxy$DynamicAdvisedInterceptor.intercept(CglibAopProxy.java:687)
at org.apache.dolphinscheduler.service.process.ProcessService$$EnhancerBySpringCGLIB$$c9f32f1c.handleCommand(<generated>)
at org.apache.dolphinscheduler.server.master.runner.MasterSchedulerService.scheduleProcess(MasterSchedulerService.java:189)
at org.apache.dolphinscheduler.server.master.runner.MasterSchedulerService.run(MasterSchedulerService.java:169)
```
### What you expected to happen
not NPE when run
### How to reproduce
run some task
### Anything else
_No response_
### Are you willing to submit PR?
- [X] Yes I am willing to submit a PR!
### Code of Conduct
- [X] I agree to follow this project's [Code of Conduct](https://www.apache.org/foundation/policies/conduct)
| https://github.com/apache/dolphinscheduler/issues/6502 | https://github.com/apache/dolphinscheduler/pull/6504 | db04a5b04df8aa5754741c6dd456579d743af1e9 | fea7874f95028325f52300949295260cafab4a64 | "2021-10-12T02:35:18Z" | java | "2021-10-12T06:42:49Z" | dolphinscheduler-service/src/main/java/org/apache/dolphinscheduler/service/process/ProcessService.java | processInstanceMapper.updateById(processInstance);
} else {
processInstanceMapper.insert(processInstance);
}
}
/**
* insert or update command
*
* @param command command
* @return save command result
*/
public int saveCommand(Command command) {
if (command.getId() != 0) {
return commandMapper.updateById(command);
} else {
return commandMapper.insert(command);
}
}
/**
* insert or update task instance
*
* @param taskInstance taskInstance
* @return save task instance result
*/
public boolean saveTaskInstance(TaskInstance taskInstance) {
if (taskInstance.getId() != 0) {
return updateTaskInstance(taskInstance);
} else {
return createTaskInstance(taskInstance);
} |
closed | apache/dolphinscheduler | https://github.com/apache/dolphinscheduler | 6,502 | [Bug] [MasterServer] cmdParam NPE when constructProcessInstance on SCHEDULER mode | ### Search before asking
- [X] I had searched in the [issues](https://github.com/apache/dolphinscheduler/issues?q=is%3Aissue) and found no similar issues.
### What happened
```
[ERROR] 2021-10-11 23:38:00.433 org.apache.dolphinscheduler.server.master.runner.MasterSchedulerService:[211] - scan command error
java.lang.NullPointerException: null
at org.apache.dolphinscheduler.service.process.ProcessService.constructProcessInstance(ProcessService.java:804)
at org.apache.dolphinscheduler.service.process.ProcessService.handleCommand(ProcessService.java:216)
at org.apache.dolphinscheduler.service.process.ProcessService$$FastClassBySpringCGLIB$$ed138739.invoke(<generated>)
at org.springframework.cglib.proxy.MethodProxy.invoke(MethodProxy.java:218)
at org.springframework.aop.framework.CglibAopProxy$DynamicAdvisedInterceptor.intercept(CglibAopProxy.java:687)
at org.apache.dolphinscheduler.service.process.ProcessService$$EnhancerBySpringCGLIB$$c9f32f1c.handleCommand(<generated>)
at org.apache.dolphinscheduler.server.master.runner.MasterSchedulerService.scheduleProcess(MasterSchedulerService.java:189)
at org.apache.dolphinscheduler.server.master.runner.MasterSchedulerService.run(MasterSchedulerService.java:169)
```
### What you expected to happen
not NPE when run
### How to reproduce
run some task
### Anything else
_No response_
### Are you willing to submit PR?
- [X] Yes I am willing to submit a PR!
### Code of Conduct
- [X] I agree to follow this project's [Code of Conduct](https://www.apache.org/foundation/policies/conduct)
| https://github.com/apache/dolphinscheduler/issues/6502 | https://github.com/apache/dolphinscheduler/pull/6504 | db04a5b04df8aa5754741c6dd456579d743af1e9 | fea7874f95028325f52300949295260cafab4a64 | "2021-10-12T02:35:18Z" | java | "2021-10-12T06:42:49Z" | dolphinscheduler-service/src/main/java/org/apache/dolphinscheduler/service/process/ProcessService.java | }
/**
* insert task instance
*
* @param taskInstance taskInstance
* @return create task instance result
*/
public boolean createTaskInstance(TaskInstance taskInstance) {
int count = taskInstanceMapper.insert(taskInstance);
return count > 0;
}
/**
* update task instance
*
* @param taskInstance taskInstance
* @return update task instance result
*/
public boolean updateTaskInstance(TaskInstance taskInstance) {
int count = taskInstanceMapper.updateById(taskInstance);
return count > 0;
}
/**
* find task instance by id
*
* @param taskId task id
* @return task intance
*/
public TaskInstance findTaskInstanceById(Integer taskId) {
return taskInstanceMapper.selectById(taskId);
} |
closed | apache/dolphinscheduler | https://github.com/apache/dolphinscheduler | 6,502 | [Bug] [MasterServer] cmdParam NPE when constructProcessInstance on SCHEDULER mode | ### Search before asking
- [X] I had searched in the [issues](https://github.com/apache/dolphinscheduler/issues?q=is%3Aissue) and found no similar issues.
### What happened
```
[ERROR] 2021-10-11 23:38:00.433 org.apache.dolphinscheduler.server.master.runner.MasterSchedulerService:[211] - scan command error
java.lang.NullPointerException: null
at org.apache.dolphinscheduler.service.process.ProcessService.constructProcessInstance(ProcessService.java:804)
at org.apache.dolphinscheduler.service.process.ProcessService.handleCommand(ProcessService.java:216)
at org.apache.dolphinscheduler.service.process.ProcessService$$FastClassBySpringCGLIB$$ed138739.invoke(<generated>)
at org.springframework.cglib.proxy.MethodProxy.invoke(MethodProxy.java:218)
at org.springframework.aop.framework.CglibAopProxy$DynamicAdvisedInterceptor.intercept(CglibAopProxy.java:687)
at org.apache.dolphinscheduler.service.process.ProcessService$$EnhancerBySpringCGLIB$$c9f32f1c.handleCommand(<generated>)
at org.apache.dolphinscheduler.server.master.runner.MasterSchedulerService.scheduleProcess(MasterSchedulerService.java:189)
at org.apache.dolphinscheduler.server.master.runner.MasterSchedulerService.run(MasterSchedulerService.java:169)
```
### What you expected to happen
not NPE when run
### How to reproduce
run some task
### Anything else
_No response_
### Are you willing to submit PR?
- [X] Yes I am willing to submit a PR!
### Code of Conduct
- [X] I agree to follow this project's [Code of Conduct](https://www.apache.org/foundation/policies/conduct)
| https://github.com/apache/dolphinscheduler/issues/6502 | https://github.com/apache/dolphinscheduler/pull/6504 | db04a5b04df8aa5754741c6dd456579d743af1e9 | fea7874f95028325f52300949295260cafab4a64 | "2021-10-12T02:35:18Z" | java | "2021-10-12T06:42:49Z" | dolphinscheduler-service/src/main/java/org/apache/dolphinscheduler/service/process/ProcessService.java | /**
* package task instance，associate processInstance and processDefine
*
* @param taskInstId taskInstId
* @return task instance
*/
public TaskInstance getTaskInstanceDetailByTaskId(int taskInstId) {
//
TaskInstance taskInstance = findTaskInstanceById(taskInstId);
if (taskInstance == null) {
return null;
}
setTaskInstanceDetail(taskInstance);
return taskInstance;
}
/**
* package task instance，associate processInstance and processDefine
*
* @param taskInstance taskInstance
* @return task instance
*/
public void setTaskInstanceDetail(TaskInstance taskInstance) {
// g
ProcessInstance processInstance = findProcessInstanceDetailById(taskInstance.getProcessInstanceId());
// g
ProcessDefinition processDefine = findProcessDefinition(processInstance.getProcessDefinitionCode(),
processInstance.getProcessDefinitionVersion());
taskInstance.setProcessInstance(processInstance);
taskInstance.setProcessDefine(processDefine);
TaskDefinition taskDefinition = taskDefinitionLogMapper.queryByDefinitionCodeAndVersion( |
closed | apache/dolphinscheduler | https://github.com/apache/dolphinscheduler | 6,502 | [Bug] [MasterServer] cmdParam NPE when constructProcessInstance on SCHEDULER mode | ### Search before asking
- [X] I had searched in the [issues](https://github.com/apache/dolphinscheduler/issues?q=is%3Aissue) and found no similar issues.
### What happened
```
[ERROR] 2021-10-11 23:38:00.433 org.apache.dolphinscheduler.server.master.runner.MasterSchedulerService:[211] - scan command error
java.lang.NullPointerException: null
at org.apache.dolphinscheduler.service.process.ProcessService.constructProcessInstance(ProcessService.java:804)
at org.apache.dolphinscheduler.service.process.ProcessService.handleCommand(ProcessService.java:216)
at org.apache.dolphinscheduler.service.process.ProcessService$$FastClassBySpringCGLIB$$ed138739.invoke(<generated>)
at org.springframework.cglib.proxy.MethodProxy.invoke(MethodProxy.java:218)
at org.springframework.aop.framework.CglibAopProxy$DynamicAdvisedInterceptor.intercept(CglibAopProxy.java:687)
at org.apache.dolphinscheduler.service.process.ProcessService$$EnhancerBySpringCGLIB$$c9f32f1c.handleCommand(<generated>)
at org.apache.dolphinscheduler.server.master.runner.MasterSchedulerService.scheduleProcess(MasterSchedulerService.java:189)
at org.apache.dolphinscheduler.server.master.runner.MasterSchedulerService.run(MasterSchedulerService.java:169)
```
### What you expected to happen
not NPE when run
### How to reproduce
run some task
### Anything else
_No response_
### Are you willing to submit PR?
- [X] Yes I am willing to submit a PR!
### Code of Conduct
- [X] I agree to follow this project's [Code of Conduct](https://www.apache.org/foundation/policies/conduct)
| https://github.com/apache/dolphinscheduler/issues/6502 | https://github.com/apache/dolphinscheduler/pull/6504 | db04a5b04df8aa5754741c6dd456579d743af1e9 | fea7874f95028325f52300949295260cafab4a64 | "2021-10-12T02:35:18Z" | java | "2021-10-12T06:42:49Z" | dolphinscheduler-service/src/main/java/org/apache/dolphinscheduler/service/process/ProcessService.java | taskInstance.getTaskCode(),
taskInstance.getTaskDefinitionVersion());
updateTaskDefinitionResources(taskDefinition);
taskInstance.setTaskDefine(taskDefinition);
}
/**
* Update {@link ResourceInfo} information in {@link TaskDefinition}
*
* @param taskDefinition the given {@link TaskDefinition}
*/
private void updateTaskDefinitionResources(TaskDefinition taskDefinition) {
Map<String, Object> taskParameters = JSONUtils.parseObject(
taskDefinition.getTaskParams(),
new TypeReference<Map<String, Object>>() { });
if (taskParameters != null) {
// i
// F
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);
}
}
// u
if (taskParameters.containsKey("resourceList")) {
String resourceListStr = JSONUtils.toJsonString(taskParameters.get("resourceList")); |
Subsets and Splits
No community queries yet
The top public SQL queries from the community will appear here once available.