status
stringclasses
1 value
repo_name
stringclasses
31 values
repo_url
stringclasses
31 values
issue_id
int64
1
104k
title
stringlengths
4
233
body
stringlengths
0
186k
issue_url
stringlengths
38
56
pull_url
stringlengths
37
54
before_fix_sha
stringlengths
40
40
after_fix_sha
stringlengths
40
40
report_datetime
timestamp[us, tz=UTC]
language
stringclasses
5 values
commit_datetime
timestamp[us, tz=UTC]
updated_file
stringlengths
7
188
chunk_content
stringlengths
1
1.03M
closed
apache/dolphinscheduler
https://github.com/apache/dolphinscheduler
12,391
[Improvement][API] Workflow definitions that contain logical task nodes support the copy function
### Search before asking - [X] I had searched in the [issues](https://github.com/apache/dolphinscheduler/issues?q=is%3Aissue) and found no similar feature requirement. ### Description Currently, the system does not support the replication function of workflow definition including `CONDITIONS`, `SWITCH`, `SUB_PROCESS`, `DEPENDENT` four task nodes. <img width="1472" alt="image" src="https://user-images.githubusercontent.com/37063904/196038586-7e802eeb-2063-468f-83ae-430201149712.png"> ### Are you willing to submit a 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/12391
https://github.com/apache/dolphinscheduler/pull/12392
b7bd8d780356e055998fd0047be7e2cfea85d59b
55004bebe032b7212892686d308adca2ac0e2723
2022-10-16T13:42:00Z
java
2022-10-17T02:28:58Z
dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/impl/ProcessDefinitionServiceImpl.java
arrayNode.add(processDefinitionNode); } result.put(Constants.DATA_LIST, arrayNode); putMsg(result, Status.SUCCESS); return result; } /** * query process definition list paging * * @param loginUser login user * @param projectCode project code * @param searchVal search value * @param userId user id * @param pageNo page number * @param pageSize page size * @return process definition page */ @Override public PageInfo<ProcessDefinition> queryProcessDefinitionListPaging(@NonNull User loginUser, long projectCode, String searchVal, String otherParamsJson, Integer userId, Integer pageNo, Integer pageSize) { Project project = projectMapper.queryByCode(projectCode); projectService.checkProjectAndAuthThrowException(loginUser, project, WORKFLOW_DEFINITION); PageListingResult<ProcessDefinition> processDefinitionsPageListingResult = processDefinitionDao.listingProcessDefinition(
closed
apache/dolphinscheduler
https://github.com/apache/dolphinscheduler
12,391
[Improvement][API] Workflow definitions that contain logical task nodes support the copy function
### Search before asking - [X] I had searched in the [issues](https://github.com/apache/dolphinscheduler/issues?q=is%3Aissue) and found no similar feature requirement. ### Description Currently, the system does not support the replication function of workflow definition including `CONDITIONS`, `SWITCH`, `SUB_PROCESS`, `DEPENDENT` four task nodes. <img width="1472" alt="image" src="https://user-images.githubusercontent.com/37063904/196038586-7e802eeb-2063-468f-83ae-430201149712.png"> ### Are you willing to submit a 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/12391
https://github.com/apache/dolphinscheduler/pull/12392
b7bd8d780356e055998fd0047be7e2cfea85d59b
55004bebe032b7212892686d308adca2ac0e2723
2022-10-16T13:42:00Z
java
2022-10-17T02:28:58Z
dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/impl/ProcessDefinitionServiceImpl.java
pageNo, pageSize, searchVal, userId, projectCode); List<ProcessDefinition> processDefinitions = processDefinitionsPageListingResult.getRecords(); List<Long> processDefinitionCodes = processDefinitions.stream().map(ProcessDefinition::getCode).collect(Collectors.toList()); Map<Long, Schedule> scheduleMap = schedulerService.queryScheduleByProcessDefinitionCodes(processDefinitionCodes) .stream() .collect(Collectors.toMap(Schedule::getProcessDefinitionCode, Function.identity())); for (ProcessDefinition pd : processDefinitions) { ProcessDefinitionLog processDefinitionLog = processDefinitionLogMapper.queryByDefinitionCodeAndVersion(pd.getCode(), pd.getVersion()); User user = userMapper.selectById(processDefinitionLog.getOperator()); pd.setModifyBy(user.getUserName()); Schedule schedule = scheduleMap.get(pd.getCode()); pd.setScheduleReleaseState(schedule == null ? null : schedule.getReleaseState()); } PageInfo<ProcessDefinition> pageInfo = new PageInfo<>(pageNo, pageSize); pageInfo.setTotal((int) processDefinitionsPageListingResult.getTotalCount()); pageInfo.setTotalList(processDefinitions); return pageInfo; } /** * Filter resource process definitions * * @param loginUser login user * @param workflowFilterRequest workflow filter requests * @return List process definition */ @Override public PageInfo<ProcessDefinition> filterProcessDefinition(User loginUser,
closed
apache/dolphinscheduler
https://github.com/apache/dolphinscheduler
12,391
[Improvement][API] Workflow definitions that contain logical task nodes support the copy function
### Search before asking - [X] I had searched in the [issues](https://github.com/apache/dolphinscheduler/issues?q=is%3Aissue) and found no similar feature requirement. ### Description Currently, the system does not support the replication function of workflow definition including `CONDITIONS`, `SWITCH`, `SUB_PROCESS`, `DEPENDENT` four task nodes. <img width="1472" alt="image" src="https://user-images.githubusercontent.com/37063904/196038586-7e802eeb-2063-468f-83ae-430201149712.png"> ### Are you willing to submit a 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/12391
https://github.com/apache/dolphinscheduler/pull/12392
b7bd8d780356e055998fd0047be7e2cfea85d59b
55004bebe032b7212892686d308adca2ac0e2723
2022-10-16T13:42:00Z
java
2022-10-17T02:28:58Z
dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/impl/ProcessDefinitionServiceImpl.java
WorkflowFilterRequest workflowFilterRequest) { ProcessDefinition processDefinition = workflowFilterRequest.convert2ProcessDefinition(); if (workflowFilterRequest.getProjectName() != null) { Project project = projectMapper.queryByName(workflowFilterRequest.getProjectName()); projectService.checkProjectAndAuthThrowException(loginUser, project, WORKFLOW_DEFINITION); processDefinition.setProjectCode(project.getCode()); } Page<ProcessDefinition> page = new Page<>(workflowFilterRequest.getPageNo(), workflowFilterRequest.getPageSize()); IPage<ProcessDefinition> processDefinitionIPage = processDefinitionMapper.filterProcessDefinition(page, processDefinition); List<ProcessDefinition> records = processDefinitionIPage.getRecords(); for (ProcessDefinition pd : records) { ProcessDefinitionLog processDefinitionLog = processDefinitionLogMapper.queryByDefinitionCodeAndVersion(pd.getCode(), pd.getVersion()); User user = userMapper.selectById(processDefinitionLog.getOperator()); pd.setModifyBy(user.getUserName()); } processDefinitionIPage.setRecords(records); PageInfo<ProcessDefinition> pageInfo = new PageInfo<>(workflowFilterRequest.getPageNo(), workflowFilterRequest.getPageSize()); pageInfo.setTotal((int) processDefinitionIPage.getTotal()); pageInfo.setTotalList(processDefinitionIPage.getRecords()); return pageInfo; } /** * query detail of process definition * * @param loginUser login user
closed
apache/dolphinscheduler
https://github.com/apache/dolphinscheduler
12,391
[Improvement][API] Workflow definitions that contain logical task nodes support the copy function
### Search before asking - [X] I had searched in the [issues](https://github.com/apache/dolphinscheduler/issues?q=is%3Aissue) and found no similar feature requirement. ### Description Currently, the system does not support the replication function of workflow definition including `CONDITIONS`, `SWITCH`, `SUB_PROCESS`, `DEPENDENT` four task nodes. <img width="1472" alt="image" src="https://user-images.githubusercontent.com/37063904/196038586-7e802eeb-2063-468f-83ae-430201149712.png"> ### Are you willing to submit a 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/12391
https://github.com/apache/dolphinscheduler/pull/12392
b7bd8d780356e055998fd0047be7e2cfea85d59b
55004bebe032b7212892686d308adca2ac0e2723
2022-10-16T13:42:00Z
java
2022-10-17T02:28:58Z
dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/impl/ProcessDefinitionServiceImpl.java
* @param projectCode project code * @param code process definition code * @return process definition detail */ @Override public Map<String, Object> queryProcessDefinitionByCode(User loginUser, long projectCode, long code) { Project project = projectMapper.queryByCode(projectCode); Map<String, Object> result = projectService.checkProjectAndAuth(loginUser, project, projectCode, WORKFLOW_DEFINITION); if (result.get(Constants.STATUS) != Status.SUCCESS) { return result; } ProcessDefinition processDefinition = processDefinitionMapper.queryByCode(code); if (processDefinition == null || projectCode != processDefinition.getProjectCode()) { logger.error("Process definition does not exist, processCode:{}.", code); putMsg(result, Status.PROCESS_DEFINE_NOT_EXIST, String.valueOf(code)); } else { Tenant tenant = tenantMapper.queryById(processDefinition.getTenantId()); if (tenant != null) { processDefinition.setTenantCode(tenant.getTenantCode()); } DagData dagData = processService.genDagData(processDefinition); result.put(Constants.DATA_LIST, dagData); putMsg(result, Status.SUCCESS); } return result; } /** * query detail of process definition
closed
apache/dolphinscheduler
https://github.com/apache/dolphinscheduler
12,391
[Improvement][API] Workflow definitions that contain logical task nodes support the copy function
### Search before asking - [X] I had searched in the [issues](https://github.com/apache/dolphinscheduler/issues?q=is%3Aissue) and found no similar feature requirement. ### Description Currently, the system does not support the replication function of workflow definition including `CONDITIONS`, `SWITCH`, `SUB_PROCESS`, `DEPENDENT` four task nodes. <img width="1472" alt="image" src="https://user-images.githubusercontent.com/37063904/196038586-7e802eeb-2063-468f-83ae-430201149712.png"> ### Are you willing to submit a 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/12391
https://github.com/apache/dolphinscheduler/pull/12392
b7bd8d780356e055998fd0047be7e2cfea85d59b
55004bebe032b7212892686d308adca2ac0e2723
2022-10-16T13:42:00Z
java
2022-10-17T02:28:58Z
dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/impl/ProcessDefinitionServiceImpl.java
* * @param loginUser login user * @param code process definition code * @return process definition detail */ @Override public ProcessDefinition getProcessDefinition(User loginUser, long code) { ProcessDefinition processDefinition = processDefinitionMapper.queryByCode(code); if (processDefinition == null) { throw new ServiceException(Status.PROCESS_DEFINE_NOT_EXIST, String.valueOf(code)); } Project project = projectMapper.queryByCode(processDefinition.getProjectCode()); projectService.checkProjectAndAuthThrowException(loginUser, project, WORKFLOW_DEFINITION); Tenant tenant = tenantMapper.queryById(processDefinition.getTenantId()); if (tenant != null) { processDefinition.setTenantCode(tenant.getTenantCode()); } return processDefinition; } @Override public Map<String, Object> queryProcessDefinitionByName(User loginUser, long projectCode, String name) { Project project = projectMapper.queryByCode(projectCode); Map<String, Object> result = projectService.checkProjectAndAuth(loginUser, project, projectCode, WORKFLOW_DEFINITION); if (result.get(Constants.STATUS) != Status.SUCCESS) { return result; } ProcessDefinition processDefinition = processDefinitionMapper.queryByDefineName(projectCode, name);
closed
apache/dolphinscheduler
https://github.com/apache/dolphinscheduler
12,391
[Improvement][API] Workflow definitions that contain logical task nodes support the copy function
### Search before asking - [X] I had searched in the [issues](https://github.com/apache/dolphinscheduler/issues?q=is%3Aissue) and found no similar feature requirement. ### Description Currently, the system does not support the replication function of workflow definition including `CONDITIONS`, `SWITCH`, `SUB_PROCESS`, `DEPENDENT` four task nodes. <img width="1472" alt="image" src="https://user-images.githubusercontent.com/37063904/196038586-7e802eeb-2063-468f-83ae-430201149712.png"> ### Are you willing to submit a 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/12391
https://github.com/apache/dolphinscheduler/pull/12392
b7bd8d780356e055998fd0047be7e2cfea85d59b
55004bebe032b7212892686d308adca2ac0e2723
2022-10-16T13:42:00Z
java
2022-10-17T02:28:58Z
dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/impl/ProcessDefinitionServiceImpl.java
if (processDefinition == null) { logger.error("Process definition does not exist, projectCode:{}.", projectCode); putMsg(result, Status.PROCESS_DEFINE_NOT_EXIST, name); } else { DagData dagData = processService.genDagData(processDefinition); result.put(Constants.DATA_LIST, dagData); putMsg(result, Status.SUCCESS); } return result; } /** * update process definition * * @param loginUser login user * @param projectCode project code * @param name process definition name * @param code process definition code * @param description description * @param globalParams global params * @param locations locations for nodes * @param timeout timeout * @param tenantCode tenantCode * @param taskRelationJson relation json for nodes * @param taskDefinitionJson taskDefinitionJson * @param otherParamsJson otherParamsJson handle other params * @return update result code */ @Override @Transactional public Map<String, Object> updateProcessDefinition(User loginUser,
closed
apache/dolphinscheduler
https://github.com/apache/dolphinscheduler
12,391
[Improvement][API] Workflow definitions that contain logical task nodes support the copy function
### Search before asking - [X] I had searched in the [issues](https://github.com/apache/dolphinscheduler/issues?q=is%3Aissue) and found no similar feature requirement. ### Description Currently, the system does not support the replication function of workflow definition including `CONDITIONS`, `SWITCH`, `SUB_PROCESS`, `DEPENDENT` four task nodes. <img width="1472" alt="image" src="https://user-images.githubusercontent.com/37063904/196038586-7e802eeb-2063-468f-83ae-430201149712.png"> ### Are you willing to submit a 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/12391
https://github.com/apache/dolphinscheduler/pull/12392
b7bd8d780356e055998fd0047be7e2cfea85d59b
55004bebe032b7212892686d308adca2ac0e2723
2022-10-16T13:42:00Z
java
2022-10-17T02:28:58Z
dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/impl/ProcessDefinitionServiceImpl.java
long projectCode, String name, long code, String description, String globalParams, String locations, int timeout, String tenantCode, String taskRelationJson, String taskDefinitionJson, String otherParamsJson, ProcessExecutionTypeEnum executionType) { Project project = projectMapper.queryByCode(projectCode); Map<String, Object> result = projectService.checkProjectAndAuth(loginUser, project, projectCode, WORKFLOW_UPDATE); if (result.get(Constants.STATUS) != Status.SUCCESS) { return result; } if (checkDescriptionLength(description)) { logger.warn("Parameter description is too long."); putMsg(result, Status.DESCRIPTION_TOO_LONG_ERROR); return result; } List<TaskDefinitionLog> taskDefinitionLogs = generateTaskDefinitionList(taskDefinitionJson); List<ProcessTaskRelationLog> taskRelationList = generateTaskRelationList(taskRelationJson, taskDefinitionLogs); int tenantId = -1; if (!Constants.DEFAULT.equals(tenantCode)) { Tenant tenant = tenantMapper.queryByTenantCode(tenantCode); if (tenant == null) {
closed
apache/dolphinscheduler
https://github.com/apache/dolphinscheduler
12,391
[Improvement][API] Workflow definitions that contain logical task nodes support the copy function
### Search before asking - [X] I had searched in the [issues](https://github.com/apache/dolphinscheduler/issues?q=is%3Aissue) and found no similar feature requirement. ### Description Currently, the system does not support the replication function of workflow definition including `CONDITIONS`, `SWITCH`, `SUB_PROCESS`, `DEPENDENT` four task nodes. <img width="1472" alt="image" src="https://user-images.githubusercontent.com/37063904/196038586-7e802eeb-2063-468f-83ae-430201149712.png"> ### Are you willing to submit a 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/12391
https://github.com/apache/dolphinscheduler/pull/12392
b7bd8d780356e055998fd0047be7e2cfea85d59b
55004bebe032b7212892686d308adca2ac0e2723
2022-10-16T13:42:00Z
java
2022-10-17T02:28:58Z
dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/impl/ProcessDefinitionServiceImpl.java
logger.error("Tenant does not exist."); putMsg(result, Status.TENANT_NOT_EXIST); return result; } tenantId = tenant.getId(); } ProcessDefinition processDefinition = processDefinitionMapper.queryByCode(code); if (processDefinition == null || projectCode != processDefinition.getProjectCode()) { logger.error("Process definition does not exist, processCode:{}.", code); putMsg(result, Status.PROCESS_DEFINE_NOT_EXIST, String.valueOf(code)); return result; } if (processDefinition.getReleaseState() == ReleaseState.ONLINE) { logger.warn("Process definition is not allowed to be modified due to {}, processDefinitionCode:{}.", ReleaseState.ONLINE.getDescp(), processDefinition.getCode()); putMsg(result, Status.PROCESS_DEFINE_NOT_ALLOWED_EDIT, processDefinition.getName()); return result; } if (!name.equals(processDefinition.getName())) { ProcessDefinition definition = processDefinitionMapper.verifyByDefineName(project.getCode(), name); if (definition != null) { logger.warn("Process definition with the same name already exists, processDefinitionCode:{}.", definition.getCode()); putMsg(result, Status.PROCESS_DEFINITION_NAME_EXIST, name); return result; } }
closed
apache/dolphinscheduler
https://github.com/apache/dolphinscheduler
12,391
[Improvement][API] Workflow definitions that contain logical task nodes support the copy function
### Search before asking - [X] I had searched in the [issues](https://github.com/apache/dolphinscheduler/issues?q=is%3Aissue) and found no similar feature requirement. ### Description Currently, the system does not support the replication function of workflow definition including `CONDITIONS`, `SWITCH`, `SUB_PROCESS`, `DEPENDENT` four task nodes. <img width="1472" alt="image" src="https://user-images.githubusercontent.com/37063904/196038586-7e802eeb-2063-468f-83ae-430201149712.png"> ### Are you willing to submit a 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/12391
https://github.com/apache/dolphinscheduler/pull/12392
b7bd8d780356e055998fd0047be7e2cfea85d59b
55004bebe032b7212892686d308adca2ac0e2723
2022-10-16T13:42:00Z
java
2022-10-17T02:28:58Z
dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/impl/ProcessDefinitionServiceImpl.java
ProcessDefinition processDefinitionDeepCopy = JSONUtils.parseObject(JSONUtils.toJsonString(processDefinition), ProcessDefinition.class); processDefinition.set(projectCode, name, description, globalParams, locations, timeout, tenantId); processDefinition.setExecutionType(executionType); return updateDagDefine(loginUser, taskRelationList, processDefinition, processDefinitionDeepCopy, taskDefinitionLogs, otherParamsJson); } /** * Task want to delete whether used in other task, should throw exception when have be used. * * This function avoid delete task already dependencies by other tasks by accident. * * @param processDefinition ProcessDefinition you change task definition and task relation * @param taskRelationList All the latest task relation list from process definition */ private void taskUsedInOtherTaskValid(ProcessDefinition processDefinition, List<ProcessTaskRelationLog> taskRelationList) { List<ProcessTaskRelation> oldProcessTaskRelationList = processTaskRelationMapper .queryByProcessCode(processDefinition.getProjectCode(), processDefinition.getCode()); Set<ProcessTaskRelationLog> oldProcessTaskRelationSet = oldProcessTaskRelationList.stream().map(ProcessTaskRelationLog::new).collect(Collectors.toSet()); StringBuilder sb = new StringBuilder(); for (ProcessTaskRelationLog oldProcessTaskRelation : oldProcessTaskRelationSet) { boolean oldTaskExists = taskRelationList.stream() .anyMatch(relation -> oldProcessTaskRelation.getPostTaskCode() == relation.getPostTaskCode()); if (!oldTaskExists) { Optional<String> taskDepMsg = workFlowLineageService.taskDepOnTaskMsg( processDefinition.getProjectCode(), oldProcessTaskRelation.getProcessDefinitionCode(), oldProcessTaskRelation.getPostTaskCode()); taskDepMsg.ifPresent(sb::append);
closed
apache/dolphinscheduler
https://github.com/apache/dolphinscheduler
12,391
[Improvement][API] Workflow definitions that contain logical task nodes support the copy function
### Search before asking - [X] I had searched in the [issues](https://github.com/apache/dolphinscheduler/issues?q=is%3Aissue) and found no similar feature requirement. ### Description Currently, the system does not support the replication function of workflow definition including `CONDITIONS`, `SWITCH`, `SUB_PROCESS`, `DEPENDENT` four task nodes. <img width="1472" alt="image" src="https://user-images.githubusercontent.com/37063904/196038586-7e802eeb-2063-468f-83ae-430201149712.png"> ### Are you willing to submit a 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/12391
https://github.com/apache/dolphinscheduler/pull/12392
b7bd8d780356e055998fd0047be7e2cfea85d59b
55004bebe032b7212892686d308adca2ac0e2723
2022-10-16T13:42:00Z
java
2022-10-17T02:28:58Z
dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/impl/ProcessDefinitionServiceImpl.java
} if (sb.length() != 0) { logger.error("Task cannot be deleted because it is dependent"); throw new ServiceException(sb.toString()); } } } protected Map<String, Object> updateDagDefine(User loginUser, List<ProcessTaskRelationLog> taskRelationList, ProcessDefinition processDefinition, ProcessDefinition processDefinitionDeepCopy, List<TaskDefinitionLog> taskDefinitionLogs, String otherParamsJson) { Map<String, Object> result = new HashMap<>(); int saveTaskResult = processService.saveTaskDefine(loginUser, processDefinition.getProjectCode(), taskDefinitionLogs, Boolean.TRUE); if (saveTaskResult == Constants.EXIT_CODE_SUCCESS) { logger.info("The task has not changed, so skip"); } if (saveTaskResult == Constants.DEFINITION_FAILURE) { logger.error("Update task definitions error, projectCode:{}, processCode:{}.", processDefinition.getProjectCode(), processDefinition.getCode()); putMsg(result, Status.UPDATE_TASK_DEFINITION_ERROR); throw new ServiceException(Status.UPDATE_TASK_DEFINITION_ERROR); } boolean isChange = false; if (processDefinition.equals(processDefinitionDeepCopy) && saveTaskResult == Constants.EXIT_CODE_SUCCESS) { List<ProcessTaskRelationLog> processTaskRelationLogList = processTaskRelationLogMapper .queryByProcessCodeAndVersion(processDefinition.getCode(), processDefinition.getVersion()); if (taskRelationList.size() == processTaskRelationLogList.size()) {
closed
apache/dolphinscheduler
https://github.com/apache/dolphinscheduler
12,391
[Improvement][API] Workflow definitions that contain logical task nodes support the copy function
### Search before asking - [X] I had searched in the [issues](https://github.com/apache/dolphinscheduler/issues?q=is%3Aissue) and found no similar feature requirement. ### Description Currently, the system does not support the replication function of workflow definition including `CONDITIONS`, `SWITCH`, `SUB_PROCESS`, `DEPENDENT` four task nodes. <img width="1472" alt="image" src="https://user-images.githubusercontent.com/37063904/196038586-7e802eeb-2063-468f-83ae-430201149712.png"> ### Are you willing to submit a 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/12391
https://github.com/apache/dolphinscheduler/pull/12392
b7bd8d780356e055998fd0047be7e2cfea85d59b
55004bebe032b7212892686d308adca2ac0e2723
2022-10-16T13:42:00Z
java
2022-10-17T02:28:58Z
dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/impl/ProcessDefinitionServiceImpl.java
Set<ProcessTaskRelationLog> taskRelationSet = new HashSet<>(taskRelationList); Set<ProcessTaskRelationLog> processTaskRelationLogSet = new HashSet<>(processTaskRelationLogList); if (taskRelationSet.size() == processTaskRelationLogSet.size()) { taskRelationSet.removeAll(processTaskRelationLogSet); if (!taskRelationSet.isEmpty()) { isChange = true; } } else { isChange = true; } } else { isChange = true; } } else { isChange = true; } if (isChange) { logger.info("Process definition needs to be updated, projectCode:{}, processCode:{}, processVersion:{}.", processDefinition.getProjectCode(), processDefinition.getCode(), processDefinition.getVersion()); processDefinition.setUpdateTime(new Date()); int insertVersion = processService.saveProcessDefine(loginUser, processDefinition, Boolean.TRUE, Boolean.TRUE); if (insertVersion <= 0) { logger.error("Update process definition error, processCode:{}.", processDefinition.getCode()); putMsg(result, Status.UPDATE_PROCESS_DEFINITION_ERROR); throw new ServiceException(Status.UPDATE_PROCESS_DEFINITION_ERROR); } else logger.info("Update process definition complete, processCode:{}, processVersion:{}.", processDefinition.getCode(), insertVersion); taskUsedInOtherTaskValid(processDefinition, taskRelationList);
closed
apache/dolphinscheduler
https://github.com/apache/dolphinscheduler
12,391
[Improvement][API] Workflow definitions that contain logical task nodes support the copy function
### Search before asking - [X] I had searched in the [issues](https://github.com/apache/dolphinscheduler/issues?q=is%3Aissue) and found no similar feature requirement. ### Description Currently, the system does not support the replication function of workflow definition including `CONDITIONS`, `SWITCH`, `SUB_PROCESS`, `DEPENDENT` four task nodes. <img width="1472" alt="image" src="https://user-images.githubusercontent.com/37063904/196038586-7e802eeb-2063-468f-83ae-430201149712.png"> ### Are you willing to submit a 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/12391
https://github.com/apache/dolphinscheduler/pull/12392
b7bd8d780356e055998fd0047be7e2cfea85d59b
55004bebe032b7212892686d308adca2ac0e2723
2022-10-16T13:42:00Z
java
2022-10-17T02:28:58Z
dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/impl/ProcessDefinitionServiceImpl.java
int insertResult = processService.saveTaskRelation(loginUser, processDefinition.getProjectCode(), processDefinition.getCode(), insertVersion, taskRelationList, taskDefinitionLogs, Boolean.TRUE); if (insertResult == Constants.EXIT_CODE_SUCCESS) { logger.info( "Update process task relations complete, projectCode:{}, processCode:{}, processVersion:{}.", processDefinition.getProjectCode(), processDefinition.getCode(), insertVersion); putMsg(result, Status.SUCCESS); result.put(Constants.DATA_LIST, processDefinition); } else { logger.error("Update process task relations error, projectCode:{}, processCode:{}, processVersion:{}.", processDefinition.getProjectCode(), processDefinition.getCode(), insertVersion); putMsg(result, Status.UPDATE_PROCESS_DEFINITION_ERROR); throw new ServiceException(Status.UPDATE_PROCESS_DEFINITION_ERROR); } saveOtherRelation(loginUser, processDefinition, result, otherParamsJson); } else { logger.info( "Process definition does not need to be updated because there is no change, projectCode:{}, processCode:{}, processVersion:{}.", processDefinition.getProjectCode(), processDefinition.getCode(), processDefinition.getVersion()); putMsg(result, Status.SUCCESS); result.put(Constants.DATA_LIST, processDefinition); } return result; } /** * verify process definition name unique * * @param loginUser login user * @param projectCode project code * @param name name
closed
apache/dolphinscheduler
https://github.com/apache/dolphinscheduler
12,391
[Improvement][API] Workflow definitions that contain logical task nodes support the copy function
### Search before asking - [X] I had searched in the [issues](https://github.com/apache/dolphinscheduler/issues?q=is%3Aissue) and found no similar feature requirement. ### Description Currently, the system does not support the replication function of workflow definition including `CONDITIONS`, `SWITCH`, `SUB_PROCESS`, `DEPENDENT` four task nodes. <img width="1472" alt="image" src="https://user-images.githubusercontent.com/37063904/196038586-7e802eeb-2063-468f-83ae-430201149712.png"> ### Are you willing to submit a 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/12391
https://github.com/apache/dolphinscheduler/pull/12392
b7bd8d780356e055998fd0047be7e2cfea85d59b
55004bebe032b7212892686d308adca2ac0e2723
2022-10-16T13:42:00Z
java
2022-10-17T02:28:58Z
dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/impl/ProcessDefinitionServiceImpl.java
* @return true if process definition name not exists, otherwise false */ @Override public Map<String, Object> verifyProcessDefinitionName(User loginUser, long projectCode, String name, long processDefinitionCode) { Project project = projectMapper.queryByCode(projectCode); Map<String, Object> result = projectService.checkProjectAndAuth(loginUser, project, projectCode, WORKFLOW_CREATE); if (result.get(Constants.STATUS) != Status.SUCCESS) { return result; } ProcessDefinition processDefinition = processDefinitionMapper.verifyByDefineName(project.getCode(), name.trim()); if (processDefinition == null) { putMsg(result, Status.SUCCESS); return result; } if (processDefinitionCode != 0 && processDefinitionCode == processDefinition.getCode()) { putMsg(result, Status.SUCCESS); return result; } logger.warn("Process definition with the same name {} already exists, processDefinitionCode:{}.", processDefinition.getName(), processDefinition.getCode()); putMsg(result, Status.PROCESS_DEFINITION_NAME_EXIST, name.trim()); return result; } @Override @Transactional public Map<String, Object> batchDeleteProcessDefinitionByCodes(User loginUser, long projectCode, String codes) {
closed
apache/dolphinscheduler
https://github.com/apache/dolphinscheduler
12,391
[Improvement][API] Workflow definitions that contain logical task nodes support the copy function
### Search before asking - [X] I had searched in the [issues](https://github.com/apache/dolphinscheduler/issues?q=is%3Aissue) and found no similar feature requirement. ### Description Currently, the system does not support the replication function of workflow definition including `CONDITIONS`, `SWITCH`, `SUB_PROCESS`, `DEPENDENT` four task nodes. <img width="1472" alt="image" src="https://user-images.githubusercontent.com/37063904/196038586-7e802eeb-2063-468f-83ae-430201149712.png"> ### Are you willing to submit a 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/12391
https://github.com/apache/dolphinscheduler/pull/12392
b7bd8d780356e055998fd0047be7e2cfea85d59b
55004bebe032b7212892686d308adca2ac0e2723
2022-10-16T13:42:00Z
java
2022-10-17T02:28:58Z
dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/impl/ProcessDefinitionServiceImpl.java
Map<String, Object> result = new HashMap<>(); if (StringUtils.isEmpty(codes)) { logger.error("Parameter processDefinitionCodes is empty, projectCode is {}.", projectCode); putMsg(result, Status.PROCESS_DEFINITION_CODES_IS_EMPTY); return result; } Set<Long> definitionCodes = Lists.newArrayList(codes.split(Constants.COMMA)).stream().map(Long::parseLong) .collect(Collectors.toSet()); List<ProcessDefinition> processDefinitionList = processDefinitionMapper.queryByCodes(definitionCodes); Set<Long> queryCodes = processDefinitionList.stream().map(ProcessDefinition::getCode).collect(Collectors.toSet()); Set<Long> diffCode = definitionCodes.stream().filter(code -> !queryCodes.contains(code)).collect(Collectors.toSet()); if (!diffCode.isEmpty()) { logger.error("Process definition does not exist, processCodes:{}.", diffCode.stream().map(String::valueOf).collect(Collectors.joining(Constants.COMMA))); throw new ServiceException(Status.BATCH_DELETE_PROCESS_DEFINE_BY_CODES_ERROR, diffCode.stream().map(code -> code + "[process definition not exist]") .collect(Collectors.joining(Constants.COMMA)) ); } for (ProcessDefinition process : processDefinitionList) { try { this.deleteProcessDefinitionByCode(loginUser, process.getCode()); } catch (Exception e) { throw new ServiceException(Status.DELETE_PROCESS_DEFINE_ERROR, process.getName(), e.getMessage()); } } putMsg(result, Status.SUCCESS);
closed
apache/dolphinscheduler
https://github.com/apache/dolphinscheduler
12,391
[Improvement][API] Workflow definitions that contain logical task nodes support the copy function
### Search before asking - [X] I had searched in the [issues](https://github.com/apache/dolphinscheduler/issues?q=is%3Aissue) and found no similar feature requirement. ### Description Currently, the system does not support the replication function of workflow definition including `CONDITIONS`, `SWITCH`, `SUB_PROCESS`, `DEPENDENT` four task nodes. <img width="1472" alt="image" src="https://user-images.githubusercontent.com/37063904/196038586-7e802eeb-2063-468f-83ae-430201149712.png"> ### Are you willing to submit a 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/12391
https://github.com/apache/dolphinscheduler/pull/12392
b7bd8d780356e055998fd0047be7e2cfea85d59b
55004bebe032b7212892686d308adca2ac0e2723
2022-10-16T13:42:00Z
java
2022-10-17T02:28:58Z
dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/impl/ProcessDefinitionServiceImpl.java
return result; } /** * Process definition want to delete whether used in other task, should throw exception when have be used. * * This function avoid delete process definition already dependencies by other tasks by accident. * * @param processDefinition ProcessDefinition you change task definition and task relation */ private void processDefinitionUsedInOtherTaskValid(ProcessDefinition processDefinition) { if (processDefinition.getReleaseState() == ReleaseState.ONLINE) { throw new ServiceException(Status.PROCESS_DEFINE_STATE_ONLINE, processDefinition.getName()); } List<ProcessInstance> processInstances = processInstanceService .queryByProcessDefineCodeAndStatus(processDefinition.getCode(), org.apache.dolphinscheduler.service.utils.Constants.NOT_TERMINATED_STATES); if (CollectionUtils.isNotEmpty(processInstances)) { throw new ServiceException(Status.DELETE_PROCESS_DEFINITION_EXECUTING_FAIL, processInstances.size()); } Set<TaskMainInfo> taskDepOnProcess = workFlowLineageService .queryTaskDepOnProcess(processDefinition.getProjectCode(), processDefinition.getCode()); if (CollectionUtils.isNotEmpty(taskDepOnProcess)) { String taskDepDetail = taskDepOnProcess.stream() .map(task -> String.format(Constants.FORMAT_S_S_COLON, task.getProcessDefinitionName(), task.getTaskName())) .collect(Collectors.joining(Constants.COMMA)); throw new ServiceException(Status.DELETE_PROCESS_DEFINITION_USE_BY_OTHER_FAIL, taskDepDetail); }
closed
apache/dolphinscheduler
https://github.com/apache/dolphinscheduler
12,391
[Improvement][API] Workflow definitions that contain logical task nodes support the copy function
### Search before asking - [X] I had searched in the [issues](https://github.com/apache/dolphinscheduler/issues?q=is%3Aissue) and found no similar feature requirement. ### Description Currently, the system does not support the replication function of workflow definition including `CONDITIONS`, `SWITCH`, `SUB_PROCESS`, `DEPENDENT` four task nodes. <img width="1472" alt="image" src="https://user-images.githubusercontent.com/37063904/196038586-7e802eeb-2063-468f-83ae-430201149712.png"> ### Are you willing to submit a 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/12391
https://github.com/apache/dolphinscheduler/pull/12392
b7bd8d780356e055998fd0047be7e2cfea85d59b
55004bebe032b7212892686d308adca2ac0e2723
2022-10-16T13:42:00Z
java
2022-10-17T02:28:58Z
dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/impl/ProcessDefinitionServiceImpl.java
} /** * delete process definition by code * * @param loginUser login user * @param code process definition code */ @Override @Transactional public void deleteProcessDefinitionByCode(User loginUser, long code) { ProcessDefinition processDefinition = processDefinitionMapper.queryByCode(code); if (processDefinition == null) { throw new ServiceException(Status.PROCESS_DEFINE_NOT_EXIST, String.valueOf(code)); } Project project = projectMapper.queryByCode(processDefinition.getProjectCode()); projectService.checkProjectAndAuthThrowException(loginUser, project, WORKFLOW_DEFINITION_DELETE); if (loginUser.getId() != processDefinition.getUserId() && loginUser.getUserType() != UserType.ADMIN_USER) { throw new ServiceException(Status.USER_NO_OPERATION_PERM); } processDefinitionUsedInOtherTaskValid(processDefinition); Schedule scheduleObj = scheduleMapper.queryByProcessDefinitionCode(code); if (scheduleObj != null) { if (scheduleObj.getReleaseState() == ReleaseState.OFFLINE) { int delete = scheduleMapper.deleteById(scheduleObj.getId()); if (delete == 0) { throw new ServiceException(Status.DELETE_SCHEDULE_BY_ID_ERROR); }
closed
apache/dolphinscheduler
https://github.com/apache/dolphinscheduler
12,391
[Improvement][API] Workflow definitions that contain logical task nodes support the copy function
### Search before asking - [X] I had searched in the [issues](https://github.com/apache/dolphinscheduler/issues?q=is%3Aissue) and found no similar feature requirement. ### Description Currently, the system does not support the replication function of workflow definition including `CONDITIONS`, `SWITCH`, `SUB_PROCESS`, `DEPENDENT` four task nodes. <img width="1472" alt="image" src="https://user-images.githubusercontent.com/37063904/196038586-7e802eeb-2063-468f-83ae-430201149712.png"> ### Are you willing to submit a 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/12391
https://github.com/apache/dolphinscheduler/pull/12392
b7bd8d780356e055998fd0047be7e2cfea85d59b
55004bebe032b7212892686d308adca2ac0e2723
2022-10-16T13:42:00Z
java
2022-10-17T02:28:58Z
dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/impl/ProcessDefinitionServiceImpl.java
} if (scheduleObj.getReleaseState() == ReleaseState.ONLINE) { throw new ServiceException(Status.SCHEDULE_STATE_ONLINE, scheduleObj.getId()); } } int delete = processDefinitionMapper.deleteById(processDefinition.getId()); if (delete == 0) { logger.error("Delete process definition error, processDefinitionCode:{}.", code); throw new ServiceException(Status.DELETE_PROCESS_DEFINE_BY_CODE_ERROR); } int deleteRelation = processTaskRelationMapper.deleteByCode(project.getCode(), processDefinition.getCode()); if (deleteRelation == 0) { logger.warn( "The process definition has not relation, it will be delete successfully, processDefinitionCode:{}.", code); } deleteOtherRelation(project, new HashMap<>(), processDefinition); } /** * release process definition: online / offline * * @param loginUser login user * @param projectCode project code * @param code process definition code * @param releaseState release state * @return release result code */ @Override @Transactional public Map<String, Object> releaseProcessDefinition(User loginUser, long projectCode, long code,
closed
apache/dolphinscheduler
https://github.com/apache/dolphinscheduler
12,391
[Improvement][API] Workflow definitions that contain logical task nodes support the copy function
### Search before asking - [X] I had searched in the [issues](https://github.com/apache/dolphinscheduler/issues?q=is%3Aissue) and found no similar feature requirement. ### Description Currently, the system does not support the replication function of workflow definition including `CONDITIONS`, `SWITCH`, `SUB_PROCESS`, `DEPENDENT` four task nodes. <img width="1472" alt="image" src="https://user-images.githubusercontent.com/37063904/196038586-7e802eeb-2063-468f-83ae-430201149712.png"> ### Are you willing to submit a 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/12391
https://github.com/apache/dolphinscheduler/pull/12392
b7bd8d780356e055998fd0047be7e2cfea85d59b
55004bebe032b7212892686d308adca2ac0e2723
2022-10-16T13:42:00Z
java
2022-10-17T02:28:58Z
dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/impl/ProcessDefinitionServiceImpl.java
ReleaseState releaseState) { Project project = projectMapper.queryByCode(projectCode); Map<String, Object> result = projectService.checkProjectAndAuth(loginUser, project, projectCode, WORKFLOW_ONLINE_OFFLINE); if (result.get(Constants.STATUS) != Status.SUCCESS) { return result; } if (null == releaseState) { putMsg(result, Status.REQUEST_PARAMS_NOT_VALID_ERROR, RELEASESTATE); return result; } ProcessDefinition processDefinition = processDefinitionMapper.queryByCode(code); if (processDefinition == null || projectCode != processDefinition.getProjectCode()) { logger.error("Process definition does not exist, processDefinitionCode:{}.", code); putMsg(result, Status.PROCESS_DEFINE_NOT_EXIST, String.valueOf(code)); return result; } switch (releaseState) { case ONLINE: List<ProcessTaskRelation> relationList = processService.findRelationByCode(code, processDefinition.getVersion()); if (CollectionUtils.isEmpty(relationList)) { logger.warn("Process definition has no task relation, processDefinitionCode:{}.", code); putMsg(result, Status.PROCESS_DAG_IS_EMPTY); return result; } processDefinition.setReleaseState(releaseState); processDefinitionMapper.updateById(processDefinition);
closed
apache/dolphinscheduler
https://github.com/apache/dolphinscheduler
12,391
[Improvement][API] Workflow definitions that contain logical task nodes support the copy function
### Search before asking - [X] I had searched in the [issues](https://github.com/apache/dolphinscheduler/issues?q=is%3Aissue) and found no similar feature requirement. ### Description Currently, the system does not support the replication function of workflow definition including `CONDITIONS`, `SWITCH`, `SUB_PROCESS`, `DEPENDENT` four task nodes. <img width="1472" alt="image" src="https://user-images.githubusercontent.com/37063904/196038586-7e802eeb-2063-468f-83ae-430201149712.png"> ### Are you willing to submit a 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/12391
https://github.com/apache/dolphinscheduler/pull/12392
b7bd8d780356e055998fd0047be7e2cfea85d59b
55004bebe032b7212892686d308adca2ac0e2723
2022-10-16T13:42:00Z
java
2022-10-17T02:28:58Z
dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/impl/ProcessDefinitionServiceImpl.java
logger.info("Set process definition online, projectCode:{}, processDefinitionCode:{}.", projectCode, code); break; case OFFLINE: processDefinition.setReleaseState(releaseState); int updateProcess = processDefinitionMapper.updateById(processDefinition); Schedule schedule = scheduleMapper.queryByProcessDefinitionCode(code); if (updateProcess > 0) { logger.info("Set process definition offline, projectCode:{}, processDefinitionCode:{}.", projectCode, code); if (schedule != null) { schedule.setReleaseState(releaseState); int updateSchedule = scheduleMapper.updateById(schedule); if (updateSchedule == 0) { logger.error( "Set schedule offline error, projectCode:{}, processDefinitionCode:{}, scheduleId:{}", projectCode, code, schedule.getId()); putMsg(result, Status.OFFLINE_SCHEDULE_ERROR); throw new ServiceException(Status.OFFLINE_SCHEDULE_ERROR); } else logger.info("Set schedule offline, projectCode:{}, processDefinitionCode:{}, scheduleId:{}", projectCode, code, schedule.getId()); schedulerService.deleteSchedule(project.getId(), schedule.getId()); } } break; default: putMsg(result, Status.REQUEST_PARAMS_NOT_VALID_ERROR, RELEASESTATE); return result;
closed
apache/dolphinscheduler
https://github.com/apache/dolphinscheduler
12,391
[Improvement][API] Workflow definitions that contain logical task nodes support the copy function
### Search before asking - [X] I had searched in the [issues](https://github.com/apache/dolphinscheduler/issues?q=is%3Aissue) and found no similar feature requirement. ### Description Currently, the system does not support the replication function of workflow definition including `CONDITIONS`, `SWITCH`, `SUB_PROCESS`, `DEPENDENT` four task nodes. <img width="1472" alt="image" src="https://user-images.githubusercontent.com/37063904/196038586-7e802eeb-2063-468f-83ae-430201149712.png"> ### Are you willing to submit a 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/12391
https://github.com/apache/dolphinscheduler/pull/12392
b7bd8d780356e055998fd0047be7e2cfea85d59b
55004bebe032b7212892686d308adca2ac0e2723
2022-10-16T13:42:00Z
java
2022-10-17T02:28:58Z
dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/impl/ProcessDefinitionServiceImpl.java
} putMsg(result, Status.SUCCESS); return result; } /** * batch export process definition by codes */ @Override public void batchExportProcessDefinitionByCodes(User loginUser, long projectCode, String codes, HttpServletResponse response) { if (StringUtils.isEmpty(codes)) { logger.warn("Process definition codes to be exported is empty."); return; } Project project = projectMapper.queryByCode(projectCode); Map<String, Object> result = projectService.checkProjectAndAuth(loginUser, project, projectCode, WORKFLOW_DEFINITION_EXPORT); if (result.get(Constants.STATUS) != Status.SUCCESS) { return; } Set<Long> defineCodeSet = Lists.newArrayList(codes.split(Constants.COMMA)).stream().map(Long::parseLong) .collect(Collectors.toSet()); List<ProcessDefinition> processDefinitionList = processDefinitionMapper.queryByCodes(defineCodeSet); if (CollectionUtils.isEmpty(processDefinitionList)) { logger.error("Process definitions to be exported do not exist, processDefinitionCodes:{}.", defineCodeSet); return; } List<ProcessDefinition> processDefinitionListInProject = processDefinitionList.stream()
closed
apache/dolphinscheduler
https://github.com/apache/dolphinscheduler
12,391
[Improvement][API] Workflow definitions that contain logical task nodes support the copy function
### Search before asking - [X] I had searched in the [issues](https://github.com/apache/dolphinscheduler/issues?q=is%3Aissue) and found no similar feature requirement. ### Description Currently, the system does not support the replication function of workflow definition including `CONDITIONS`, `SWITCH`, `SUB_PROCESS`, `DEPENDENT` four task nodes. <img width="1472" alt="image" src="https://user-images.githubusercontent.com/37063904/196038586-7e802eeb-2063-468f-83ae-430201149712.png"> ### Are you willing to submit a 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/12391
https://github.com/apache/dolphinscheduler/pull/12392
b7bd8d780356e055998fd0047be7e2cfea85d59b
55004bebe032b7212892686d308adca2ac0e2723
2022-10-16T13:42:00Z
java
2022-10-17T02:28:58Z
dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/impl/ProcessDefinitionServiceImpl.java
.filter(o -> projectCode == o.getProjectCode()).collect(Collectors.toList()); List<DagDataSchedule> dagDataSchedules = processDefinitionListInProject.stream().map(this::exportProcessDagData).collect(Collectors.toList()); if (CollectionUtils.isNotEmpty(dagDataSchedules)) { logger.info("Start download process definition file, processDefinitionCodes:{}.", defineCodeSet); downloadProcessDefinitionFile(response, dagDataSchedules); } else logger.error("There is no exported process dag data."); } /** * download the process definition file */ protected void downloadProcessDefinitionFile(HttpServletResponse response, List<DagDataSchedule> dagDataSchedules) { response.setContentType(MediaType.APPLICATION_JSON_UTF8_VALUE); BufferedOutputStream buff = null; ServletOutputStream out = null; try { out = response.getOutputStream(); buff = new BufferedOutputStream(out); buff.write(JSONUtils.toJsonString(dagDataSchedules).getBytes(StandardCharsets.UTF_8)); buff.flush(); buff.close(); } catch (IOException e) { logger.warn("Export process definition fail", e); } finally { if (null != buff) { try { buff.close(); } catch (Exception e) { logger.warn("Buffer does not close", e);
closed
apache/dolphinscheduler
https://github.com/apache/dolphinscheduler
12,391
[Improvement][API] Workflow definitions that contain logical task nodes support the copy function
### Search before asking - [X] I had searched in the [issues](https://github.com/apache/dolphinscheduler/issues?q=is%3Aissue) and found no similar feature requirement. ### Description Currently, the system does not support the replication function of workflow definition including `CONDITIONS`, `SWITCH`, `SUB_PROCESS`, `DEPENDENT` four task nodes. <img width="1472" alt="image" src="https://user-images.githubusercontent.com/37063904/196038586-7e802eeb-2063-468f-83ae-430201149712.png"> ### Are you willing to submit a 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/12391
https://github.com/apache/dolphinscheduler/pull/12392
b7bd8d780356e055998fd0047be7e2cfea85d59b
55004bebe032b7212892686d308adca2ac0e2723
2022-10-16T13:42:00Z
java
2022-10-17T02:28:58Z
dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/impl/ProcessDefinitionServiceImpl.java
} } if (null != out) { try { out.close(); } catch (Exception e) { logger.warn("Output stream does not close", e); } } } } /** * get export process dag data * * @param processDefinition process definition * @return DagDataSchedule */ public DagDataSchedule exportProcessDagData(ProcessDefinition processDefinition) { Schedule scheduleObj = scheduleMapper.queryByProcessDefinitionCode(processDefinition.getCode()); DagDataSchedule dagDataSchedule = new DagDataSchedule(processService.genDagData(processDefinition)); if (scheduleObj != null) { scheduleObj.setReleaseState(ReleaseState.OFFLINE); dagDataSchedule.setSchedule(scheduleObj); } return dagDataSchedule; } /** * import process definition * * @param loginUser login user
closed
apache/dolphinscheduler
https://github.com/apache/dolphinscheduler
12,391
[Improvement][API] Workflow definitions that contain logical task nodes support the copy function
### Search before asking - [X] I had searched in the [issues](https://github.com/apache/dolphinscheduler/issues?q=is%3Aissue) and found no similar feature requirement. ### Description Currently, the system does not support the replication function of workflow definition including `CONDITIONS`, `SWITCH`, `SUB_PROCESS`, `DEPENDENT` four task nodes. <img width="1472" alt="image" src="https://user-images.githubusercontent.com/37063904/196038586-7e802eeb-2063-468f-83ae-430201149712.png"> ### Are you willing to submit a 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/12391
https://github.com/apache/dolphinscheduler/pull/12392
b7bd8d780356e055998fd0047be7e2cfea85d59b
55004bebe032b7212892686d308adca2ac0e2723
2022-10-16T13:42:00Z
java
2022-10-17T02:28:58Z
dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/impl/ProcessDefinitionServiceImpl.java
* @param projectCode project code * @param file process metadata json file * @return import process */ @Override @Transactional public Map<String, Object> importProcessDefinition(User loginUser, long projectCode, MultipartFile file) { Map<String, Object> result; String dagDataScheduleJson = FileUtils.file2String(file); List<DagDataSchedule> dagDataScheduleList = JSONUtils.toList(dagDataScheduleJson, DagDataSchedule.class); Project project = projectMapper.queryByCode(projectCode); result = projectService.checkProjectAndAuth(loginUser, project, projectCode, WORKFLOW_EXPORT); if (result.get(Constants.STATUS) != Status.SUCCESS) { return result; } if (CollectionUtils.isEmpty(dagDataScheduleList)) { logger.warn("Process definition file content is empty."); putMsg(result, Status.DATA_IS_NULL, "fileContent"); return result; } for (DagDataSchedule dagDataSchedule : dagDataScheduleList) { if (!checkAndImport(loginUser, projectCode, result, dagDataSchedule, EMPTY_STRING)) { return result; } } return result; } @Override @Transactional
closed
apache/dolphinscheduler
https://github.com/apache/dolphinscheduler
12,391
[Improvement][API] Workflow definitions that contain logical task nodes support the copy function
### Search before asking - [X] I had searched in the [issues](https://github.com/apache/dolphinscheduler/issues?q=is%3Aissue) and found no similar feature requirement. ### Description Currently, the system does not support the replication function of workflow definition including `CONDITIONS`, `SWITCH`, `SUB_PROCESS`, `DEPENDENT` four task nodes. <img width="1472" alt="image" src="https://user-images.githubusercontent.com/37063904/196038586-7e802eeb-2063-468f-83ae-430201149712.png"> ### Are you willing to submit a 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/12391
https://github.com/apache/dolphinscheduler/pull/12392
b7bd8d780356e055998fd0047be7e2cfea85d59b
55004bebe032b7212892686d308adca2ac0e2723
2022-10-16T13:42:00Z
java
2022-10-17T02:28:58Z
dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/impl/ProcessDefinitionServiceImpl.java
public Map<String, Object> importSqlProcessDefinition(User loginUser, long projectCode, MultipartFile file) { Map<String, Object> result; Project project = projectMapper.queryByCode(projectCode); result = projectService.checkProjectAndAuth(loginUser, project, projectCode, WORKFLOW_IMPORT); if (result.get(Constants.STATUS) != Status.SUCCESS) { return result; } String processDefinitionName = file.getOriginalFilename() == null ? file.getName() : file.getOriginalFilename(); int index = processDefinitionName.lastIndexOf("."); if (index > 0) { processDefinitionName = processDefinitionName.substring(0, index); } processDefinitionName = getNewName(processDefinitionName, IMPORT_SUFFIX); ProcessDefinition processDefinition; List<TaskDefinitionLog> taskDefinitionList = new ArrayList<>(); List<ProcessTaskRelationLog> processTaskRelationList = new ArrayList<>(); final int THRESHOLD_ENTRIES = 10000; final int THRESHOLD_SIZE = 1000000000; final double THRESHOLD_RATIO = 10; int totalEntryArchive = 0; int totalSizeEntry = 0; Map<String, DataSource> dataSourceCache = new HashMap<>(1); Map<String, Long> taskNameToCode = new HashMap<>(16); Map<String, List<String>> taskNameToUpstream = new HashMap<>(16); try ( ZipInputStream zIn = new ZipInputStream(file.getInputStream()); BufferedReader bufferedReader = new BufferedReader(new InputStreamReader(zIn))) {
closed
apache/dolphinscheduler
https://github.com/apache/dolphinscheduler
12,391
[Improvement][API] Workflow definitions that contain logical task nodes support the copy function
### Search before asking - [X] I had searched in the [issues](https://github.com/apache/dolphinscheduler/issues?q=is%3Aissue) and found no similar feature requirement. ### Description Currently, the system does not support the replication function of workflow definition including `CONDITIONS`, `SWITCH`, `SUB_PROCESS`, `DEPENDENT` four task nodes. <img width="1472" alt="image" src="https://user-images.githubusercontent.com/37063904/196038586-7e802eeb-2063-468f-83ae-430201149712.png"> ### Are you willing to submit a 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/12391
https://github.com/apache/dolphinscheduler/pull/12392
b7bd8d780356e055998fd0047be7e2cfea85d59b
55004bebe032b7212892686d308adca2ac0e2723
2022-10-16T13:42:00Z
java
2022-10-17T02:28:58Z
dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/impl/ProcessDefinitionServiceImpl.java
processDefinition = new ProcessDefinition(projectCode, processDefinitionName, CodeGenerateUtils.getInstance().genCode(), "", "[]", null, 0, loginUser.getId(), loginUser.getTenantId()); ZipEntry entry; while ((entry = zIn.getNextEntry()) != null) { totalEntryArchive++; int totalSizeArchive = 0; if (!entry.isDirectory()) { StringBuilder sql = new StringBuilder(); String taskName = null; String datasourceName = null; List<String> upstreams = Collections.emptyList(); String line; while ((line = bufferedReader.readLine()) != null) { int nBytes = line.getBytes(StandardCharsets.UTF_8).length; totalSizeEntry += nBytes; totalSizeArchive += nBytes; long compressionRatio = totalSizeEntry / entry.getCompressedSize(); if (compressionRatio > THRESHOLD_RATIO) { throw new IllegalStateException( "Ratio between compressed and uncompressed data is highly suspicious, looks like a Zip Bomb Attack."); } int commentIndex = line.indexOf("-- "); if (commentIndex >= 0) { int colonIndex = line.indexOf(":", commentIndex); if (colonIndex > 0) { String key = line.substring(commentIndex + 3, colonIndex).trim().toLowerCase();
closed
apache/dolphinscheduler
https://github.com/apache/dolphinscheduler
12,391
[Improvement][API] Workflow definitions that contain logical task nodes support the copy function
### Search before asking - [X] I had searched in the [issues](https://github.com/apache/dolphinscheduler/issues?q=is%3Aissue) and found no similar feature requirement. ### Description Currently, the system does not support the replication function of workflow definition including `CONDITIONS`, `SWITCH`, `SUB_PROCESS`, `DEPENDENT` four task nodes. <img width="1472" alt="image" src="https://user-images.githubusercontent.com/37063904/196038586-7e802eeb-2063-468f-83ae-430201149712.png"> ### Are you willing to submit a 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/12391
https://github.com/apache/dolphinscheduler/pull/12392
b7bd8d780356e055998fd0047be7e2cfea85d59b
55004bebe032b7212892686d308adca2ac0e2723
2022-10-16T13:42:00Z
java
2022-10-17T02:28:58Z
dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/impl/ProcessDefinitionServiceImpl.java
String value = line.substring(colonIndex + 1).trim(); switch (key) { case "name": taskName = value; line = line.substring(0, commentIndex); break; case "upstream": upstreams = Arrays.stream(value.split(",")).map(String::trim) .filter(s -> !"".equals(s)).collect(Collectors.toList()); line = line.substring(0, commentIndex); break; case "datasource": datasourceName = value; line = line.substring(0, commentIndex); break; default: break; } } } if (!"".equals(line)) { sql.append(line).append("\n"); } } if (taskName == null) { taskName = entry.getName(); index = taskName.indexOf("/"); if (index > 0) { taskName = taskName.substring(index + 1);
closed
apache/dolphinscheduler
https://github.com/apache/dolphinscheduler
12,391
[Improvement][API] Workflow definitions that contain logical task nodes support the copy function
### Search before asking - [X] I had searched in the [issues](https://github.com/apache/dolphinscheduler/issues?q=is%3Aissue) and found no similar feature requirement. ### Description Currently, the system does not support the replication function of workflow definition including `CONDITIONS`, `SWITCH`, `SUB_PROCESS`, `DEPENDENT` four task nodes. <img width="1472" alt="image" src="https://user-images.githubusercontent.com/37063904/196038586-7e802eeb-2063-468f-83ae-430201149712.png"> ### Are you willing to submit a 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/12391
https://github.com/apache/dolphinscheduler/pull/12392
b7bd8d780356e055998fd0047be7e2cfea85d59b
55004bebe032b7212892686d308adca2ac0e2723
2022-10-16T13:42:00Z
java
2022-10-17T02:28:58Z
dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/impl/ProcessDefinitionServiceImpl.java
} index = taskName.lastIndexOf("."); if (index > 0) { taskName = taskName.substring(0, index); } } DataSource dataSource = dataSourceCache.get(datasourceName); if (dataSource == null) { dataSource = queryDatasourceByNameAndUser(datasourceName, loginUser); } if (dataSource == null) { logger.error("Datasource does not found, may be its name is illegal."); putMsg(result, Status.DATASOURCE_NAME_ILLEGAL); return result; } dataSourceCache.put(datasourceName, dataSource); TaskDefinitionLog taskDefinition = buildNormalSqlTaskDefinition(taskName, dataSource, sql.substring(0, sql.length() - 1)); taskDefinitionList.add(taskDefinition); taskNameToCode.put(taskDefinition.getName(), taskDefinition.getCode()); taskNameToUpstream.put(taskDefinition.getName(), upstreams); } if (totalSizeArchive > THRESHOLD_SIZE) { throw new IllegalStateException( "the uncompressed data size is too much for the application resource capacity"); } if (totalEntryArchive > THRESHOLD_ENTRIES) { throw new IllegalStateException( "too much entries in this archive, can lead to inodes exhaustion of the system"); }
closed
apache/dolphinscheduler
https://github.com/apache/dolphinscheduler
12,391
[Improvement][API] Workflow definitions that contain logical task nodes support the copy function
### Search before asking - [X] I had searched in the [issues](https://github.com/apache/dolphinscheduler/issues?q=is%3Aissue) and found no similar feature requirement. ### Description Currently, the system does not support the replication function of workflow definition including `CONDITIONS`, `SWITCH`, `SUB_PROCESS`, `DEPENDENT` four task nodes. <img width="1472" alt="image" src="https://user-images.githubusercontent.com/37063904/196038586-7e802eeb-2063-468f-83ae-430201149712.png"> ### Are you willing to submit a 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/12391
https://github.com/apache/dolphinscheduler/pull/12392
b7bd8d780356e055998fd0047be7e2cfea85d59b
55004bebe032b7212892686d308adca2ac0e2723
2022-10-16T13:42:00Z
java
2022-10-17T02:28:58Z
dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/impl/ProcessDefinitionServiceImpl.java
} } catch (Exception e) { logger.error("Import process definition error.", e); putMsg(result, Status.IMPORT_PROCESS_DEFINE_ERROR); return result; } for (Map.Entry<String, Long> entry : taskNameToCode.entrySet()) { List<String> upstreams = taskNameToUpstream.get(entry.getKey()); if (CollectionUtils.isEmpty(upstreams) || (upstreams.size() == 1 && upstreams.contains("root") && !taskNameToCode.containsKey("root"))) { ProcessTaskRelationLog processTaskRelation = buildNormalTaskRelation(0, entry.getValue()); processTaskRelationList.add(processTaskRelation); continue; } for (String upstream : upstreams) { ProcessTaskRelationLog processTaskRelation = buildNormalTaskRelation(taskNameToCode.get(upstream), entry.getValue()); processTaskRelationList.add(processTaskRelation); } } return createDagDefine(loginUser, processTaskRelationList, processDefinition, taskDefinitionList, EMPTY_STRING); } private ProcessTaskRelationLog buildNormalTaskRelation(long preTaskCode, long postTaskCode) { ProcessTaskRelationLog processTaskRelation = new ProcessTaskRelationLog(); processTaskRelation.setPreTaskCode(preTaskCode); processTaskRelation.setPreTaskVersion(0); processTaskRelation.setPostTaskCode(postTaskCode); processTaskRelation.setPostTaskVersion(0); processTaskRelation.setConditionType(ConditionType.NONE);
closed
apache/dolphinscheduler
https://github.com/apache/dolphinscheduler
12,391
[Improvement][API] Workflow definitions that contain logical task nodes support the copy function
### Search before asking - [X] I had searched in the [issues](https://github.com/apache/dolphinscheduler/issues?q=is%3Aissue) and found no similar feature requirement. ### Description Currently, the system does not support the replication function of workflow definition including `CONDITIONS`, `SWITCH`, `SUB_PROCESS`, `DEPENDENT` four task nodes. <img width="1472" alt="image" src="https://user-images.githubusercontent.com/37063904/196038586-7e802eeb-2063-468f-83ae-430201149712.png"> ### Are you willing to submit a 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/12391
https://github.com/apache/dolphinscheduler/pull/12392
b7bd8d780356e055998fd0047be7e2cfea85d59b
55004bebe032b7212892686d308adca2ac0e2723
2022-10-16T13:42:00Z
java
2022-10-17T02:28:58Z
dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/impl/ProcessDefinitionServiceImpl.java
processTaskRelation.setName(""); return processTaskRelation; } private DataSource queryDatasourceByNameAndUser(String datasourceName, User loginUser) { if (isAdmin(loginUser)) { List<DataSource> dataSources = dataSourceMapper.queryDataSourceByName(datasourceName); if (CollectionUtils.isNotEmpty(dataSources)) { return dataSources.get(0); } } else { return dataSourceMapper.queryDataSourceByNameAndUserId(loginUser.getId(), datasourceName); } return null; } private TaskDefinitionLog buildNormalSqlTaskDefinition(String taskName, DataSource dataSource, String sql) throws CodeGenerateException { TaskDefinitionLog taskDefinition = new TaskDefinitionLog(); taskDefinition.setName(taskName); taskDefinition.setFlag(Flag.YES); SqlParameters sqlParameters = new SqlParameters(); sqlParameters.setType(dataSource.getType().name()); sqlParameters.setDatasource(dataSource.getId()); sqlParameters.setSql(sql.substring(0, sql.length() - 1)); sqlParameters.setSqlType(SqlType.NON_QUERY.ordinal()); sqlParameters.setLocalParams(Collections.emptyList()); taskDefinition.setTaskParams(JSONUtils.toJsonString(sqlParameters)); taskDefinition.setCode(CodeGenerateUtils.getInstance().genCode()); taskDefinition.setTaskType(TASK_TYPE_SQL); taskDefinition.setFailRetryTimes(0);
closed
apache/dolphinscheduler
https://github.com/apache/dolphinscheduler
12,391
[Improvement][API] Workflow definitions that contain logical task nodes support the copy function
### Search before asking - [X] I had searched in the [issues](https://github.com/apache/dolphinscheduler/issues?q=is%3Aissue) and found no similar feature requirement. ### Description Currently, the system does not support the replication function of workflow definition including `CONDITIONS`, `SWITCH`, `SUB_PROCESS`, `DEPENDENT` four task nodes. <img width="1472" alt="image" src="https://user-images.githubusercontent.com/37063904/196038586-7e802eeb-2063-468f-83ae-430201149712.png"> ### Are you willing to submit a 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/12391
https://github.com/apache/dolphinscheduler/pull/12392
b7bd8d780356e055998fd0047be7e2cfea85d59b
55004bebe032b7212892686d308adca2ac0e2723
2022-10-16T13:42:00Z
java
2022-10-17T02:28:58Z
dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/impl/ProcessDefinitionServiceImpl.java
taskDefinition.setFailRetryInterval(0); taskDefinition.setTimeoutFlag(TimeoutFlag.CLOSE); taskDefinition.setWorkerGroup(DEFAULT_WORKER_GROUP); taskDefinition.setTaskPriority(Priority.MEDIUM); taskDefinition.setEnvironmentCode(-1); taskDefinition.setTimeout(0); taskDefinition.setDelayTime(0); taskDefinition.setTimeoutNotifyStrategy(TaskTimeoutStrategy.WARN); taskDefinition.setVersion(0); taskDefinition.setResourceIds(""); return taskDefinition; } /** * check and import */ protected boolean checkAndImport(User loginUser, long projectCode, Map<String, Object> result, DagDataSchedule dagDataSchedule, String otherParamsJson) { if (!checkImportanceParams(dagDataSchedule, result)) { return false; } ProcessDefinition processDefinition = dagDataSchedule.getProcessDefinition(); String processDefinitionName = recursionProcessDefinitionName(projectCode, processDefinition.getName(), 1); String importProcessDefinitionName = getNewName(processDefinitionName, IMPORT_SUFFIX); Map<String, Object> checkResult = verifyProcessDefinitionName(loginUser, projectCode, importProcessDefinitionName, 0); if (Status.SUCCESS.equals(checkResult.get(Constants.STATUS))) { putMsg(result, Status.SUCCESS); } else {
closed
apache/dolphinscheduler
https://github.com/apache/dolphinscheduler
12,391
[Improvement][API] Workflow definitions that contain logical task nodes support the copy function
### Search before asking - [X] I had searched in the [issues](https://github.com/apache/dolphinscheduler/issues?q=is%3Aissue) and found no similar feature requirement. ### Description Currently, the system does not support the replication function of workflow definition including `CONDITIONS`, `SWITCH`, `SUB_PROCESS`, `DEPENDENT` four task nodes. <img width="1472" alt="image" src="https://user-images.githubusercontent.com/37063904/196038586-7e802eeb-2063-468f-83ae-430201149712.png"> ### Are you willing to submit a 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/12391
https://github.com/apache/dolphinscheduler/pull/12392
b7bd8d780356e055998fd0047be7e2cfea85d59b
55004bebe032b7212892686d308adca2ac0e2723
2022-10-16T13:42:00Z
java
2022-10-17T02:28:58Z
dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/impl/ProcessDefinitionServiceImpl.java
result.putAll(checkResult); return false; } processDefinition.setName(importProcessDefinitionName); processDefinition.setId(null); processDefinition.setProjectCode(projectCode); processDefinition.setUserId(loginUser.getId()); try { processDefinition.setCode(CodeGenerateUtils.getInstance().genCode()); } catch (CodeGenerateException e) { logger.error( "Save process definition error because generate process definition code error, projectCode:{}.", projectCode, e); putMsg(result, Status.CREATE_PROCESS_DEFINITION_ERROR); return false; } List<TaskDefinition> taskDefinitionList = dagDataSchedule.getTaskDefinitionList(); Map<Long, Long> taskCodeMap = new HashMap<>(); Date now = new Date(); List<TaskDefinitionLog> taskDefinitionLogList = new ArrayList<>(); for (TaskDefinition taskDefinition : taskDefinitionList) { TaskDefinitionLog taskDefinitionLog = new TaskDefinitionLog(taskDefinition); taskDefinitionLog.setName(taskDefinitionLog.getName()); taskDefinitionLog.setProjectCode(projectCode); taskDefinitionLog.setUserId(loginUser.getId()); taskDefinitionLog.setVersion(Constants.VERSION_FIRST); taskDefinitionLog.setCreateTime(now); taskDefinitionLog.setUpdateTime(now); taskDefinitionLog.setOperator(loginUser.getId()); taskDefinitionLog.setOperateTime(now);
closed
apache/dolphinscheduler
https://github.com/apache/dolphinscheduler
12,391
[Improvement][API] Workflow definitions that contain logical task nodes support the copy function
### Search before asking - [X] I had searched in the [issues](https://github.com/apache/dolphinscheduler/issues?q=is%3Aissue) and found no similar feature requirement. ### Description Currently, the system does not support the replication function of workflow definition including `CONDITIONS`, `SWITCH`, `SUB_PROCESS`, `DEPENDENT` four task nodes. <img width="1472" alt="image" src="https://user-images.githubusercontent.com/37063904/196038586-7e802eeb-2063-468f-83ae-430201149712.png"> ### Are you willing to submit a 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/12391
https://github.com/apache/dolphinscheduler/pull/12392
b7bd8d780356e055998fd0047be7e2cfea85d59b
55004bebe032b7212892686d308adca2ac0e2723
2022-10-16T13:42:00Z
java
2022-10-17T02:28:58Z
dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/impl/ProcessDefinitionServiceImpl.java
try { long code = CodeGenerateUtils.getInstance().genCode(); taskCodeMap.put(taskDefinitionLog.getCode(), code); taskDefinitionLog.setCode(code); } catch (CodeGenerateException e) { logger.error("Generate task definition code error, projectCode:{}, processDefinitionCode:{}", projectCode, processDefinition.getCode(), e); putMsg(result, Status.INTERNAL_SERVER_ERROR_ARGS, "Error generating task definition code"); return false; } taskDefinitionLogList.add(taskDefinitionLog); } int insert = taskDefinitionMapper.batchInsert(taskDefinitionLogList); int logInsert = taskDefinitionLogMapper.batchInsert(taskDefinitionLogList); if ((logInsert & insert) == 0) { logger.error("Save task definition error, projectCode:{}, processDefinitionCode:{}", projectCode, processDefinition.getCode()); putMsg(result, Status.CREATE_TASK_DEFINITION_ERROR); throw new ServiceException(Status.CREATE_TASK_DEFINITION_ERROR); } List<ProcessTaskRelation> taskRelationList = dagDataSchedule.getProcessTaskRelationList(); List<ProcessTaskRelationLog> taskRelationLogList = new ArrayList<>(); for (ProcessTaskRelation processTaskRelation : taskRelationList) { ProcessTaskRelationLog processTaskRelationLog = new ProcessTaskRelationLog(processTaskRelation); if (taskCodeMap.containsKey(processTaskRelationLog.getPreTaskCode())) { processTaskRelationLog.setPreTaskCode(taskCodeMap.get(processTaskRelationLog.getPreTaskCode())); } if (taskCodeMap.containsKey(processTaskRelationLog.getPostTaskCode())) { processTaskRelationLog.setPostTaskCode(taskCodeMap.get(processTaskRelationLog.getPostTaskCode())); }
closed
apache/dolphinscheduler
https://github.com/apache/dolphinscheduler
12,391
[Improvement][API] Workflow definitions that contain logical task nodes support the copy function
### Search before asking - [X] I had searched in the [issues](https://github.com/apache/dolphinscheduler/issues?q=is%3Aissue) and found no similar feature requirement. ### Description Currently, the system does not support the replication function of workflow definition including `CONDITIONS`, `SWITCH`, `SUB_PROCESS`, `DEPENDENT` four task nodes. <img width="1472" alt="image" src="https://user-images.githubusercontent.com/37063904/196038586-7e802eeb-2063-468f-83ae-430201149712.png"> ### Are you willing to submit a 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/12391
https://github.com/apache/dolphinscheduler/pull/12392
b7bd8d780356e055998fd0047be7e2cfea85d59b
55004bebe032b7212892686d308adca2ac0e2723
2022-10-16T13:42:00Z
java
2022-10-17T02:28:58Z
dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/impl/ProcessDefinitionServiceImpl.java
processTaskRelationLog.setPreTaskVersion(Constants.VERSION_FIRST); processTaskRelationLog.setPostTaskVersion(Constants.VERSION_FIRST); taskRelationLogList.add(processTaskRelationLog); } if (StringUtils.isNotEmpty(processDefinition.getLocations()) && JSONUtils.checkJsonValid(processDefinition.getLocations())) { ArrayNode arrayNode = JSONUtils.parseArray(processDefinition.getLocations()); ArrayNode newArrayNode = JSONUtils.createArrayNode(); for (int i = 0; i < arrayNode.size(); i++) { ObjectNode newObjectNode = newArrayNode.addObject(); JsonNode jsonNode = arrayNode.get(i); Long taskCode = taskCodeMap.get(jsonNode.get("taskCode").asLong()); if (Objects.nonNull(taskCode)) { newObjectNode.put("taskCode", taskCode); newObjectNode.set("x", jsonNode.get("x")); newObjectNode.set("y", jsonNode.get("y")); } } processDefinition.setLocations(newArrayNode.toString()); } processDefinition.setCreateTime(new Date()); processDefinition.setUpdateTime(new Date()); Map<String, Object> createDagResult = createDagDefine(loginUser, taskRelationLogList, processDefinition, Lists.newArrayList(), otherParamsJson); if (Status.SUCCESS.equals(createDagResult.get(Constants.STATUS))) { putMsg(createDagResult, Status.SUCCESS); } else { result.putAll(createDagResult); logger.error("Import process definition error, projectCode:{}, processDefinitionCode:{}.", projectCode, processDefinition.getCode());
closed
apache/dolphinscheduler
https://github.com/apache/dolphinscheduler
12,391
[Improvement][API] Workflow definitions that contain logical task nodes support the copy function
### Search before asking - [X] I had searched in the [issues](https://github.com/apache/dolphinscheduler/issues?q=is%3Aissue) and found no similar feature requirement. ### Description Currently, the system does not support the replication function of workflow definition including `CONDITIONS`, `SWITCH`, `SUB_PROCESS`, `DEPENDENT` four task nodes. <img width="1472" alt="image" src="https://user-images.githubusercontent.com/37063904/196038586-7e802eeb-2063-468f-83ae-430201149712.png"> ### Are you willing to submit a 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/12391
https://github.com/apache/dolphinscheduler/pull/12392
b7bd8d780356e055998fd0047be7e2cfea85d59b
55004bebe032b7212892686d308adca2ac0e2723
2022-10-16T13:42:00Z
java
2022-10-17T02:28:58Z
dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/impl/ProcessDefinitionServiceImpl.java
throw new ServiceException(Status.IMPORT_PROCESS_DEFINE_ERROR); } Schedule schedule = dagDataSchedule.getSchedule(); if (null != schedule) { ProcessDefinition newProcessDefinition = processDefinitionMapper.queryByCode(processDefinition.getCode()); schedule.setProcessDefinitionCode(newProcessDefinition.getCode()); schedule.setUserId(loginUser.getId()); schedule.setCreateTime(now); schedule.setUpdateTime(now); int scheduleInsert = scheduleMapper.insert(schedule); if (0 == scheduleInsert) { logger.error( "Import process definition error due to save schedule fail, projectCode:{}, processDefinitionCode:{}.", projectCode, processDefinition.getCode()); putMsg(result, Status.IMPORT_PROCESS_DEFINE_ERROR); throw new ServiceException(Status.IMPORT_PROCESS_DEFINE_ERROR); } } logger.info("Import process definition complete, projectCode:{}, processDefinitionCode:{}.", projectCode, processDefinition.getCode()); return true; } /** * check importance params */ private boolean checkImportanceParams(DagDataSchedule dagDataSchedule, Map<String, Object> result) { if (dagDataSchedule.getProcessDefinition() == null) { logger.warn("Process definition is null."); putMsg(result, Status.DATA_IS_NULL, "ProcessDefinition"); return false;
closed
apache/dolphinscheduler
https://github.com/apache/dolphinscheduler
12,391
[Improvement][API] Workflow definitions that contain logical task nodes support the copy function
### Search before asking - [X] I had searched in the [issues](https://github.com/apache/dolphinscheduler/issues?q=is%3Aissue) and found no similar feature requirement. ### Description Currently, the system does not support the replication function of workflow definition including `CONDITIONS`, `SWITCH`, `SUB_PROCESS`, `DEPENDENT` four task nodes. <img width="1472" alt="image" src="https://user-images.githubusercontent.com/37063904/196038586-7e802eeb-2063-468f-83ae-430201149712.png"> ### Are you willing to submit a 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/12391
https://github.com/apache/dolphinscheduler/pull/12392
b7bd8d780356e055998fd0047be7e2cfea85d59b
55004bebe032b7212892686d308adca2ac0e2723
2022-10-16T13:42:00Z
java
2022-10-17T02:28:58Z
dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/impl/ProcessDefinitionServiceImpl.java
} if (CollectionUtils.isEmpty(dagDataSchedule.getTaskDefinitionList())) { logger.warn("Task definition list is null."); putMsg(result, Status.DATA_IS_NULL, "TaskDefinitionList"); return false; } if (CollectionUtils.isEmpty(dagDataSchedule.getProcessTaskRelationList())) { logger.warn("Process task relation list is null."); putMsg(result, Status.DATA_IS_NULL, "ProcessTaskRelationList"); return false; } return true; } private String recursionProcessDefinitionName(long projectCode, String processDefinitionName, int num) { ProcessDefinition processDefinition = processDefinitionMapper.queryByDefineName(projectCode, processDefinitionName); if (processDefinition != null) { if (num > 1) { String str = processDefinitionName.substring(0, processDefinitionName.length() - 3); processDefinitionName = str + "(" + num + ")"; } else { processDefinitionName = processDefinition.getName() + "(" + num + ")"; } } else { return processDefinitionName; } return recursionProcessDefinitionName(projectCode, processDefinitionName, num + 1); } /** * check the process task relation json
closed
apache/dolphinscheduler
https://github.com/apache/dolphinscheduler
12,391
[Improvement][API] Workflow definitions that contain logical task nodes support the copy function
### Search before asking - [X] I had searched in the [issues](https://github.com/apache/dolphinscheduler/issues?q=is%3Aissue) and found no similar feature requirement. ### Description Currently, the system does not support the replication function of workflow definition including `CONDITIONS`, `SWITCH`, `SUB_PROCESS`, `DEPENDENT` four task nodes. <img width="1472" alt="image" src="https://user-images.githubusercontent.com/37063904/196038586-7e802eeb-2063-468f-83ae-430201149712.png"> ### Are you willing to submit a 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/12391
https://github.com/apache/dolphinscheduler/pull/12392
b7bd8d780356e055998fd0047be7e2cfea85d59b
55004bebe032b7212892686d308adca2ac0e2723
2022-10-16T13:42:00Z
java
2022-10-17T02:28:58Z
dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/impl/ProcessDefinitionServiceImpl.java
* * @param processTaskRelationJson process task relation json * @return check result code */ @Override public Map<String, Object> checkProcessNodeList(String processTaskRelationJson, List<TaskDefinitionLog> taskDefinitionLogsList) { Map<String, Object> result = new HashMap<>(); try { if (processTaskRelationJson == null) { logger.error("Process task relation data is null."); putMsg(result, Status.DATA_IS_NOT_VALID, processTaskRelationJson); return result; } List<ProcessTaskRelation> taskRelationList = JSONUtils.toList(processTaskRelationJson, ProcessTaskRelation.class); List<TaskNode> taskNodes = processService.transformTask(taskRelationList, taskDefinitionLogsList); if (CollectionUtils.isEmpty(taskNodes)) { logger.error("Task node data is empty."); putMsg(result, Status.PROCESS_DAG_IS_EMPTY); return result; } if (graphHasCycle(taskNodes)) { logger.error("Process DAG has cycle."); putMsg(result, Status.PROCESS_NODE_HAS_CYCLE); return result; }
closed
apache/dolphinscheduler
https://github.com/apache/dolphinscheduler
12,391
[Improvement][API] Workflow definitions that contain logical task nodes support the copy function
### Search before asking - [X] I had searched in the [issues](https://github.com/apache/dolphinscheduler/issues?q=is%3Aissue) and found no similar feature requirement. ### Description Currently, the system does not support the replication function of workflow definition including `CONDITIONS`, `SWITCH`, `SUB_PROCESS`, `DEPENDENT` four task nodes. <img width="1472" alt="image" src="https://user-images.githubusercontent.com/37063904/196038586-7e802eeb-2063-468f-83ae-430201149712.png"> ### Are you willing to submit a 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/12391
https://github.com/apache/dolphinscheduler/pull/12392
b7bd8d780356e055998fd0047be7e2cfea85d59b
55004bebe032b7212892686d308adca2ac0e2723
2022-10-16T13:42:00Z
java
2022-10-17T02:28:58Z
dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/impl/ProcessDefinitionServiceImpl.java
for (TaskNode taskNode : taskNodes) { if (!taskPluginManager.checkTaskParameters(ParametersNode.builder() .taskType(taskNode.getType()) .taskParams(taskNode.getTaskParams()) .dependence(taskNode.getDependence()) .switchResult(taskNode.getSwitchResult()) .build())) { logger.error("Task node {} parameter invalid.", taskNode.getName()); putMsg(result, Status.PROCESS_NODE_S_PARAMETER_INVALID, taskNode.getName()); return result; } CheckUtils.checkOtherParams(taskNode.getExtras()); } putMsg(result, Status.SUCCESS); } catch (Exception e) { result.put(Constants.STATUS, Status.INTERNAL_SERVER_ERROR_ARGS); putMsg(result, Status.INTERNAL_SERVER_ERROR_ARGS, e.getMessage()); logger.error(Status.INTERNAL_SERVER_ERROR_ARGS.getMsg(), e); } return result; } /** * get task node details based on process definition * * @param loginUser loginUser * @param projectCode project code * @param code process definition code * @return task node list */
closed
apache/dolphinscheduler
https://github.com/apache/dolphinscheduler
12,391
[Improvement][API] Workflow definitions that contain logical task nodes support the copy function
### Search before asking - [X] I had searched in the [issues](https://github.com/apache/dolphinscheduler/issues?q=is%3Aissue) and found no similar feature requirement. ### Description Currently, the system does not support the replication function of workflow definition including `CONDITIONS`, `SWITCH`, `SUB_PROCESS`, `DEPENDENT` four task nodes. <img width="1472" alt="image" src="https://user-images.githubusercontent.com/37063904/196038586-7e802eeb-2063-468f-83ae-430201149712.png"> ### Are you willing to submit a 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/12391
https://github.com/apache/dolphinscheduler/pull/12392
b7bd8d780356e055998fd0047be7e2cfea85d59b
55004bebe032b7212892686d308adca2ac0e2723
2022-10-16T13:42:00Z
java
2022-10-17T02:28:58Z
dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/impl/ProcessDefinitionServiceImpl.java
@Override public Map<String, Object> getTaskNodeListByDefinitionCode(User loginUser, long projectCode, long code) { Project project = projectMapper.queryByCode(projectCode); Map<String, Object> result = projectService.checkProjectAndAuth(loginUser, project, projectCode, null); if (result.get(Constants.STATUS) != Status.SUCCESS) { return result; } ProcessDefinition processDefinition = processDefinitionMapper.queryByCode(code); if (processDefinition == null || projectCode != processDefinition.getProjectCode()) { logger.error("Process definition does not exist, processDefinitionCode:{}.", code); putMsg(result, Status.PROCESS_DEFINE_NOT_EXIST, String.valueOf(code)); return result; } DagData dagData = processService.genDagData(processDefinition); result.put(Constants.DATA_LIST, dagData.getTaskDefinitionList()); putMsg(result, Status.SUCCESS); return result; } /** * get task node details map based on process definition * * @param loginUser loginUser * @param projectCode project code * @param codes define codes * @return task node list */ @Override public Map<String, Object> getNodeListMapByDefinitionCodes(User loginUser, long projectCode, String codes) { Project project = projectMapper.queryByCode(projectCode);
closed
apache/dolphinscheduler
https://github.com/apache/dolphinscheduler
12,391
[Improvement][API] Workflow definitions that contain logical task nodes support the copy function
### Search before asking - [X] I had searched in the [issues](https://github.com/apache/dolphinscheduler/issues?q=is%3Aissue) and found no similar feature requirement. ### Description Currently, the system does not support the replication function of workflow definition including `CONDITIONS`, `SWITCH`, `SUB_PROCESS`, `DEPENDENT` four task nodes. <img width="1472" alt="image" src="https://user-images.githubusercontent.com/37063904/196038586-7e802eeb-2063-468f-83ae-430201149712.png"> ### Are you willing to submit a 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/12391
https://github.com/apache/dolphinscheduler/pull/12392
b7bd8d780356e055998fd0047be7e2cfea85d59b
55004bebe032b7212892686d308adca2ac0e2723
2022-10-16T13:42:00Z
java
2022-10-17T02:28:58Z
dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/impl/ProcessDefinitionServiceImpl.java
Map<String, Object> result = projectService.checkProjectAndAuth(loginUser, project, projectCode, null); if (result.get(Constants.STATUS) != Status.SUCCESS) { return result; } Set<Long> defineCodeSet = Lists.newArrayList(codes.split(Constants.COMMA)).stream().map(Long::parseLong) .collect(Collectors.toSet()); List<ProcessDefinition> processDefinitionList = processDefinitionMapper.queryByCodes(defineCodeSet); if (CollectionUtils.isEmpty(processDefinitionList)) { logger.error("Process definitions do not exist, codes:{}.", defineCodeSet); putMsg(result, Status.PROCESS_DEFINE_NOT_EXIST, codes); return result; } HashMap<Long, Project> userProjects = new HashMap<>(Constants.DEFAULT_HASH_MAP_SIZE); projectMapper.queryProjectCreatedAndAuthorizedByUserId(loginUser.getId()) .forEach(userProject -> userProjects.put(userProject.getCode(), userProject)); List<ProcessDefinition> processDefinitionListInProject = processDefinitionList.stream() .filter(o -> userProjects.containsKey(o.getProjectCode())).collect(Collectors.toList()); if (CollectionUtils.isEmpty(processDefinitionListInProject)) { Set<Long> codesInProject = processDefinitionListInProject.stream() .map(ProcessDefinition::getCode).collect(Collectors.toSet()); logger.error("Process definitions do not exist in project, projectCode:{}, processDefinitionsCodes:{}.", processDefinitionListInProject.get(0).getProjectCode(), codesInProject); putMsg(result, Status.PROCESS_DEFINE_NOT_EXIST, codes); return result; } Map<Long, List<TaskDefinition>> taskNodeMap = new HashMap<>(); for (ProcessDefinition processDefinition : processDefinitionListInProject) { DagData dagData = processService.genDagData(processDefinition);
closed
apache/dolphinscheduler
https://github.com/apache/dolphinscheduler
12,391
[Improvement][API] Workflow definitions that contain logical task nodes support the copy function
### Search before asking - [X] I had searched in the [issues](https://github.com/apache/dolphinscheduler/issues?q=is%3Aissue) and found no similar feature requirement. ### Description Currently, the system does not support the replication function of workflow definition including `CONDITIONS`, `SWITCH`, `SUB_PROCESS`, `DEPENDENT` four task nodes. <img width="1472" alt="image" src="https://user-images.githubusercontent.com/37063904/196038586-7e802eeb-2063-468f-83ae-430201149712.png"> ### Are you willing to submit a 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/12391
https://github.com/apache/dolphinscheduler/pull/12392
b7bd8d780356e055998fd0047be7e2cfea85d59b
55004bebe032b7212892686d308adca2ac0e2723
2022-10-16T13:42:00Z
java
2022-10-17T02:28:58Z
dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/impl/ProcessDefinitionServiceImpl.java
taskNodeMap.put(processDefinition.getCode(), dagData.getTaskDefinitionList()); } result.put(Constants.DATA_LIST, taskNodeMap); putMsg(result, Status.SUCCESS); return result; } /** * query process definition all by project code * * @param loginUser loginUser * @param projectCode project code * @return process definitions in the project */ @Override public Map<String, Object> queryAllProcessDefinitionByProjectCode(User loginUser, long projectCode) { Project project = projectMapper.queryByCode(projectCode); Map<String, Object> result = projectService.checkProjectAndAuth(loginUser, project, projectCode, WORKFLOW_DEFINITION); if (result.get(Constants.STATUS) != Status.SUCCESS) { return result; } List<ProcessDefinition> processDefinitions = processDefinitionMapper.queryAllDefinitionList(projectCode); List<DagData> dagDataList = processDefinitions.stream().map(processService::genDagData).collect(Collectors.toList()); result.put(Constants.DATA_LIST, dagDataList); putMsg(result, Status.SUCCESS); return result; } /**
closed
apache/dolphinscheduler
https://github.com/apache/dolphinscheduler
12,391
[Improvement][API] Workflow definitions that contain logical task nodes support the copy function
### Search before asking - [X] I had searched in the [issues](https://github.com/apache/dolphinscheduler/issues?q=is%3Aissue) and found no similar feature requirement. ### Description Currently, the system does not support the replication function of workflow definition including `CONDITIONS`, `SWITCH`, `SUB_PROCESS`, `DEPENDENT` four task nodes. <img width="1472" alt="image" src="https://user-images.githubusercontent.com/37063904/196038586-7e802eeb-2063-468f-83ae-430201149712.png"> ### Are you willing to submit a 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/12391
https://github.com/apache/dolphinscheduler/pull/12392
b7bd8d780356e055998fd0047be7e2cfea85d59b
55004bebe032b7212892686d308adca2ac0e2723
2022-10-16T13:42:00Z
java
2022-10-17T02:28:58Z
dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/impl/ProcessDefinitionServiceImpl.java
* query process definition list by project code * * @param projectCode project code * @return process definition list in the project */ @Override public Map<String, Object> queryProcessDefinitionListByProjectCode(long projectCode) { Map<String, Object> result = new HashMap<>(); List<DependentSimplifyDefinition> processDefinitions = processDefinitionMapper.queryDefinitionListByProjectCodeAndProcessDefinitionCodes(projectCode, null); result.put(Constants.DATA_LIST, processDefinitions); putMsg(result, Status.SUCCESS); return result; } /** * query process definition list by process definition code * * @param projectCode project code * @param processDefinitionCode process definition code * @return task definition list in the process definition */ @Override public Map<String, Object> queryTaskDefinitionListByProcessDefinitionCode(long projectCode, Long processDefinitionCode) { Map<String, Object> result = new HashMap<>(); Set<Long> definitionCodesSet = new HashSet<>(); definitionCodesSet.add(processDefinitionCode); List<DependentSimplifyDefinition> processDefinitions = processDefinitionMapper .queryDefinitionListByProjectCodeAndProcessDefinitionCodes(projectCode, definitionCodesSet);
closed
apache/dolphinscheduler
https://github.com/apache/dolphinscheduler
12,391
[Improvement][API] Workflow definitions that contain logical task nodes support the copy function
### Search before asking - [X] I had searched in the [issues](https://github.com/apache/dolphinscheduler/issues?q=is%3Aissue) and found no similar feature requirement. ### Description Currently, the system does not support the replication function of workflow definition including `CONDITIONS`, `SWITCH`, `SUB_PROCESS`, `DEPENDENT` four task nodes. <img width="1472" alt="image" src="https://user-images.githubusercontent.com/37063904/196038586-7e802eeb-2063-468f-83ae-430201149712.png"> ### Are you willing to submit a 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/12391
https://github.com/apache/dolphinscheduler/pull/12392
b7bd8d780356e055998fd0047be7e2cfea85d59b
55004bebe032b7212892686d308adca2ac0e2723
2022-10-16T13:42:00Z
java
2022-10-17T02:28:58Z
dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/impl/ProcessDefinitionServiceImpl.java
List<ProcessTaskRelation> processTaskRelations = processTaskRelationMapper.queryProcessTaskRelationsByProcessDefinitionCode( processDefinitions.get(0).getCode(), processDefinitions.get(0).getVersion()); List<TaskDefinitionLog> taskDefinitionLogsList = processService.genTaskDefineList(processTaskRelations); List<DependentSimplifyDefinition> taskDefinitionList = new ArrayList<>(); for (TaskDefinitionLog taskDefinitionLog : taskDefinitionLogsList) { DependentSimplifyDefinition dependentSimplifyDefinition = new DependentSimplifyDefinition(); dependentSimplifyDefinition.setCode(taskDefinitionLog.getCode()); dependentSimplifyDefinition.setName(taskDefinitionLog.getName()); dependentSimplifyDefinition.setVersion(taskDefinitionLog.getVersion()); taskDefinitionList.add(dependentSimplifyDefinition); } result.put(Constants.DATA_LIST, taskDefinitionList); putMsg(result, Status.SUCCESS); return result; } /** * Encapsulates the TreeView structure * * @param projectCode project code * @param code process definition code * @param limit limit * @return tree view json data */ @Override public Map<String, Object> viewTree(User loginUser, long projectCode, long code, Integer limit) { Map<String, Object> result = new HashMap<>(); Project project = projectMapper.queryByCode(projectCode);
closed
apache/dolphinscheduler
https://github.com/apache/dolphinscheduler
12,391
[Improvement][API] Workflow definitions that contain logical task nodes support the copy function
### Search before asking - [X] I had searched in the [issues](https://github.com/apache/dolphinscheduler/issues?q=is%3Aissue) and found no similar feature requirement. ### Description Currently, the system does not support the replication function of workflow definition including `CONDITIONS`, `SWITCH`, `SUB_PROCESS`, `DEPENDENT` four task nodes. <img width="1472" alt="image" src="https://user-images.githubusercontent.com/37063904/196038586-7e802eeb-2063-468f-83ae-430201149712.png"> ### Are you willing to submit a 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/12391
https://github.com/apache/dolphinscheduler/pull/12392
b7bd8d780356e055998fd0047be7e2cfea85d59b
55004bebe032b7212892686d308adca2ac0e2723
2022-10-16T13:42:00Z
java
2022-10-17T02:28:58Z
dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/impl/ProcessDefinitionServiceImpl.java
result = projectService.checkProjectAndAuth(loginUser, project, projectCode, WORKFLOW_TREE_VIEW); if (result.get(Constants.STATUS) != Status.SUCCESS) { return result; } ProcessDefinition processDefinition = processDefinitionMapper.queryByCode(code); if (null == processDefinition || projectCode != processDefinition.getProjectCode()) { logger.error("Process definition does not exist, code:{}.", code); putMsg(result, Status.PROCESS_DEFINE_NOT_EXIST, String.valueOf(code)); return result; } DAG<String, TaskNode, TaskNodeRelation> dag = processService.genDagGraph(processDefinition); Map<String, List<TreeViewDto>> runningNodeMap = new ConcurrentHashMap<>(); Map<String, List<TreeViewDto>> waitingRunningNodeMap = new ConcurrentHashMap<>(); List<ProcessInstance> processInstanceList = processInstanceService.queryByProcessDefineCode(code, limit); processInstanceList.forEach(processInstance -> processInstance .setDuration(DateUtils.format2Duration(processInstance.getStartTime(), processInstance.getEndTime()))); List<TaskDefinitionLog> taskDefinitionList = processService.genTaskDefineList(processTaskRelationMapper .queryByProcessCode(processDefinition.getProjectCode(), processDefinition.getCode())); Map<Long, TaskDefinitionLog> taskDefinitionMap = taskDefinitionList.stream() .collect(Collectors.toMap(TaskDefinitionLog::getCode, taskDefinitionLog -> taskDefinitionLog)); if (limit < 0) { putMsg(result, Status.REQUEST_PARAMS_NOT_VALID_ERROR); return result; } if (limit > processInstanceList.size()) { limit = processInstanceList.size();
closed
apache/dolphinscheduler
https://github.com/apache/dolphinscheduler
12,391
[Improvement][API] Workflow definitions that contain logical task nodes support the copy function
### Search before asking - [X] I had searched in the [issues](https://github.com/apache/dolphinscheduler/issues?q=is%3Aissue) and found no similar feature requirement. ### Description Currently, the system does not support the replication function of workflow definition including `CONDITIONS`, `SWITCH`, `SUB_PROCESS`, `DEPENDENT` four task nodes. <img width="1472" alt="image" src="https://user-images.githubusercontent.com/37063904/196038586-7e802eeb-2063-468f-83ae-430201149712.png"> ### Are you willing to submit a 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/12391
https://github.com/apache/dolphinscheduler/pull/12392
b7bd8d780356e055998fd0047be7e2cfea85d59b
55004bebe032b7212892686d308adca2ac0e2723
2022-10-16T13:42:00Z
java
2022-10-17T02:28:58Z
dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/impl/ProcessDefinitionServiceImpl.java
} TreeViewDto parentTreeViewDto = new TreeViewDto(); parentTreeViewDto.setName("DAG"); parentTreeViewDto.setType(""); parentTreeViewDto.setCode(0L); for (int i = limit - 1; i >= 0; i--) { ProcessInstance processInstance = processInstanceList.get(i); Date endTime = processInstance.getEndTime() == null ? new Date() : processInstance.getEndTime(); parentTreeViewDto.getInstances() .add(new Instance(processInstance.getId(), processInstance.getName(), processInstance.getProcessDefinitionCode(), "", processInstance.getState().toString(), processInstance.getStartTime(), endTime, processInstance.getHost(), DateUtils.format2Readable(endTime.getTime() - processInstance.getStartTime().getTime()))); } List<TreeViewDto> parentTreeViewDtoList = new ArrayList<>(); parentTreeViewDtoList.add(parentTreeViewDto); for (String startNode : dag.getBeginNode()) { runningNodeMap.put(startNode, parentTreeViewDtoList); } while (!ServerLifeCycleManager.isStopped()) { Set<String> postNodeList; Iterator<Map.Entry<String, List<TreeViewDto>>> iter = runningNodeMap.entrySet().iterator(); while (iter.hasNext()) { Map.Entry<String, List<TreeViewDto>> en = iter.next(); String nodeCode = en.getKey(); parentTreeViewDtoList = en.getValue(); TreeViewDto treeViewDto = new TreeViewDto();
closed
apache/dolphinscheduler
https://github.com/apache/dolphinscheduler
12,391
[Improvement][API] Workflow definitions that contain logical task nodes support the copy function
### Search before asking - [X] I had searched in the [issues](https://github.com/apache/dolphinscheduler/issues?q=is%3Aissue) and found no similar feature requirement. ### Description Currently, the system does not support the replication function of workflow definition including `CONDITIONS`, `SWITCH`, `SUB_PROCESS`, `DEPENDENT` four task nodes. <img width="1472" alt="image" src="https://user-images.githubusercontent.com/37063904/196038586-7e802eeb-2063-468f-83ae-430201149712.png"> ### Are you willing to submit a 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/12391
https://github.com/apache/dolphinscheduler/pull/12392
b7bd8d780356e055998fd0047be7e2cfea85d59b
55004bebe032b7212892686d308adca2ac0e2723
2022-10-16T13:42:00Z
java
2022-10-17T02:28:58Z
dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/impl/ProcessDefinitionServiceImpl.java
TaskNode taskNode = dag.getNode(nodeCode); treeViewDto.setType(taskNode.getType()); treeViewDto.setCode(taskNode.getCode()); treeViewDto.setName(taskNode.getName()); for (int i = limit - 1; i >= 0; i--) { ProcessInstance processInstance = processInstanceList.get(i); TaskInstance taskInstance = taskInstanceMapper.queryByInstanceIdAndCode(processInstance.getId(), Long.parseLong(nodeCode)); if (taskInstance == null) { treeViewDto.getInstances().add(new Instance(-1, "not running", 0, "null")); } else { Date startTime = taskInstance.getStartTime() == null ? new Date() : taskInstance.getStartTime(); Date endTime = taskInstance.getEndTime() == null ? new Date() : taskInstance.getEndTime(); long subProcessCode = 0L; if (taskInstance.isSubProcess()) { TaskDefinition taskDefinition = taskDefinitionMap.get(taskInstance.getTaskCode()); subProcessCode = Long.parseLong(JSONUtils.parseObject( taskDefinition.getTaskParams()).path(CMD_PARAM_SUB_PROCESS_DEFINE_CODE).asText()); } treeViewDto.getInstances().add(new Instance(taskInstance.getId(), taskInstance.getName(), taskInstance.getTaskCode(), taskInstance.getTaskType(), taskInstance.getState().toString(), taskInstance.getStartTime(), taskInstance.getEndTime(), taskInstance.getHost(), DateUtils.format2Readable(endTime.getTime() - startTime.getTime()), subProcessCode)); } } for (TreeViewDto pTreeViewDto : parentTreeViewDtoList) {
closed
apache/dolphinscheduler
https://github.com/apache/dolphinscheduler
12,391
[Improvement][API] Workflow definitions that contain logical task nodes support the copy function
### Search before asking - [X] I had searched in the [issues](https://github.com/apache/dolphinscheduler/issues?q=is%3Aissue) and found no similar feature requirement. ### Description Currently, the system does not support the replication function of workflow definition including `CONDITIONS`, `SWITCH`, `SUB_PROCESS`, `DEPENDENT` four task nodes. <img width="1472" alt="image" src="https://user-images.githubusercontent.com/37063904/196038586-7e802eeb-2063-468f-83ae-430201149712.png"> ### Are you willing to submit a 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/12391
https://github.com/apache/dolphinscheduler/pull/12392
b7bd8d780356e055998fd0047be7e2cfea85d59b
55004bebe032b7212892686d308adca2ac0e2723
2022-10-16T13:42:00Z
java
2022-10-17T02:28:58Z
dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/impl/ProcessDefinitionServiceImpl.java
pTreeViewDto.getChildren().add(treeViewDto); } postNodeList = dag.getSubsequentNodes(nodeCode); if (CollectionUtils.isNotEmpty(postNodeList)) { for (String nextNodeCode : postNodeList) { List<TreeViewDto> treeViewDtoList = waitingRunningNodeMap.get(nextNodeCode); if (CollectionUtils.isEmpty(treeViewDtoList)) { treeViewDtoList = new ArrayList<>(); } treeViewDtoList.add(treeViewDto); waitingRunningNodeMap.put(nextNodeCode, treeViewDtoList); } } runningNodeMap.remove(nodeCode); } if (waitingRunningNodeMap.size() == 0) { break; } else { runningNodeMap.putAll(waitingRunningNodeMap); waitingRunningNodeMap.clear(); } } result.put(Constants.DATA_LIST, parentTreeViewDto); result.put(Constants.STATUS, Status.SUCCESS); result.put(Constants.MSG, Status.SUCCESS.getMsg()); return result; } /** * whether the graph has a ring *
closed
apache/dolphinscheduler
https://github.com/apache/dolphinscheduler
12,391
[Improvement][API] Workflow definitions that contain logical task nodes support the copy function
### Search before asking - [X] I had searched in the [issues](https://github.com/apache/dolphinscheduler/issues?q=is%3Aissue) and found no similar feature requirement. ### Description Currently, the system does not support the replication function of workflow definition including `CONDITIONS`, `SWITCH`, `SUB_PROCESS`, `DEPENDENT` four task nodes. <img width="1472" alt="image" src="https://user-images.githubusercontent.com/37063904/196038586-7e802eeb-2063-468f-83ae-430201149712.png"> ### Are you willing to submit a 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/12391
https://github.com/apache/dolphinscheduler/pull/12392
b7bd8d780356e055998fd0047be7e2cfea85d59b
55004bebe032b7212892686d308adca2ac0e2723
2022-10-16T13:42:00Z
java
2022-10-17T02:28:58Z
dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/impl/ProcessDefinitionServiceImpl.java
* @param taskNodeResponseList task node response list * @return if graph has cycle flag */ private boolean graphHasCycle(List<TaskNode> taskNodeResponseList) { DAG<String, TaskNode, String> graph = new DAG<>(); for (TaskNode taskNodeResponse : taskNodeResponseList) { graph.addNode(Long.toString(taskNodeResponse.getCode()), taskNodeResponse); } for (TaskNode taskNodeResponse : taskNodeResponseList) { List<String> preTasks = JSONUtils.toList(taskNodeResponse.getPreTasks(), String.class); if (CollectionUtils.isNotEmpty(preTasks)) { for (String preTask : preTasks) { if (!graph.addEdge(preTask, Long.toString(taskNodeResponse.getCode()))) { return true; } } } } return graph.hasCycle(); } /** * batch copy process definition * * @param loginUser loginUser * @param projectCode projectCode * @param codes processDefinitionCodes * @param targetProjectCode targetProjectCode */
closed
apache/dolphinscheduler
https://github.com/apache/dolphinscheduler
12,391
[Improvement][API] Workflow definitions that contain logical task nodes support the copy function
### Search before asking - [X] I had searched in the [issues](https://github.com/apache/dolphinscheduler/issues?q=is%3Aissue) and found no similar feature requirement. ### Description Currently, the system does not support the replication function of workflow definition including `CONDITIONS`, `SWITCH`, `SUB_PROCESS`, `DEPENDENT` four task nodes. <img width="1472" alt="image" src="https://user-images.githubusercontent.com/37063904/196038586-7e802eeb-2063-468f-83ae-430201149712.png"> ### Are you willing to submit a 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/12391
https://github.com/apache/dolphinscheduler/pull/12392
b7bd8d780356e055998fd0047be7e2cfea85d59b
55004bebe032b7212892686d308adca2ac0e2723
2022-10-16T13:42:00Z
java
2022-10-17T02:28:58Z
dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/impl/ProcessDefinitionServiceImpl.java
@Override @Transactional public Map<String, Object> batchCopyProcessDefinition(User loginUser, long projectCode, String codes, long targetProjectCode) { Map<String, Object> result = checkParams(loginUser, projectCode, codes, targetProjectCode, WORKFLOW_BATCH_COPY); if (result.get(Constants.STATUS) != Status.SUCCESS) { return result; } List<String> failedProcessList = new ArrayList<>(); doBatchOperateProcessDefinition(loginUser, targetProjectCode, failedProcessList, codes, result, true); if (result.get(Constants.STATUS) == Status.NOT_SUPPORT_COPY_TASK_TYPE) { return result; } checkBatchOperateResult(projectCode, targetProjectCode, result, failedProcessList, true); return result; } /** * batch move process definition * Will be deleted * @param loginUser loginUser * @param projectCode projectCode * @param codes processDefinitionCodes * @param targetProjectCode targetProjectCode */ @Override @Transactional public Map<String, Object> batchMoveProcessDefinition(User loginUser, long projectCode,
closed
apache/dolphinscheduler
https://github.com/apache/dolphinscheduler
12,391
[Improvement][API] Workflow definitions that contain logical task nodes support the copy function
### Search before asking - [X] I had searched in the [issues](https://github.com/apache/dolphinscheduler/issues?q=is%3Aissue) and found no similar feature requirement. ### Description Currently, the system does not support the replication function of workflow definition including `CONDITIONS`, `SWITCH`, `SUB_PROCESS`, `DEPENDENT` four task nodes. <img width="1472" alt="image" src="https://user-images.githubusercontent.com/37063904/196038586-7e802eeb-2063-468f-83ae-430201149712.png"> ### Are you willing to submit a 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/12391
https://github.com/apache/dolphinscheduler/pull/12392
b7bd8d780356e055998fd0047be7e2cfea85d59b
55004bebe032b7212892686d308adca2ac0e2723
2022-10-16T13:42:00Z
java
2022-10-17T02:28:58Z
dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/impl/ProcessDefinitionServiceImpl.java
String codes, long targetProjectCode) { Map<String, Object> result = checkParams(loginUser, projectCode, codes, targetProjectCode, TASK_DEFINITION_MOVE); if (result.get(Constants.STATUS) != Status.SUCCESS) { return result; } if (projectCode == targetProjectCode) { logger.warn("Project code is same as target project code, projectCode:{}.", projectCode); return result; } List<String> failedProcessList = new ArrayList<>(); doBatchOperateProcessDefinition(loginUser, targetProjectCode, failedProcessList, codes, result, false); checkBatchOperateResult(projectCode, targetProjectCode, result, failedProcessList, false); return result; } private Map<String, Object> checkParams(User loginUser, long projectCode, String processDefinitionCodes, long targetProjectCode, String perm) { Project project = projectMapper.queryByCode(projectCode); Map<String, Object> result = projectService.checkProjectAndAuth(loginUser, project, projectCode, perm); if (result.get(Constants.STATUS) != Status.SUCCESS) { return result; } if (StringUtils.isEmpty(processDefinitionCodes)) { logger.error("Parameter processDefinitionCodes is empty, projectCode is {}.", projectCode); putMsg(result, Status.PROCESS_DEFINITION_CODES_IS_EMPTY, processDefinitionCodes); return result;
closed
apache/dolphinscheduler
https://github.com/apache/dolphinscheduler
12,391
[Improvement][API] Workflow definitions that contain logical task nodes support the copy function
### Search before asking - [X] I had searched in the [issues](https://github.com/apache/dolphinscheduler/issues?q=is%3Aissue) and found no similar feature requirement. ### Description Currently, the system does not support the replication function of workflow definition including `CONDITIONS`, `SWITCH`, `SUB_PROCESS`, `DEPENDENT` four task nodes. <img width="1472" alt="image" src="https://user-images.githubusercontent.com/37063904/196038586-7e802eeb-2063-468f-83ae-430201149712.png"> ### Are you willing to submit a 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/12391
https://github.com/apache/dolphinscheduler/pull/12392
b7bd8d780356e055998fd0047be7e2cfea85d59b
55004bebe032b7212892686d308adca2ac0e2723
2022-10-16T13:42:00Z
java
2022-10-17T02:28:58Z
dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/impl/ProcessDefinitionServiceImpl.java
} if (projectCode != targetProjectCode) { Project targetProject = projectMapper.queryByCode(targetProjectCode); Map<String, Object> targetResult = projectService.checkProjectAndAuth(loginUser, targetProject, targetProjectCode, perm); if (targetResult.get(Constants.STATUS) != Status.SUCCESS) { return targetResult; } } return result; } protected void doBatchOperateProcessDefinition(User loginUser, long targetProjectCode, List<String> failedProcessList, String processDefinitionCodes, Map<String, Object> result, boolean isCopy) { Set<Long> definitionCodes = Arrays.stream(processDefinitionCodes.split(Constants.COMMA)).map(Long::parseLong) .collect(Collectors.toSet()); List<ProcessDefinition> processDefinitionList = processDefinitionMapper.queryByCodes(definitionCodes); Set<Long> queryCodes = processDefinitionList.stream().map(ProcessDefinition::getCode).collect(Collectors.toSet()); Set<Long> diffCode = definitionCodes.stream().filter(code -> !queryCodes.contains(code)).collect(Collectors.toSet()); diffCode.forEach(code -> failedProcessList.add(code + "[null]")); for (ProcessDefinition processDefinition : processDefinitionList) { List<ProcessTaskRelation> processTaskRelations = processTaskRelationMapper.queryByProcessCode(processDefinition.getProjectCode(),
closed
apache/dolphinscheduler
https://github.com/apache/dolphinscheduler
12,391
[Improvement][API] Workflow definitions that contain logical task nodes support the copy function
### Search before asking - [X] I had searched in the [issues](https://github.com/apache/dolphinscheduler/issues?q=is%3Aissue) and found no similar feature requirement. ### Description Currently, the system does not support the replication function of workflow definition including `CONDITIONS`, `SWITCH`, `SUB_PROCESS`, `DEPENDENT` four task nodes. <img width="1472" alt="image" src="https://user-images.githubusercontent.com/37063904/196038586-7e802eeb-2063-468f-83ae-430201149712.png"> ### Are you willing to submit a 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/12391
https://github.com/apache/dolphinscheduler/pull/12392
b7bd8d780356e055998fd0047be7e2cfea85d59b
55004bebe032b7212892686d308adca2ac0e2723
2022-10-16T13:42:00Z
java
2022-10-17T02:28:58Z
dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/impl/ProcessDefinitionServiceImpl.java
processDefinition.getCode()); List<ProcessTaskRelationLog> taskRelationList = processTaskRelations.stream().map(ProcessTaskRelationLog::new).collect(Collectors.toList()); processDefinition.setProjectCode(targetProjectCode); String otherParamsJson = doOtherOperateProcess(loginUser, processDefinition); if (isCopy) { logger.info("Copy process definition..."); List<TaskDefinitionLog> taskDefinitionLogs = processService.genTaskDefineList(processTaskRelations); Map<Long, Long> taskCodeMap = new HashMap<>(); for (TaskDefinitionLog taskDefinitionLog : taskDefinitionLogs) { if (COMPLEX_TASK_TYPES.contains(taskDefinitionLog.getTaskType())) { logger.error("Task types {} do not support copy.", taskDefinitionLog.getTaskType()); putMsg(result, Status.NOT_SUPPORT_COPY_TASK_TYPE, taskDefinitionLog.getTaskType()); return; } try { long taskCode = CodeGenerateUtils.getInstance().genCode(); taskCodeMap.put(taskDefinitionLog.getCode(), taskCode); taskDefinitionLog.setCode(taskCode); } catch (CodeGenerateException e) { logger.error("Generate task definition code error, projectCode:{}.", targetProjectCode, e); putMsg(result, Status.INTERNAL_SERVER_ERROR_ARGS); throw new ServiceException(Status.INTERNAL_SERVER_ERROR_ARGS); } taskDefinitionLog.setProjectCode(targetProjectCode); taskDefinitionLog.setVersion(0); taskDefinitionLog.setName(taskDefinitionLog.getName()); } for (ProcessTaskRelationLog processTaskRelationLog : taskRelationList) { if (processTaskRelationLog.getPreTaskCode() > 0) {
closed
apache/dolphinscheduler
https://github.com/apache/dolphinscheduler
12,391
[Improvement][API] Workflow definitions that contain logical task nodes support the copy function
### Search before asking - [X] I had searched in the [issues](https://github.com/apache/dolphinscheduler/issues?q=is%3Aissue) and found no similar feature requirement. ### Description Currently, the system does not support the replication function of workflow definition including `CONDITIONS`, `SWITCH`, `SUB_PROCESS`, `DEPENDENT` four task nodes. <img width="1472" alt="image" src="https://user-images.githubusercontent.com/37063904/196038586-7e802eeb-2063-468f-83ae-430201149712.png"> ### Are you willing to submit a 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/12391
https://github.com/apache/dolphinscheduler/pull/12392
b7bd8d780356e055998fd0047be7e2cfea85d59b
55004bebe032b7212892686d308adca2ac0e2723
2022-10-16T13:42:00Z
java
2022-10-17T02:28:58Z
dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/impl/ProcessDefinitionServiceImpl.java
processTaskRelationLog.setPreTaskCode(taskCodeMap.get(processTaskRelationLog.getPreTaskCode())); } if (processTaskRelationLog.getPostTaskCode() > 0) { processTaskRelationLog .setPostTaskCode(taskCodeMap.get(processTaskRelationLog.getPostTaskCode())); } } final long oldProcessDefinitionCode = processDefinition.getCode(); try { processDefinition.setCode(CodeGenerateUtils.getInstance().genCode()); } catch (CodeGenerateException e) { logger.error("Generate process definition code error, projectCode:{}.", targetProjectCode, e); putMsg(result, Status.INTERNAL_SERVER_ERROR_ARGS); throw new ServiceException(Status.INTERNAL_SERVER_ERROR_ARGS); } processDefinition.setId(null); processDefinition.setUserId(loginUser.getId()); processDefinition.setName(getNewName(processDefinition.getName(), COPY_SUFFIX)); final Date date = new Date(); processDefinition.setCreateTime(date); processDefinition.setUpdateTime(date); processDefinition.setReleaseState(ReleaseState.OFFLINE); if (StringUtils.isNotBlank(processDefinition.getLocations())) { ArrayNode jsonNodes = JSONUtils.parseArray(processDefinition.getLocations()); for (int i = 0; i < jsonNodes.size(); i++) { ObjectNode node = (ObjectNode) jsonNodes.path(i); node.put("taskCode", taskCodeMap.get(node.get("taskCode").asLong())); jsonNodes.set(i, node); } processDefinition.setLocations(JSONUtils.toJsonString(jsonNodes));
closed
apache/dolphinscheduler
https://github.com/apache/dolphinscheduler
12,391
[Improvement][API] Workflow definitions that contain logical task nodes support the copy function
### Search before asking - [X] I had searched in the [issues](https://github.com/apache/dolphinscheduler/issues?q=is%3Aissue) and found no similar feature requirement. ### Description Currently, the system does not support the replication function of workflow definition including `CONDITIONS`, `SWITCH`, `SUB_PROCESS`, `DEPENDENT` four task nodes. <img width="1472" alt="image" src="https://user-images.githubusercontent.com/37063904/196038586-7e802eeb-2063-468f-83ae-430201149712.png"> ### Are you willing to submit a 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/12391
https://github.com/apache/dolphinscheduler/pull/12392
b7bd8d780356e055998fd0047be7e2cfea85d59b
55004bebe032b7212892686d308adca2ac0e2723
2022-10-16T13:42:00Z
java
2022-10-17T02:28:58Z
dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/impl/ProcessDefinitionServiceImpl.java
} Schedule scheduleObj = scheduleMapper.queryByProcessDefinitionCode(oldProcessDefinitionCode); if (scheduleObj != null) { scheduleObj.setId(null); scheduleObj.setProcessDefinitionCode(processDefinition.getCode()); scheduleObj.setReleaseState(ReleaseState.OFFLINE); scheduleObj.setCreateTime(date); scheduleObj.setUpdateTime(date); int insertResult = scheduleMapper.insert(scheduleObj); if (insertResult != 1) { logger.error("Schedule create error, processDefinitionCode:{}.", processDefinition.getCode()); putMsg(result, Status.CREATE_SCHEDULE_ERROR); throw new ServiceException(Status.CREATE_SCHEDULE_ERROR); } } try { result.putAll(createDagDefine(loginUser, taskRelationList, processDefinition, taskDefinitionLogs, otherParamsJson)); } catch (Exception e) { logger.error("Copy process definition error, processDefinitionCode from {} to {}.", oldProcessDefinitionCode, processDefinition.getCode(), e); putMsg(result, Status.COPY_PROCESS_DEFINITION_ERROR); throw new ServiceException(Status.COPY_PROCESS_DEFINITION_ERROR); } } else { logger.info("Move process definition..."); try { result.putAll(updateDagDefine(loginUser, taskRelationList, processDefinition, null, Lists.newArrayList(), otherParamsJson));
closed
apache/dolphinscheduler
https://github.com/apache/dolphinscheduler
12,391
[Improvement][API] Workflow definitions that contain logical task nodes support the copy function
### Search before asking - [X] I had searched in the [issues](https://github.com/apache/dolphinscheduler/issues?q=is%3Aissue) and found no similar feature requirement. ### Description Currently, the system does not support the replication function of workflow definition including `CONDITIONS`, `SWITCH`, `SUB_PROCESS`, `DEPENDENT` four task nodes. <img width="1472" alt="image" src="https://user-images.githubusercontent.com/37063904/196038586-7e802eeb-2063-468f-83ae-430201149712.png"> ### Are you willing to submit a 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/12391
https://github.com/apache/dolphinscheduler/pull/12392
b7bd8d780356e055998fd0047be7e2cfea85d59b
55004bebe032b7212892686d308adca2ac0e2723
2022-10-16T13:42:00Z
java
2022-10-17T02:28:58Z
dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/impl/ProcessDefinitionServiceImpl.java
} catch (Exception e) { logger.error("Move process definition error, processDefinitionCode:{}.", processDefinition.getCode(), e); putMsg(result, Status.MOVE_PROCESS_DEFINITION_ERROR); throw new ServiceException(Status.MOVE_PROCESS_DEFINITION_ERROR); } } if (result.get(Constants.STATUS) != Status.SUCCESS) { failedProcessList.add(processDefinition.getCode() + "[" + processDefinition.getName() + "]"); } } } /** * get new Task name or Process name when copy or import operate * @param originalName Task or Process original name * @param suffix "_copy_" or "_import_" * @return new name */ public String getNewName(String originalName, String suffix) { StringBuilder newName = new StringBuilder(); String regex = String.format(".*%s\\d{17}$", suffix); if (originalName.matches(regex)) { return newName.append(originalName, 0, originalName.lastIndexOf(suffix)) .append(suffix) .append(DateUtils.getCurrentTimeStamp()) .toString(); } return newName.append(originalName) .append(suffix)
closed
apache/dolphinscheduler
https://github.com/apache/dolphinscheduler
12,391
[Improvement][API] Workflow definitions that contain logical task nodes support the copy function
### Search before asking - [X] I had searched in the [issues](https://github.com/apache/dolphinscheduler/issues?q=is%3Aissue) and found no similar feature requirement. ### Description Currently, the system does not support the replication function of workflow definition including `CONDITIONS`, `SWITCH`, `SUB_PROCESS`, `DEPENDENT` four task nodes. <img width="1472" alt="image" src="https://user-images.githubusercontent.com/37063904/196038586-7e802eeb-2063-468f-83ae-430201149712.png"> ### Are you willing to submit a 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/12391
https://github.com/apache/dolphinscheduler/pull/12392
b7bd8d780356e055998fd0047be7e2cfea85d59b
55004bebe032b7212892686d308adca2ac0e2723
2022-10-16T13:42:00Z
java
2022-10-17T02:28:58Z
dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/impl/ProcessDefinitionServiceImpl.java
.append(DateUtils.getCurrentTimeStamp()) .toString(); } /** * switch the defined process definition version * * @param loginUser login user * @param projectCode project code * @param code process definition code * @param version the version user want to switch * @return switch process definition version result code */ @Override @Transactional public Map<String, Object> switchProcessDefinitionVersion(User loginUser, long projectCode, long code, int version) { Project project = projectMapper.queryByCode(projectCode); Map<String, Object> result = projectService.checkProjectAndAuth(loginUser, project, projectCode, WORKFLOW_SWITCH_TO_THIS_VERSION); if (result.get(Constants.STATUS) != Status.SUCCESS) { return result; } ProcessDefinition processDefinition = processDefinitionMapper.queryByCode(code); if (Objects.isNull(processDefinition) || projectCode != processDefinition.getProjectCode()) { logger.error( "Switch process definition error because it does not exist, projectCode:{}, processDefinitionCode:{}.", projectCode, code); putMsg(result, Status.SWITCH_PROCESS_DEFINITION_VERSION_NOT_EXIST_PROCESS_DEFINITION_ERROR, code); return result;
closed
apache/dolphinscheduler
https://github.com/apache/dolphinscheduler
12,391
[Improvement][API] Workflow definitions that contain logical task nodes support the copy function
### Search before asking - [X] I had searched in the [issues](https://github.com/apache/dolphinscheduler/issues?q=is%3Aissue) and found no similar feature requirement. ### Description Currently, the system does not support the replication function of workflow definition including `CONDITIONS`, `SWITCH`, `SUB_PROCESS`, `DEPENDENT` four task nodes. <img width="1472" alt="image" src="https://user-images.githubusercontent.com/37063904/196038586-7e802eeb-2063-468f-83ae-430201149712.png"> ### Are you willing to submit a 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/12391
https://github.com/apache/dolphinscheduler/pull/12392
b7bd8d780356e055998fd0047be7e2cfea85d59b
55004bebe032b7212892686d308adca2ac0e2723
2022-10-16T13:42:00Z
java
2022-10-17T02:28:58Z
dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/impl/ProcessDefinitionServiceImpl.java
} ProcessDefinitionLog processDefinitionLog = processDefinitionLogMapper.queryByDefinitionCodeAndVersion(code, version); if (Objects.isNull(processDefinitionLog)) { logger.error( "Switch process definition error because version does not exist, projectCode:{}, processDefinitionCode:{}, version:{}.", projectCode, code, version); putMsg(result, Status.SWITCH_PROCESS_DEFINITION_VERSION_NOT_EXIST_PROCESS_DEFINITION_VERSION_ERROR, processDefinition.getCode(), version); return result; } int switchVersion = processService.switchVersion(processDefinition, processDefinitionLog); if (switchVersion <= 0) { logger.error( "Switch process definition version error, projectCode:{}, processDefinitionCode:{}, version:{}.", projectCode, code, version); putMsg(result, Status.SWITCH_PROCESS_DEFINITION_VERSION_ERROR); throw new ServiceException(Status.SWITCH_PROCESS_DEFINITION_VERSION_ERROR); } logger.info("Switch process definition version complete, projectCode:{}, processDefinitionCode:{}, version:{}.", projectCode, code, version); putMsg(result, Status.SUCCESS); return result; } /** * check batch operate result * * @param srcProjectCode srcProjectCode * @param targetProjectCode targetProjectCode * @param result result
closed
apache/dolphinscheduler
https://github.com/apache/dolphinscheduler
12,391
[Improvement][API] Workflow definitions that contain logical task nodes support the copy function
### Search before asking - [X] I had searched in the [issues](https://github.com/apache/dolphinscheduler/issues?q=is%3Aissue) and found no similar feature requirement. ### Description Currently, the system does not support the replication function of workflow definition including `CONDITIONS`, `SWITCH`, `SUB_PROCESS`, `DEPENDENT` four task nodes. <img width="1472" alt="image" src="https://user-images.githubusercontent.com/37063904/196038586-7e802eeb-2063-468f-83ae-430201149712.png"> ### Are you willing to submit a 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/12391
https://github.com/apache/dolphinscheduler/pull/12392
b7bd8d780356e055998fd0047be7e2cfea85d59b
55004bebe032b7212892686d308adca2ac0e2723
2022-10-16T13:42:00Z
java
2022-10-17T02:28:58Z
dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/impl/ProcessDefinitionServiceImpl.java
* @param failedProcessList failedProcessList * @param isCopy isCopy */ private void checkBatchOperateResult(long srcProjectCode, long targetProjectCode, Map<String, Object> result, List<String> failedProcessList, boolean isCopy) { if (!failedProcessList.isEmpty()) { String failedProcess = String.join(",", failedProcessList); if (isCopy) { logger.error( "Copy process definition error, srcProjectCode:{}, targetProjectCode:{}, failedProcessList:{}.", srcProjectCode, targetProjectCode, failedProcess); putMsg(result, Status.COPY_PROCESS_DEFINITION_ERROR, srcProjectCode, targetProjectCode, failedProcess); } else { logger.error( "Move process definition error, srcProjectCode:{}, targetProjectCode:{}, failedProcessList:{}.", srcProjectCode, targetProjectCode, failedProcess); putMsg(result, Status.MOVE_PROCESS_DEFINITION_ERROR, srcProjectCode, targetProjectCode, failedProcess); } } else { logger.info("Batch {} process definition complete, srcProjectCode:{}, targetProjectCode:{}.", isCopy ? "copy" : "move", srcProjectCode, targetProjectCode); putMsg(result, Status.SUCCESS); } } /** * query the pagination versions info by one certain process definition code * * @param loginUser login user info to check auth * @param projectCode project code * @param pageNo page number
closed
apache/dolphinscheduler
https://github.com/apache/dolphinscheduler
12,391
[Improvement][API] Workflow definitions that contain logical task nodes support the copy function
### Search before asking - [X] I had searched in the [issues](https://github.com/apache/dolphinscheduler/issues?q=is%3Aissue) and found no similar feature requirement. ### Description Currently, the system does not support the replication function of workflow definition including `CONDITIONS`, `SWITCH`, `SUB_PROCESS`, `DEPENDENT` four task nodes. <img width="1472" alt="image" src="https://user-images.githubusercontent.com/37063904/196038586-7e802eeb-2063-468f-83ae-430201149712.png"> ### Are you willing to submit a 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/12391
https://github.com/apache/dolphinscheduler/pull/12392
b7bd8d780356e055998fd0047be7e2cfea85d59b
55004bebe032b7212892686d308adca2ac0e2723
2022-10-16T13:42:00Z
java
2022-10-17T02:28:58Z
dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/impl/ProcessDefinitionServiceImpl.java
* @param pageSize page size * @param code process definition code * @return the pagination process definition versions info of the certain process definition */ @Override public Result queryProcessDefinitionVersions(User loginUser, long projectCode, int pageNo, int pageSize, long code) { Result result = new Result(); Project project = projectMapper.queryByCode(projectCode); Map<String, Object> checkResult = projectService.checkProjectAndAuth(loginUser, project, projectCode, VERSION_LIST); Status resultStatus = (Status) checkResult.get(Constants.STATUS); if (resultStatus != Status.SUCCESS) { putMsg(result, resultStatus); return result; } PageInfo<ProcessDefinitionLog> pageInfo = new PageInfo<>(pageNo, pageSize); Page<ProcessDefinitionLog> page = new Page<>(pageNo, pageSize); IPage<ProcessDefinitionLog> processDefinitionVersionsPaging = processDefinitionLogMapper.queryProcessDefinitionVersionsPaging(page, code, projectCode); List<ProcessDefinitionLog> processDefinitionLogs = processDefinitionVersionsPaging.getRecords(); pageInfo.setTotalList(processDefinitionLogs); pageInfo.setTotal((int) processDefinitionVersionsPaging.getTotal()); result.setData(pageInfo); putMsg(result, Status.SUCCESS); return result; } /** * delete one certain process definition by version number and process definition code
closed
apache/dolphinscheduler
https://github.com/apache/dolphinscheduler
12,391
[Improvement][API] Workflow definitions that contain logical task nodes support the copy function
### Search before asking - [X] I had searched in the [issues](https://github.com/apache/dolphinscheduler/issues?q=is%3Aissue) and found no similar feature requirement. ### Description Currently, the system does not support the replication function of workflow definition including `CONDITIONS`, `SWITCH`, `SUB_PROCESS`, `DEPENDENT` four task nodes. <img width="1472" alt="image" src="https://user-images.githubusercontent.com/37063904/196038586-7e802eeb-2063-468f-83ae-430201149712.png"> ### Are you willing to submit a 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/12391
https://github.com/apache/dolphinscheduler/pull/12392
b7bd8d780356e055998fd0047be7e2cfea85d59b
55004bebe032b7212892686d308adca2ac0e2723
2022-10-16T13:42:00Z
java
2022-10-17T02:28:58Z
dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/impl/ProcessDefinitionServiceImpl.java
* * @param loginUser login user info to check auth * @param projectCode project code * @param code process definition code * @param version version number * @return delete result code */ @Override @Transactional public Map<String, Object> deleteProcessDefinitionVersion(User loginUser, long projectCode, long code, int version) { Project project = projectMapper.queryByCode(projectCode); Map<String, Object> result = projectService.checkProjectAndAuth(loginUser, project, projectCode, VERSION_DELETE); if (result.get(Constants.STATUS) != Status.SUCCESS) { return result; } ProcessDefinition processDefinition = processDefinitionMapper.queryByCode(code); if (processDefinition == null || projectCode != processDefinition.getProjectCode()) { logger.error("Process definition does not exist, code:{}.", code); putMsg(result, Status.PROCESS_DEFINE_NOT_EXIST, String.valueOf(code)); } else { if (processDefinition.getVersion() == version) { logger.warn( "Process definition can not be deleted due to version is being used, projectCode:{}, processDefinitionCode:{}, version:{}.", projectCode, code, version); putMsg(result, Status.MAIN_TABLE_USING_VERSION); return result; }
closed
apache/dolphinscheduler
https://github.com/apache/dolphinscheduler
12,391
[Improvement][API] Workflow definitions that contain logical task nodes support the copy function
### Search before asking - [X] I had searched in the [issues](https://github.com/apache/dolphinscheduler/issues?q=is%3Aissue) and found no similar feature requirement. ### Description Currently, the system does not support the replication function of workflow definition including `CONDITIONS`, `SWITCH`, `SUB_PROCESS`, `DEPENDENT` four task nodes. <img width="1472" alt="image" src="https://user-images.githubusercontent.com/37063904/196038586-7e802eeb-2063-468f-83ae-430201149712.png"> ### Are you willing to submit a 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/12391
https://github.com/apache/dolphinscheduler/pull/12392
b7bd8d780356e055998fd0047be7e2cfea85d59b
55004bebe032b7212892686d308adca2ac0e2723
2022-10-16T13:42:00Z
java
2022-10-17T02:28:58Z
dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/impl/ProcessDefinitionServiceImpl.java
int deleteLog = processDefinitionLogMapper.deleteByProcessDefinitionCodeAndVersion(code, version); int deleteRelationLog = processTaskRelationLogMapper.deleteByCode(code, version); if (deleteLog == 0 || deleteRelationLog == 0) { logger.error( "Delete process definition version error, projectCode:{}, processDefinitionCode:{}, version:{}.", projectCode, code, version); putMsg(result, Status.DELETE_PROCESS_DEFINE_BY_CODE_ERROR); throw new ServiceException(Status.DELETE_PROCESS_DEFINE_BY_CODE_ERROR); } deleteOtherRelation(project, result, processDefinition); logger.info( "Delete process definition version complete, projectCode:{}, processDefinitionCode:{}, version:{}.", projectCode, code, version); putMsg(result, Status.SUCCESS); } return result; } /** * create empty process definition * * @param loginUser login user * @param projectCode project code * @param name process definition name * @param description description * @param globalParams globalParams * @param timeout timeout * @param tenantCode tenantCode * @param scheduleJson scheduleJson * @return process definition code */
closed
apache/dolphinscheduler
https://github.com/apache/dolphinscheduler
12,391
[Improvement][API] Workflow definitions that contain logical task nodes support the copy function
### Search before asking - [X] I had searched in the [issues](https://github.com/apache/dolphinscheduler/issues?q=is%3Aissue) and found no similar feature requirement. ### Description Currently, the system does not support the replication function of workflow definition including `CONDITIONS`, `SWITCH`, `SUB_PROCESS`, `DEPENDENT` four task nodes. <img width="1472" alt="image" src="https://user-images.githubusercontent.com/37063904/196038586-7e802eeb-2063-468f-83ae-430201149712.png"> ### Are you willing to submit a 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/12391
https://github.com/apache/dolphinscheduler/pull/12392
b7bd8d780356e055998fd0047be7e2cfea85d59b
55004bebe032b7212892686d308adca2ac0e2723
2022-10-16T13:42:00Z
java
2022-10-17T02:28:58Z
dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/impl/ProcessDefinitionServiceImpl.java
@Override @Transactional public Map<String, Object> createEmptyProcessDefinition(User loginUser, long projectCode, String name, String description, String globalParams, int timeout, String tenantCode, String scheduleJson, ProcessExecutionTypeEnum executionType) { Project project = projectMapper.queryByCode(projectCode); Map<String, Object> result = projectService.checkProjectAndAuth(loginUser, project, projectCode, WORKFLOW_CREATE); if (result.get(Constants.STATUS) != Status.SUCCESS) { return result; } if (checkDescriptionLength(description)) { logger.warn("Parameter description is too long."); putMsg(result, Status.DESCRIPTION_TOO_LONG_ERROR); return result; } ProcessDefinition definition = processDefinitionMapper.verifyByDefineName(project.getCode(), name); if (definition != null) { logger.warn("Process definition with the same name {} already exists, processDefinitionCode:{}.", definition.getName(), definition.getCode()); putMsg(result, Status.PROCESS_DEFINITION_NAME_EXIST, name); return result;
closed
apache/dolphinscheduler
https://github.com/apache/dolphinscheduler
12,391
[Improvement][API] Workflow definitions that contain logical task nodes support the copy function
### Search before asking - [X] I had searched in the [issues](https://github.com/apache/dolphinscheduler/issues?q=is%3Aissue) and found no similar feature requirement. ### Description Currently, the system does not support the replication function of workflow definition including `CONDITIONS`, `SWITCH`, `SUB_PROCESS`, `DEPENDENT` four task nodes. <img width="1472" alt="image" src="https://user-images.githubusercontent.com/37063904/196038586-7e802eeb-2063-468f-83ae-430201149712.png"> ### Are you willing to submit a 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/12391
https://github.com/apache/dolphinscheduler/pull/12392
b7bd8d780356e055998fd0047be7e2cfea85d59b
55004bebe032b7212892686d308adca2ac0e2723
2022-10-16T13:42:00Z
java
2022-10-17T02:28:58Z
dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/impl/ProcessDefinitionServiceImpl.java
} int tenantId = -1; if (!Constants.DEFAULT.equals(tenantCode)) { Tenant tenant = tenantMapper.queryByTenantCode(tenantCode); if (tenant == null) { logger.error("Tenant does not exist."); putMsg(result, Status.TENANT_NOT_EXIST); return result; } tenantId = tenant.getId(); } long processDefinitionCode; try { processDefinitionCode = CodeGenerateUtils.getInstance().genCode(); } catch (CodeGenerateException e) { logger.error("Generate process definition code error, projectCode:{}.", projectCode, e); putMsg(result, Status.INTERNAL_SERVER_ERROR_ARGS); return result; } ProcessDefinition processDefinition = new ProcessDefinition(projectCode, name, processDefinitionCode, description, globalParams, "", timeout, loginUser.getId(), tenantId); processDefinition.setExecutionType(executionType); result = createEmptyDagDefine(loginUser, processDefinition); if (result.get(Constants.STATUS) != Status.SUCCESS) { logger.error("Create empty process definition error."); return result; } if (StringUtils.isBlank(scheduleJson)) { return result;
closed
apache/dolphinscheduler
https://github.com/apache/dolphinscheduler
12,391
[Improvement][API] Workflow definitions that contain logical task nodes support the copy function
### Search before asking - [X] I had searched in the [issues](https://github.com/apache/dolphinscheduler/issues?q=is%3Aissue) and found no similar feature requirement. ### Description Currently, the system does not support the replication function of workflow definition including `CONDITIONS`, `SWITCH`, `SUB_PROCESS`, `DEPENDENT` four task nodes. <img width="1472" alt="image" src="https://user-images.githubusercontent.com/37063904/196038586-7e802eeb-2063-468f-83ae-430201149712.png"> ### Are you willing to submit a 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/12391
https://github.com/apache/dolphinscheduler/pull/12392
b7bd8d780356e055998fd0047be7e2cfea85d59b
55004bebe032b7212892686d308adca2ac0e2723
2022-10-16T13:42:00Z
java
2022-10-17T02:28:58Z
dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/impl/ProcessDefinitionServiceImpl.java
} Map<String, Object> scheduleResult = createDagSchedule(loginUser, processDefinition, scheduleJson); if (scheduleResult.get(Constants.STATUS) != Status.SUCCESS) { Status scheduleResultStatus = (Status) scheduleResult.get(Constants.STATUS); putMsg(result, scheduleResultStatus); throw new ServiceException(scheduleResultStatus); } return result; } protected Map<String, Object> createEmptyDagDefine(User loginUser, ProcessDefinition processDefinition) { Map<String, Object> result = new HashMap<>(); int insertVersion = processService.saveProcessDefine(loginUser, processDefinition, Boolean.TRUE, Boolean.TRUE); if (insertVersion == 0) { logger.error("Save process definition error, processDefinitionCode:{}.", processDefinition.getCode()); putMsg(result, Status.CREATE_PROCESS_DEFINITION_ERROR); throw new ServiceException(Status.CREATE_PROCESS_DEFINITION_ERROR); } putMsg(result, Status.SUCCESS); result.put(Constants.DATA_LIST, processDefinition); return result; } protected Map<String, Object> createDagSchedule(User loginUser, ProcessDefinition processDefinition, String scheduleJson) { Map<String, Object> result = new HashMap<>(); Schedule scheduleObj = JSONUtils.parseObject(scheduleJson, Schedule.class); if (scheduleObj == null) { putMsg(result, Status.DATA_IS_NOT_VALID, scheduleJson); throw new ServiceException(Status.DATA_IS_NOT_VALID); }
closed
apache/dolphinscheduler
https://github.com/apache/dolphinscheduler
12,391
[Improvement][API] Workflow definitions that contain logical task nodes support the copy function
### Search before asking - [X] I had searched in the [issues](https://github.com/apache/dolphinscheduler/issues?q=is%3Aissue) and found no similar feature requirement. ### Description Currently, the system does not support the replication function of workflow definition including `CONDITIONS`, `SWITCH`, `SUB_PROCESS`, `DEPENDENT` four task nodes. <img width="1472" alt="image" src="https://user-images.githubusercontent.com/37063904/196038586-7e802eeb-2063-468f-83ae-430201149712.png"> ### Are you willing to submit a 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/12391
https://github.com/apache/dolphinscheduler/pull/12392
b7bd8d780356e055998fd0047be7e2cfea85d59b
55004bebe032b7212892686d308adca2ac0e2723
2022-10-16T13:42:00Z
java
2022-10-17T02:28:58Z
dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/impl/ProcessDefinitionServiceImpl.java
Date now = new Date(); scheduleObj.setProcessDefinitionCode(processDefinition.getCode()); if (DateUtils.differSec(scheduleObj.getStartTime(), scheduleObj.getEndTime()) == 0) { logger.warn("The schedule start time must not be the same as the end, processDefinitionCode:{}.", processDefinition.getCode()); putMsg(result, Status.SCHEDULE_START_TIME_END_TIME_SAME); return result; } if (!org.quartz.CronExpression.isValidExpression(scheduleObj.getCrontab())) { logger.error("CronExpression verify failure, cron:{}.", scheduleObj.getCrontab()); putMsg(result, Status.REQUEST_PARAMS_NOT_VALID_ERROR, scheduleObj.getCrontab()); return result; } scheduleObj .setWarningType(scheduleObj.getWarningType() == null ? WarningType.NONE : scheduleObj.getWarningType()); scheduleObj.setWarningGroupId(scheduleObj.getWarningGroupId() == 0 ? 1 : scheduleObj.getWarningGroupId()); scheduleObj.setFailureStrategy( scheduleObj.getFailureStrategy() == null ? FailureStrategy.CONTINUE : scheduleObj.getFailureStrategy()); scheduleObj.setCreateTime(now); scheduleObj.setUpdateTime(now); scheduleObj.setUserId(loginUser.getId()); scheduleObj.setReleaseState(ReleaseState.OFFLINE); scheduleObj.setProcessInstancePriority(scheduleObj.getProcessInstancePriority() == null ? Priority.MEDIUM : scheduleObj.getProcessInstancePriority()); scheduleObj.setWorkerGroup(scheduleObj.getWorkerGroup() == null ? "default" : scheduleObj.getWorkerGroup()); scheduleObj .setEnvironmentCode(scheduleObj.getEnvironmentCode() == null ? -1 : scheduleObj.getEnvironmentCode()); scheduleMapper.insert(scheduleObj); putMsg(result, Status.SUCCESS); result.put("scheduleId", scheduleObj.getId());
closed
apache/dolphinscheduler
https://github.com/apache/dolphinscheduler
12,391
[Improvement][API] Workflow definitions that contain logical task nodes support the copy function
### Search before asking - [X] I had searched in the [issues](https://github.com/apache/dolphinscheduler/issues?q=is%3Aissue) and found no similar feature requirement. ### Description Currently, the system does not support the replication function of workflow definition including `CONDITIONS`, `SWITCH`, `SUB_PROCESS`, `DEPENDENT` four task nodes. <img width="1472" alt="image" src="https://user-images.githubusercontent.com/37063904/196038586-7e802eeb-2063-468f-83ae-430201149712.png"> ### Are you willing to submit a 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/12391
https://github.com/apache/dolphinscheduler/pull/12392
b7bd8d780356e055998fd0047be7e2cfea85d59b
55004bebe032b7212892686d308adca2ac0e2723
2022-10-16T13:42:00Z
java
2022-10-17T02:28:58Z
dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/impl/ProcessDefinitionServiceImpl.java
return result; } /** * update process definition basic info * * @param loginUser login user * @param projectCode project code * @param name process definition name * @param code process definition code * @param description description * @param globalParams globalParams * @param timeout timeout * @param tenantCode tenantCode * @param scheduleJson scheduleJson * @param otherParamsJson otherParamsJson handle other params * @param executionType executionType * @return update result code */ @Override @Transactional public Map<String, Object> updateProcessDefinitionBasicInfo(User loginUser, long projectCode, String name, long code, String description, String globalParams, int timeout, String tenantCode, String scheduleJson, String otherParamsJson,
closed
apache/dolphinscheduler
https://github.com/apache/dolphinscheduler
12,391
[Improvement][API] Workflow definitions that contain logical task nodes support the copy function
### Search before asking - [X] I had searched in the [issues](https://github.com/apache/dolphinscheduler/issues?q=is%3Aissue) and found no similar feature requirement. ### Description Currently, the system does not support the replication function of workflow definition including `CONDITIONS`, `SWITCH`, `SUB_PROCESS`, `DEPENDENT` four task nodes. <img width="1472" alt="image" src="https://user-images.githubusercontent.com/37063904/196038586-7e802eeb-2063-468f-83ae-430201149712.png"> ### Are you willing to submit a 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/12391
https://github.com/apache/dolphinscheduler/pull/12392
b7bd8d780356e055998fd0047be7e2cfea85d59b
55004bebe032b7212892686d308adca2ac0e2723
2022-10-16T13:42:00Z
java
2022-10-17T02:28:58Z
dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/impl/ProcessDefinitionServiceImpl.java
ProcessExecutionTypeEnum executionType) { Project project = projectMapper.queryByCode(projectCode); Map<String, Object> result = projectService.checkProjectAndAuth(loginUser, project, projectCode, WORKFLOW_UPDATE); if (result.get(Constants.STATUS) != Status.SUCCESS) { return result; } if (checkDescriptionLength(description)) { logger.warn("Parameter description is too long."); putMsg(result, Status.DESCRIPTION_TOO_LONG_ERROR); return result; } int tenantId = -1; if (!Constants.DEFAULT.equals(tenantCode)) { Tenant tenant = tenantMapper.queryByTenantCode(tenantCode); if (tenant == null) { logger.error("Tenant does not exist."); putMsg(result, Status.TENANT_NOT_EXIST); return result; } tenantId = tenant.getId(); } ProcessDefinition processDefinition = processDefinitionMapper.queryByCode(code); if (processDefinition == null || projectCode != processDefinition.getProjectCode()) { logger.error("Process definition does not exist, code:{}.", code); putMsg(result, Status.PROCESS_DEFINE_NOT_EXIST, String.valueOf(code)); return result; }
closed
apache/dolphinscheduler
https://github.com/apache/dolphinscheduler
12,391
[Improvement][API] Workflow definitions that contain logical task nodes support the copy function
### Search before asking - [X] I had searched in the [issues](https://github.com/apache/dolphinscheduler/issues?q=is%3Aissue) and found no similar feature requirement. ### Description Currently, the system does not support the replication function of workflow definition including `CONDITIONS`, `SWITCH`, `SUB_PROCESS`, `DEPENDENT` four task nodes. <img width="1472" alt="image" src="https://user-images.githubusercontent.com/37063904/196038586-7e802eeb-2063-468f-83ae-430201149712.png"> ### Are you willing to submit a 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/12391
https://github.com/apache/dolphinscheduler/pull/12392
b7bd8d780356e055998fd0047be7e2cfea85d59b
55004bebe032b7212892686d308adca2ac0e2723
2022-10-16T13:42:00Z
java
2022-10-17T02:28:58Z
dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/impl/ProcessDefinitionServiceImpl.java
if (processDefinition.getReleaseState() == ReleaseState.ONLINE) { logger.warn("Process definition is not allowed to be modified due to {}, processDefinitionCode:{}.", ReleaseState.ONLINE.getDescp(), processDefinition.getCode()); putMsg(result, Status.PROCESS_DEFINE_NOT_ALLOWED_EDIT, processDefinition.getName()); return result; } if (!name.equals(processDefinition.getName())) { ProcessDefinition definition = processDefinitionMapper.verifyByDefineName(project.getCode(), name); if (definition != null) { logger.warn("Process definition with the same name {} already exists, processDefinitionCode:{}.", definition.getName(), definition.getCode()); putMsg(result, Status.PROCESS_DEFINITION_NAME_EXIST, name); return result; } } ProcessDefinition processDefinitionDeepCopy = JSONUtils.parseObject(JSONUtils.toJsonString(processDefinition), ProcessDefinition.class); processDefinition.set(projectCode, name, description, globalParams, "", timeout, tenantId); processDefinition.setExecutionType(executionType); List<ProcessTaskRelationLog> taskRelationList = processTaskRelationLogMapper .queryByProcessCodeAndVersion(processDefinition.getCode(), processDefinition.getVersion()); result = updateDagDefine(loginUser, taskRelationList, processDefinition, processDefinitionDeepCopy, Lists.newArrayList(), otherParamsJson); if (result.get(Constants.STATUS) != Status.SUCCESS) { logger.error("Update process definition basic info error."); return result; } if (StringUtils.isBlank(scheduleJson)) {
closed
apache/dolphinscheduler
https://github.com/apache/dolphinscheduler
12,391
[Improvement][API] Workflow definitions that contain logical task nodes support the copy function
### Search before asking - [X] I had searched in the [issues](https://github.com/apache/dolphinscheduler/issues?q=is%3Aissue) and found no similar feature requirement. ### Description Currently, the system does not support the replication function of workflow definition including `CONDITIONS`, `SWITCH`, `SUB_PROCESS`, `DEPENDENT` four task nodes. <img width="1472" alt="image" src="https://user-images.githubusercontent.com/37063904/196038586-7e802eeb-2063-468f-83ae-430201149712.png"> ### Are you willing to submit a 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/12391
https://github.com/apache/dolphinscheduler/pull/12392
b7bd8d780356e055998fd0047be7e2cfea85d59b
55004bebe032b7212892686d308adca2ac0e2723
2022-10-16T13:42:00Z
java
2022-10-17T02:28:58Z
dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/impl/ProcessDefinitionServiceImpl.java
return result; } Map<String, Object> scheduleResult = updateDagSchedule(loginUser, projectCode, code, scheduleJson); if (scheduleResult.get(Constants.STATUS) != Status.SUCCESS) { Status scheduleResultStatus = (Status) scheduleResult.get(Constants.STATUS); putMsg(result, scheduleResultStatus); throw new ServiceException(scheduleResultStatus); } return result; } private void updateWorkflowValid(User user, ProcessDefinition oldProcessDefinition, ProcessDefinition newProcessDefinition) { if (oldProcessDefinition.getReleaseState() == ReleaseState.ONLINE) { throw new ServiceException(Status.PROCESS_DEFINE_NOT_ALLOWED_EDIT, oldProcessDefinition.getName()); } Project project = projectMapper.queryByCode(oldProcessDefinition.getProjectCode()); projectService.checkProjectAndAuthThrowException(user, project, WORKFLOW_UPDATE); if (checkDescriptionLength(newProcessDefinition.getDescription())) { throw new ServiceException(Status.DESCRIPTION_TOO_LONG_ERROR); } if (!oldProcessDefinition.getName().equals(newProcessDefinition.getName())) { ProcessDefinition definition = processDefinitionMapper .verifyByDefineName(newProcessDefinition.getProjectCode(), newProcessDefinition.getName()); if (definition != null) { throw new ServiceException(Status.PROCESS_DEFINITION_NAME_EXIST, newProcessDefinition.getName()); }
closed
apache/dolphinscheduler
https://github.com/apache/dolphinscheduler
12,391
[Improvement][API] Workflow definitions that contain logical task nodes support the copy function
### Search before asking - [X] I had searched in the [issues](https://github.com/apache/dolphinscheduler/issues?q=is%3Aissue) and found no similar feature requirement. ### Description Currently, the system does not support the replication function of workflow definition including `CONDITIONS`, `SWITCH`, `SUB_PROCESS`, `DEPENDENT` four task nodes. <img width="1472" alt="image" src="https://user-images.githubusercontent.com/37063904/196038586-7e802eeb-2063-468f-83ae-430201149712.png"> ### Are you willing to submit a 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/12391
https://github.com/apache/dolphinscheduler/pull/12392
b7bd8d780356e055998fd0047be7e2cfea85d59b
55004bebe032b7212892686d308adca2ac0e2723
2022-10-16T13:42:00Z
java
2022-10-17T02:28:58Z
dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/impl/ProcessDefinitionServiceImpl.java
} } /** * update single resource workflow * * @param loginUser login user * @param workflowCode workflow resource code want to update * @param workflowUpdateRequest workflow update resource object * @return Process definition */ @Override @Transactional public ProcessDefinition updateSingleProcessDefinition(User loginUser, long workflowCode, WorkflowUpdateRequest workflowUpdateRequest) { ProcessDefinition processDefinition = processDefinitionMapper.queryByCode(workflowCode); if (processDefinition == null) { throw new ServiceException(Status.PROCESS_DEFINE_NOT_EXIST, workflowCode); } ProcessDefinition processDefinitionUpdate = workflowUpdateRequest.mergeIntoProcessDefinition(processDefinition); this.updateWorkflowValid(loginUser, processDefinition, processDefinitionUpdate); if (processDefinitionUpdate.getTenantCode() != null) { Tenant tenant = tenantMapper.queryByTenantCode(processDefinitionUpdate.getTenantCode()); if (tenant == null) { throw new ServiceException(Status.TENANT_NOT_EXIST); } processDefinitionUpdate.setTenantId(tenant.getId()); } int update = processDefinitionMapper.updateById(processDefinitionUpdate);
closed
apache/dolphinscheduler
https://github.com/apache/dolphinscheduler
12,391
[Improvement][API] Workflow definitions that contain logical task nodes support the copy function
### Search before asking - [X] I had searched in the [issues](https://github.com/apache/dolphinscheduler/issues?q=is%3Aissue) and found no similar feature requirement. ### Description Currently, the system does not support the replication function of workflow definition including `CONDITIONS`, `SWITCH`, `SUB_PROCESS`, `DEPENDENT` four task nodes. <img width="1472" alt="image" src="https://user-images.githubusercontent.com/37063904/196038586-7e802eeb-2063-468f-83ae-430201149712.png"> ### Are you willing to submit a 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/12391
https://github.com/apache/dolphinscheduler/pull/12392
b7bd8d780356e055998fd0047be7e2cfea85d59b
55004bebe032b7212892686d308adca2ac0e2723
2022-10-16T13:42:00Z
java
2022-10-17T02:28:58Z
dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/impl/ProcessDefinitionServiceImpl.java
if (update <= 0) { throw new ServiceException(Status.UPDATE_PROCESS_DEFINITION_ERROR); } this.syncObj2Log(loginUser, processDefinition); return processDefinition; } protected Map<String, Object> updateDagSchedule(User loginUser, long projectCode, long processDefinitionCode, String scheduleJson) { Map<String, Object> result = new HashMap<>(); Schedule schedule = JSONUtils.parseObject(scheduleJson, Schedule.class); if (schedule == null) { putMsg(result, Status.DATA_IS_NOT_VALID, scheduleJson); throw new ServiceException(Status.DATA_IS_NOT_VALID); } FailureStrategy failureStrategy = schedule.getFailureStrategy() == null ? FailureStrategy.CONTINUE : schedule.getFailureStrategy(); WarningType warningType = schedule.getWarningType() == null ? WarningType.NONE : schedule.getWarningType(); Priority processInstancePriority = schedule.getProcessInstancePriority() == null ? Priority.MEDIUM : schedule.getProcessInstancePriority(); int warningGroupId = schedule.getWarningGroupId() == 0 ? 1 : schedule.getWarningGroupId(); String workerGroup = schedule.getWorkerGroup() == null ? "default" : schedule.getWorkerGroup(); long environmentCode = schedule.getEnvironmentCode() == null ? -1 : schedule.getEnvironmentCode(); ScheduleParam param = new ScheduleParam(); param.setStartTime(schedule.getStartTime()); param.setEndTime(schedule.getEndTime()); param.setCrontab(schedule.getCrontab()); param.setTimezoneId(schedule.getTimezoneId());
closed
apache/dolphinscheduler
https://github.com/apache/dolphinscheduler
12,391
[Improvement][API] Workflow definitions that contain logical task nodes support the copy function
### Search before asking - [X] I had searched in the [issues](https://github.com/apache/dolphinscheduler/issues?q=is%3Aissue) and found no similar feature requirement. ### Description Currently, the system does not support the replication function of workflow definition including `CONDITIONS`, `SWITCH`, `SUB_PROCESS`, `DEPENDENT` four task nodes. <img width="1472" alt="image" src="https://user-images.githubusercontent.com/37063904/196038586-7e802eeb-2063-468f-83ae-430201149712.png"> ### Are you willing to submit a 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/12391
https://github.com/apache/dolphinscheduler/pull/12392
b7bd8d780356e055998fd0047be7e2cfea85d59b
55004bebe032b7212892686d308adca2ac0e2723
2022-10-16T13:42:00Z
java
2022-10-17T02:28:58Z
dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/impl/ProcessDefinitionServiceImpl.java
return schedulerService.updateScheduleByProcessDefinitionCode( loginUser, projectCode, processDefinitionCode, JSONUtils.toJsonString(param), warningType, warningGroupId, failureStrategy, processInstancePriority, workerGroup, environmentCode); } /** * release process definition and schedule * * @param loginUser login user * @param projectCode project code * @param code process definition code * @param releaseState releaseState * @return update result code */ @Transactional @Override public Map<String, Object> releaseWorkflowAndSchedule(User loginUser, long projectCode, long code, ReleaseState releaseState) { Project project = projectMapper.queryByCode(projectCode); Map<String, Object> result = projectService.checkProjectAndAuth(loginUser, project, projectCode, WORKFLOW_ONLINE_OFFLINE); if (result.get(Constants.STATUS) != Status.SUCCESS) {
closed
apache/dolphinscheduler
https://github.com/apache/dolphinscheduler
12,391
[Improvement][API] Workflow definitions that contain logical task nodes support the copy function
### Search before asking - [X] I had searched in the [issues](https://github.com/apache/dolphinscheduler/issues?q=is%3Aissue) and found no similar feature requirement. ### Description Currently, the system does not support the replication function of workflow definition including `CONDITIONS`, `SWITCH`, `SUB_PROCESS`, `DEPENDENT` four task nodes. <img width="1472" alt="image" src="https://user-images.githubusercontent.com/37063904/196038586-7e802eeb-2063-468f-83ae-430201149712.png"> ### Are you willing to submit a 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/12391
https://github.com/apache/dolphinscheduler/pull/12392
b7bd8d780356e055998fd0047be7e2cfea85d59b
55004bebe032b7212892686d308adca2ac0e2723
2022-10-16T13:42:00Z
java
2022-10-17T02:28:58Z
dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/impl/ProcessDefinitionServiceImpl.java
return result; } if (null == releaseState) { putMsg(result, Status.REQUEST_PARAMS_NOT_VALID_ERROR, RELEASESTATE); return result; } ProcessDefinition processDefinition = processDefinitionMapper.queryByCode(code); if (processDefinition == null) { logger.error("Process definition does not exist, code:{}.", code); putMsg(result, Status.PROCESS_DEFINE_NOT_EXIST, String.valueOf(code)); return result; } Schedule scheduleObj = scheduleMapper.queryByProcessDefinitionCode(code); if (scheduleObj == null) { logger.error("Schedule cron does not exist, processDefinitionCode:{}.", code); putMsg(result, Status.SCHEDULE_CRON_NOT_EXISTS, "processDefinitionCode:" + code); return result; } switch (releaseState) { case ONLINE: List<ProcessTaskRelation> relationList = processService.findRelationByCode(code, processDefinition.getVersion()); if (CollectionUtils.isEmpty(relationList)) { logger.warn("Process definition has no task relation, processDefinitionCode:{}.", code); putMsg(result, Status.PROCESS_DAG_IS_EMPTY); return result; } processDefinition.setReleaseState(releaseState); processDefinitionMapper.updateById(processDefinition);
closed
apache/dolphinscheduler
https://github.com/apache/dolphinscheduler
12,391
[Improvement][API] Workflow definitions that contain logical task nodes support the copy function
### Search before asking - [X] I had searched in the [issues](https://github.com/apache/dolphinscheduler/issues?q=is%3Aissue) and found no similar feature requirement. ### Description Currently, the system does not support the replication function of workflow definition including `CONDITIONS`, `SWITCH`, `SUB_PROCESS`, `DEPENDENT` four task nodes. <img width="1472" alt="image" src="https://user-images.githubusercontent.com/37063904/196038586-7e802eeb-2063-468f-83ae-430201149712.png"> ### Are you willing to submit a 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/12391
https://github.com/apache/dolphinscheduler/pull/12392
b7bd8d780356e055998fd0047be7e2cfea85d59b
55004bebe032b7212892686d308adca2ac0e2723
2022-10-16T13:42:00Z
java
2022-10-17T02:28:58Z
dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/impl/ProcessDefinitionServiceImpl.java
schedulerService.setScheduleState(loginUser, projectCode, scheduleObj.getId(), ReleaseState.ONLINE); break; case OFFLINE: processDefinition.setReleaseState(releaseState); int updateProcess = processDefinitionMapper.updateById(processDefinition); if (updateProcess > 0) { logger.info("Set schedule offline, projectCode:{}, processDefinitionCode:{}, scheduleId:{}.", projectCode, code, scheduleObj.getId()); scheduleObj.setReleaseState(ReleaseState.OFFLINE); int updateSchedule = scheduleMapper.updateById(scheduleObj); if (updateSchedule == 0) { logger.error( "Set schedule offline error, projectCode:{}, processDefinitionCode:{}, scheduleId:{}", projectCode, code, scheduleObj.getId()); putMsg(result, Status.OFFLINE_SCHEDULE_ERROR); throw new ServiceException(Status.OFFLINE_SCHEDULE_ERROR); } schedulerService.deleteSchedule(project.getId(), scheduleObj.getId()); } break; default: putMsg(result, Status.REQUEST_PARAMS_NOT_VALID_ERROR, RELEASESTATE); return result; } putMsg(result, Status.SUCCESS); return result; } /** * save other relation
closed
apache/dolphinscheduler
https://github.com/apache/dolphinscheduler
12,391
[Improvement][API] Workflow definitions that contain logical task nodes support the copy function
### Search before asking - [X] I had searched in the [issues](https://github.com/apache/dolphinscheduler/issues?q=is%3Aissue) and found no similar feature requirement. ### Description Currently, the system does not support the replication function of workflow definition including `CONDITIONS`, `SWITCH`, `SUB_PROCESS`, `DEPENDENT` four task nodes. <img width="1472" alt="image" src="https://user-images.githubusercontent.com/37063904/196038586-7e802eeb-2063-468f-83ae-430201149712.png"> ### Are you willing to submit a 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/12391
https://github.com/apache/dolphinscheduler/pull/12392
b7bd8d780356e055998fd0047be7e2cfea85d59b
55004bebe032b7212892686d308adca2ac0e2723
2022-10-16T13:42:00Z
java
2022-10-17T02:28:58Z
dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/impl/ProcessDefinitionServiceImpl.java
* @param loginUser * @param processDefinition * @param result * @param otherParamsJson */ @Override public void saveOtherRelation(User loginUser, ProcessDefinition processDefinition, Map<String, Object> result, String otherParamsJson) { } /** * get Json String * @param loginUser * @param processDefinition * @return Json String */ @Override public String doOtherOperateProcess(User loginUser, ProcessDefinition processDefinition) { return null; } /** * delete other relation * @param project * @param result * @param processDefinition */ @Override public void deleteOtherRelation(Project project, Map<String, Object> result, ProcessDefinition processDefinition) { } }
closed
apache/dolphinscheduler
https://github.com/apache/dolphinscheduler
12,391
[Improvement][API] Workflow definitions that contain logical task nodes support the copy function
### Search before asking - [X] I had searched in the [issues](https://github.com/apache/dolphinscheduler/issues?q=is%3Aissue) and found no similar feature requirement. ### Description Currently, the system does not support the replication function of workflow definition including `CONDITIONS`, `SWITCH`, `SUB_PROCESS`, `DEPENDENT` four task nodes. <img width="1472" alt="image" src="https://user-images.githubusercontent.com/37063904/196038586-7e802eeb-2063-468f-83ae-430201149712.png"> ### Are you willing to submit a 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/12391
https://github.com/apache/dolphinscheduler/pull/12392
b7bd8d780356e055998fd0047be7e2cfea85d59b
55004bebe032b7212892686d308adca2ac0e2723
2022-10-16T13:42:00Z
java
2022-10-17T02:28:58Z
dolphinscheduler-task-plugin/dolphinscheduler-task-api/src/main/java/org/apache/dolphinscheduler/plugin/task/api/TaskConstants.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.plugin.task.api; import java.time.Duration; import java.util.Arrays; import java.util.List; public class TaskConstants {
closed
apache/dolphinscheduler
https://github.com/apache/dolphinscheduler
12,391
[Improvement][API] Workflow definitions that contain logical task nodes support the copy function
### Search before asking - [X] I had searched in the [issues](https://github.com/apache/dolphinscheduler/issues?q=is%3Aissue) and found no similar feature requirement. ### Description Currently, the system does not support the replication function of workflow definition including `CONDITIONS`, `SWITCH`, `SUB_PROCESS`, `DEPENDENT` four task nodes. <img width="1472" alt="image" src="https://user-images.githubusercontent.com/37063904/196038586-7e802eeb-2063-468f-83ae-430201149712.png"> ### Are you willing to submit a 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/12391
https://github.com/apache/dolphinscheduler/pull/12392
b7bd8d780356e055998fd0047be7e2cfea85d59b
55004bebe032b7212892686d308adca2ac0e2723
2022-10-16T13:42:00Z
java
2022-10-17T02:28:58Z
dolphinscheduler-task-plugin/dolphinscheduler-task-api/src/main/java/org/apache/dolphinscheduler/plugin/task/api/TaskConstants.java
private TaskConstants() { throw new IllegalStateException("Utility class"); } public static final String YARN_APPLICATION_REGEX = "application_\\d+_\\d+"; public static final String FLINK_APPLICATION_REGEX = "JobID \\w+"; public static final String SETVALUE_REGEX = "[\\$#]\\{setValue\\(([^)]*)\\)}"; /** * string false */ public static final String STRING_FALSE = "false"; /** * exit code kill */ public static final int EXIT_CODE_KILL = 137; public static final String PID = "pid"; /** * QUESTION ? */ public static final String QUESTION = "?"; /** * comma , */
closed
apache/dolphinscheduler
https://github.com/apache/dolphinscheduler
12,391
[Improvement][API] Workflow definitions that contain logical task nodes support the copy function
### Search before asking - [X] I had searched in the [issues](https://github.com/apache/dolphinscheduler/issues?q=is%3Aissue) and found no similar feature requirement. ### Description Currently, the system does not support the replication function of workflow definition including `CONDITIONS`, `SWITCH`, `SUB_PROCESS`, `DEPENDENT` four task nodes. <img width="1472" alt="image" src="https://user-images.githubusercontent.com/37063904/196038586-7e802eeb-2063-468f-83ae-430201149712.png"> ### Are you willing to submit a 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/12391
https://github.com/apache/dolphinscheduler/pull/12392
b7bd8d780356e055998fd0047be7e2cfea85d59b
55004bebe032b7212892686d308adca2ac0e2723
2022-10-16T13:42:00Z
java
2022-10-17T02:28:58Z
dolphinscheduler-task-plugin/dolphinscheduler-task-api/src/main/java/org/apache/dolphinscheduler/plugin/task/api/TaskConstants.java
public static final String COMMA = ","; /** * hyphen */ public static final String HYPHEN = "-"; /** * slash / */ public static final String SLASH = "/"; /** * COLON : */ public static final String COLON = ":"; /** * SPACE " " */ public static final String SPACE = " "; /** * SINGLE_SLASH / */ public static final String SINGLE_SLASH = "/"; /** * DOUBLE_SLASH // */ public static final String DOUBLE_SLASH = "//"; /** * SINGLE_QUOTES "'" */ public static final String SINGLE_QUOTES = "'"; /**
closed
apache/dolphinscheduler
https://github.com/apache/dolphinscheduler
12,391
[Improvement][API] Workflow definitions that contain logical task nodes support the copy function
### Search before asking - [X] I had searched in the [issues](https://github.com/apache/dolphinscheduler/issues?q=is%3Aissue) and found no similar feature requirement. ### Description Currently, the system does not support the replication function of workflow definition including `CONDITIONS`, `SWITCH`, `SUB_PROCESS`, `DEPENDENT` four task nodes. <img width="1472" alt="image" src="https://user-images.githubusercontent.com/37063904/196038586-7e802eeb-2063-468f-83ae-430201149712.png"> ### Are you willing to submit a 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/12391
https://github.com/apache/dolphinscheduler/pull/12392
b7bd8d780356e055998fd0047be7e2cfea85d59b
55004bebe032b7212892686d308adca2ac0e2723
2022-10-16T13:42:00Z
java
2022-10-17T02:28:58Z
dolphinscheduler-task-plugin/dolphinscheduler-task-api/src/main/java/org/apache/dolphinscheduler/plugin/task/api/TaskConstants.java
* DOUBLE_QUOTES "\"" */ public static final String DOUBLE_QUOTES = "\""; /** * SEMICOLON ; */ public static final String SEMICOLON = ";"; /** * EQUAL SIGN */ public static final String EQUAL_SIGN = "="; /** * AT SIGN */ public static final String AT_SIGN = "@"; /** * UNDERLINE */ public static final String UNDERLINE = "_"; /** * sleep time */ public static final int SLEEP_TIME_MILLIS = 1000; /** * exit code failure */ public static final int EXIT_CODE_FAILURE = -1; /** * exit code success */
closed
apache/dolphinscheduler
https://github.com/apache/dolphinscheduler
12,391
[Improvement][API] Workflow definitions that contain logical task nodes support the copy function
### Search before asking - [X] I had searched in the [issues](https://github.com/apache/dolphinscheduler/issues?q=is%3Aissue) and found no similar feature requirement. ### Description Currently, the system does not support the replication function of workflow definition including `CONDITIONS`, `SWITCH`, `SUB_PROCESS`, `DEPENDENT` four task nodes. <img width="1472" alt="image" src="https://user-images.githubusercontent.com/37063904/196038586-7e802eeb-2063-468f-83ae-430201149712.png"> ### Are you willing to submit a 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/12391
https://github.com/apache/dolphinscheduler/pull/12392
b7bd8d780356e055998fd0047be7e2cfea85d59b
55004bebe032b7212892686d308adca2ac0e2723
2022-10-16T13:42:00Z
java
2022-10-17T02:28:58Z
dolphinscheduler-task-plugin/dolphinscheduler-task-api/src/main/java/org/apache/dolphinscheduler/plugin/task/api/TaskConstants.java
public static final int EXIT_CODE_SUCCESS = 0; /** * running code */ public static final int RUNNING_CODE = 1; public static final String SH = "sh"; /** * default log cache rows num,output when reach the number */ public static final int DEFAULT_LOG_ROWS_NUM = 4 * 16; /** * log flush interval?output when reach the interval */ public static final int DEFAULT_LOG_FLUSH_INTERVAL = 1000; /** * pstree, get pud and sub pid */ public static final String PSTREE = "pstree"; public static final String RWXR_XR_X = "rwxr-xr-x"; /** * task log info format */ public static final String TASK_LOG_LOGGER_NAME = "TaskLogLogger"; /** * task log logger name format */ public static final String TASK_LOG_LOGGER_NAME_FORMAT = TASK_LOG_LOGGER_NAME + "-%s"; /** * Task Logger's prefix */
closed
apache/dolphinscheduler
https://github.com/apache/dolphinscheduler
12,391
[Improvement][API] Workflow definitions that contain logical task nodes support the copy function
### Search before asking - [X] I had searched in the [issues](https://github.com/apache/dolphinscheduler/issues?q=is%3Aissue) and found no similar feature requirement. ### Description Currently, the system does not support the replication function of workflow definition including `CONDITIONS`, `SWITCH`, `SUB_PROCESS`, `DEPENDENT` four task nodes. <img width="1472" alt="image" src="https://user-images.githubusercontent.com/37063904/196038586-7e802eeb-2063-468f-83ae-430201149712.png"> ### Are you willing to submit a 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/12391
https://github.com/apache/dolphinscheduler/pull/12392
b7bd8d780356e055998fd0047be7e2cfea85d59b
55004bebe032b7212892686d308adca2ac0e2723
2022-10-16T13:42:00Z
java
2022-10-17T02:28:58Z
dolphinscheduler-task-plugin/dolphinscheduler-task-api/src/main/java/org/apache/dolphinscheduler/plugin/task/api/TaskConstants.java
public static final String TASK_LOGGER_INFO_PREFIX = "TASK"; /** * Task Logger Thread's name */ public static final String TASK_APPID_LOG_FORMAT = "taskAppId"; /** * get output log service */ public static final String GET_OUTPUT_LOG_SERVICE = "-getOutputLogService"; /** * date format of yyyyMMdd */ public static final String PARAMETER_FORMAT_DATE = "yyyyMMdd"; /** * date format of yyyyMMddHHmmss */ public static final String PARAMETER_FORMAT_TIME = "yyyyMMddHHmmss"; /** * new * schedule time */ public static final String PARAMETER_SHECDULE_TIME = "schedule.time"; /** * system date(yyyyMMddHHmmss) */ public static final String PARAMETER_DATETIME = "system.datetime"; /** * system date(yyyymmdd) today */ public static final String PARAMETER_CURRENT_DATE = "system.biz.curdate";
closed
apache/dolphinscheduler
https://github.com/apache/dolphinscheduler
12,391
[Improvement][API] Workflow definitions that contain logical task nodes support the copy function
### Search before asking - [X] I had searched in the [issues](https://github.com/apache/dolphinscheduler/issues?q=is%3Aissue) and found no similar feature requirement. ### Description Currently, the system does not support the replication function of workflow definition including `CONDITIONS`, `SWITCH`, `SUB_PROCESS`, `DEPENDENT` four task nodes. <img width="1472" alt="image" src="https://user-images.githubusercontent.com/37063904/196038586-7e802eeb-2063-468f-83ae-430201149712.png"> ### Are you willing to submit a 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/12391
https://github.com/apache/dolphinscheduler/pull/12392
b7bd8d780356e055998fd0047be7e2cfea85d59b
55004bebe032b7212892686d308adca2ac0e2723
2022-10-16T13:42:00Z
java
2022-10-17T02:28:58Z
dolphinscheduler-task-plugin/dolphinscheduler-task-api/src/main/java/org/apache/dolphinscheduler/plugin/task/api/TaskConstants.java
/** * system date(yyyymmdd) yesterday */ public static final String PARAMETER_BUSINESS_DATE = "system.biz.date"; /** * the absolute path of current executing task */ public static final String PARAMETER_TASK_EXECUTE_PATH = "system.task.execute.path"; /** * the instance id of current task */ public static final String PARAMETER_TASK_INSTANCE_ID = "system.task.instance.id"; /** * month_begin */ public static final String MONTH_BEGIN = "month_begin"; /** * add_months */ public static final String ADD_MONTHS = "add_months"; /** * month_end */ public static final String MONTH_END = "month_end"; /** * week_begin */ public static final String WEEK_BEGIN = "week_begin"; /** * week_end
closed
apache/dolphinscheduler
https://github.com/apache/dolphinscheduler
12,391
[Improvement][API] Workflow definitions that contain logical task nodes support the copy function
### Search before asking - [X] I had searched in the [issues](https://github.com/apache/dolphinscheduler/issues?q=is%3Aissue) and found no similar feature requirement. ### Description Currently, the system does not support the replication function of workflow definition including `CONDITIONS`, `SWITCH`, `SUB_PROCESS`, `DEPENDENT` four task nodes. <img width="1472" alt="image" src="https://user-images.githubusercontent.com/37063904/196038586-7e802eeb-2063-468f-83ae-430201149712.png"> ### Are you willing to submit a 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/12391
https://github.com/apache/dolphinscheduler/pull/12392
b7bd8d780356e055998fd0047be7e2cfea85d59b
55004bebe032b7212892686d308adca2ac0e2723
2022-10-16T13:42:00Z
java
2022-10-17T02:28:58Z
dolphinscheduler-task-plugin/dolphinscheduler-task-api/src/main/java/org/apache/dolphinscheduler/plugin/task/api/TaskConstants.java
*/ public static final String WEEK_END = "week_end"; /** * this_day */ public static final String THIS_DAY = "this_day"; /** * last_day */ public static final String LAST_DAY = "last_day"; /** * month_first_day */ public static final String MONTH_FIRST_DAY = "month_first_day"; /** * month_last_day */ public static final String MONTH_LAST_DAY = "month_last_day"; /** * week_first_day */ public static final String WEEK_FIRST_DAY = "week_first_day"; /** * week_last_day */ public static final String WEEK_LAST_DAY = "week_last_day"; /** * year_week * */
closed
apache/dolphinscheduler
https://github.com/apache/dolphinscheduler
12,391
[Improvement][API] Workflow definitions that contain logical task nodes support the copy function
### Search before asking - [X] I had searched in the [issues](https://github.com/apache/dolphinscheduler/issues?q=is%3Aissue) and found no similar feature requirement. ### Description Currently, the system does not support the replication function of workflow definition including `CONDITIONS`, `SWITCH`, `SUB_PROCESS`, `DEPENDENT` four task nodes. <img width="1472" alt="image" src="https://user-images.githubusercontent.com/37063904/196038586-7e802eeb-2063-468f-83ae-430201149712.png"> ### Are you willing to submit a 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/12391
https://github.com/apache/dolphinscheduler/pull/12392
b7bd8d780356e055998fd0047be7e2cfea85d59b
55004bebe032b7212892686d308adca2ac0e2723
2022-10-16T13:42:00Z
java
2022-10-17T02:28:58Z
dolphinscheduler-task-plugin/dolphinscheduler-task-api/src/main/java/org/apache/dolphinscheduler/plugin/task/api/TaskConstants.java
public static final String YEAR_WEEK = "year_week"; /** * timestamp */ public static final String TIMESTAMP = "timestamp"; public static final char SUBTRACT_CHAR = '-'; public static final char ADD_CHAR = '+'; public static final char MULTIPLY_CHAR = '*'; public static final char DIVISION_CHAR = '/'; public static final char LEFT_BRACE_CHAR = '('; public static final char RIGHT_BRACE_CHAR = ')'; public static final String ADD_STRING = "+"; public static final String MULTIPLY_STRING = "*"; public static final String DIVISION_STRING = "/"; public static final String LEFT_BRACE_STRING = "("; public static final char P = 'P'; public static final char N = 'N'; public static final String SUBTRACT_STRING = "-"; public static final String GLOBAL_PARAMS = "globalParams"; public static final String LOCAL_PARAMS = "localParams"; public static final String LOCAL_PARAMS_LIST = "localParamsList"; public static final String SUBPROCESS_INSTANCE_ID = "subProcessInstanceId"; public static final String PROCESS_INSTANCE_STATE = "processInstanceState"; public static final String PARENT_WORKFLOW_INSTANCE = "parentWorkflowInstance"; public static final String CONDITION_RESULT = "conditionResult"; public static final String SWITCH_RESULT = "switchResult"; public static final String DEPENDENCE = "dependence"; public static final String TASK_TYPE = "taskType"; public static final String TASK_LIST = "taskList"; public static final String QUEUE = "queue";
closed
apache/dolphinscheduler
https://github.com/apache/dolphinscheduler
12,391
[Improvement][API] Workflow definitions that contain logical task nodes support the copy function
### Search before asking - [X] I had searched in the [issues](https://github.com/apache/dolphinscheduler/issues?q=is%3Aissue) and found no similar feature requirement. ### Description Currently, the system does not support the replication function of workflow definition including `CONDITIONS`, `SWITCH`, `SUB_PROCESS`, `DEPENDENT` four task nodes. <img width="1472" alt="image" src="https://user-images.githubusercontent.com/37063904/196038586-7e802eeb-2063-468f-83ae-430201149712.png"> ### Are you willing to submit a 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/12391
https://github.com/apache/dolphinscheduler/pull/12392
b7bd8d780356e055998fd0047be7e2cfea85d59b
55004bebe032b7212892686d308adca2ac0e2723
2022-10-16T13:42:00Z
java
2022-10-17T02:28:58Z
dolphinscheduler-task-plugin/dolphinscheduler-task-api/src/main/java/org/apache/dolphinscheduler/plugin/task/api/TaskConstants.java
public static final String QUEUE_NAME = "queueName"; public static final int LOG_QUERY_SKIP_LINE_NUMBER = 0; public static final int LOG_QUERY_LIMIT = 4096; /** * default display rows */ public static final int DEFAULT_DISPLAY_ROWS = 10; /** * jar */ public static final String JAR = "jar"; /** * hadoop */ public static final String HADOOP = "hadoop"; /** * -D <property>=<value> */ public static final String D = "-D"; /** * jdbc url */ public static final String JDBC_MYSQL = "jdbc:mysql://"; public static final String JDBC_POSTGRESQL = "jdbc:postgresql://"; public static final String JDBC_HIVE_2 = "jdbc:hive2://"; public static final String JDBC_CLICKHOUSE = "jdbc:clickhouse://"; public static final String JDBC_ORACLE_SID = "jdbc:oracle:thin:@"; public static final String JDBC_ORACLE_SERVICE_NAME = "jdbc:oracle:thin:@//"; public static final String JDBC_SQLSERVER = "jdbc:sqlserver://"; public static final String JDBC_DB2 = "jdbc:db2://";
closed
apache/dolphinscheduler
https://github.com/apache/dolphinscheduler
12,391
[Improvement][API] Workflow definitions that contain logical task nodes support the copy function
### Search before asking - [X] I had searched in the [issues](https://github.com/apache/dolphinscheduler/issues?q=is%3Aissue) and found no similar feature requirement. ### Description Currently, the system does not support the replication function of workflow definition including `CONDITIONS`, `SWITCH`, `SUB_PROCESS`, `DEPENDENT` four task nodes. <img width="1472" alt="image" src="https://user-images.githubusercontent.com/37063904/196038586-7e802eeb-2063-468f-83ae-430201149712.png"> ### Are you willing to submit a 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/12391
https://github.com/apache/dolphinscheduler/pull/12392
b7bd8d780356e055998fd0047be7e2cfea85d59b
55004bebe032b7212892686d308adca2ac0e2723
2022-10-16T13:42:00Z
java
2022-10-17T02:28:58Z
dolphinscheduler-task-plugin/dolphinscheduler-task-api/src/main/java/org/apache/dolphinscheduler/plugin/task/api/TaskConstants.java
public static final String JDBC_PRESTO = "jdbc:presto://"; /** * driver */ public static final String ORG_POSTGRESQL_DRIVER = "org.postgresql.Driver"; public static final String COM_MYSQL_CJ_JDBC_DRIVER = "com.mysql.cj.jdbc.Driver"; public static final String ORG_APACHE_HIVE_JDBC_HIVE_DRIVER = "org.apache.hive.jdbc.HiveDriver"; public static final String COM_CLICKHOUSE_JDBC_DRIVER = "ru.yandex.clickhouse.ClickHouseDriver"; public static final String COM_ORACLE_JDBC_DRIVER = "oracle.jdbc.driver.OracleDriver"; public static final String COM_SQLSERVER_JDBC_DRIVER = "com.microsoft.sqlserver.jdbc.SQLServerDriver"; public static final String COM_DB2_JDBC_DRIVER = "com.ibm.db2.jcc.DB2Driver"; public static final String COM_PRESTO_JDBC_DRIVER = "com.facebook.presto.jdbc.PrestoDriver"; /** * datasource encryption salt */ public static final String DATASOURCE_ENCRYPTION_SALT_DEFAULT = "!@#$%^&*"; public static final String DATASOURCE_ENCRYPTION_ENABLE = "datasource.encryption.enable"; public static final String DATASOURCE_ENCRYPTION_SALT = "datasource.encryption.salt"; /** * resource storage type */ /** * kerberos */ public static final String KERBEROS = "kerberos"; /** * kerberos expire time */ public static final String KERBEROS_EXPIRE_TIME = "kerberos.expire.time";
closed
apache/dolphinscheduler
https://github.com/apache/dolphinscheduler
12,391
[Improvement][API] Workflow definitions that contain logical task nodes support the copy function
### Search before asking - [X] I had searched in the [issues](https://github.com/apache/dolphinscheduler/issues?q=is%3Aissue) and found no similar feature requirement. ### Description Currently, the system does not support the replication function of workflow definition including `CONDITIONS`, `SWITCH`, `SUB_PROCESS`, `DEPENDENT` four task nodes. <img width="1472" alt="image" src="https://user-images.githubusercontent.com/37063904/196038586-7e802eeb-2063-468f-83ae-430201149712.png"> ### Are you willing to submit a 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/12391
https://github.com/apache/dolphinscheduler/pull/12392
b7bd8d780356e055998fd0047be7e2cfea85d59b
55004bebe032b7212892686d308adca2ac0e2723
2022-10-16T13:42:00Z
java
2022-10-17T02:28:58Z
dolphinscheduler-task-plugin/dolphinscheduler-task-api/src/main/java/org/apache/dolphinscheduler/plugin/task/api/TaskConstants.java
/** * java.security.krb5.conf */ public static final String JAVA_SECURITY_KRB5_CONF = "java.security.krb5.conf"; /** * java.security.krb5.conf.path */ public static final String JAVA_SECURITY_KRB5_CONF_PATH = "java.security.krb5.conf.path"; /** * loginUserFromKeytab user */ public static final String LOGIN_USER_KEY_TAB_USERNAME = "login.user.keytab.username"; /** * loginUserFromKeytab path */ public static final String LOGIN_USER_KEY_TAB_PATH = "login.user.keytab.path"; /** * hadoop.security.authentication */ public static final String HADOOP_SECURITY_AUTHENTICATION = "hadoop.security.authentication"; /** * hadoop.security.authentication */ public static final String HADOOP_SECURITY_AUTHENTICATION_STARTUP_STATE = "hadoop.security.authentication.startup.state"; /** * Task Logger Thread's name */ public static final String TASK_LOGGER_THREAD_NAME = "TaskLogInfo"; /**
closed
apache/dolphinscheduler
https://github.com/apache/dolphinscheduler
12,391
[Improvement][API] Workflow definitions that contain logical task nodes support the copy function
### Search before asking - [X] I had searched in the [issues](https://github.com/apache/dolphinscheduler/issues?q=is%3Aissue) and found no similar feature requirement. ### Description Currently, the system does not support the replication function of workflow definition including `CONDITIONS`, `SWITCH`, `SUB_PROCESS`, `DEPENDENT` four task nodes. <img width="1472" alt="image" src="https://user-images.githubusercontent.com/37063904/196038586-7e802eeb-2063-468f-83ae-430201149712.png"> ### Are you willing to submit a 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/12391
https://github.com/apache/dolphinscheduler/pull/12392
b7bd8d780356e055998fd0047be7e2cfea85d59b
55004bebe032b7212892686d308adca2ac0e2723
2022-10-16T13:42:00Z
java
2022-10-17T02:28:58Z
dolphinscheduler-task-plugin/dolphinscheduler-task-api/src/main/java/org/apache/dolphinscheduler/plugin/task/api/TaskConstants.java
* hdfs/s3 configuration * resource.storage.upload.base.path */ public static final String RESOURCE_UPLOAD_PATH = "resource.storage.upload.base.path"; /** * data.quality.jar.name */ public static final String DATA_QUALITY_JAR_NAME = "data-quality.jar.name"; /** * data.quality.error.output.path */ public static final String DATA_QUALITY_ERROR_OUTPUT_PATH = "data-quality.error.output.path"; public static final String TASK_TYPE_CONDITIONS = "CONDITIONS"; public static final String TASK_TYPE_SWITCH = "SWITCH"; public static final String TASK_TYPE_SUB_PROCESS = "SUB_PROCESS"; public static final String TASK_TYPE_DEPENDENT = "DEPENDENT"; public static final String TASK_TYPE_SQL = "SQL"; public static final String TASK_TYPE_DATA_QUALITY = "DATA_QUALITY"; public static final String TASK_TYPE_K8S = "K8S"; public static final String TASK_TYPE_BLOCKING = "BLOCKING"; public static final String TASK_TYPE_STREAM = "STREAM"; public static final List<String> COMPLEX_TASK_TYPES = Arrays .asList(new String[]{TASK_TYPE_CONDITIONS, TASK_TYPE_SWITCH, TASK_TYPE_SUB_PROCESS, TASK_TYPE_DEPENDENT}); /** * aws config */ public static final String AWS_ACCESS_KEY_ID = "resource.aws.access.key.id"; public static final String AWS_SECRET_ACCESS_KEY = "resource.aws.secret.access.key"; public static final String AWS_REGION = "resource.aws.region"; /**
closed
apache/dolphinscheduler
https://github.com/apache/dolphinscheduler
12,391
[Improvement][API] Workflow definitions that contain logical task nodes support the copy function
### Search before asking - [X] I had searched in the [issues](https://github.com/apache/dolphinscheduler/issues?q=is%3Aissue) and found no similar feature requirement. ### Description Currently, the system does not support the replication function of workflow definition including `CONDITIONS`, `SWITCH`, `SUB_PROCESS`, `DEPENDENT` four task nodes. <img width="1472" alt="image" src="https://user-images.githubusercontent.com/37063904/196038586-7e802eeb-2063-468f-83ae-430201149712.png"> ### Are you willing to submit a 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/12391
https://github.com/apache/dolphinscheduler/pull/12392
b7bd8d780356e055998fd0047be7e2cfea85d59b
55004bebe032b7212892686d308adca2ac0e2723
2022-10-16T13:42:00Z
java
2022-10-17T02:28:58Z
dolphinscheduler-task-plugin/dolphinscheduler-task-api/src/main/java/org/apache/dolphinscheduler/plugin/task/api/TaskConstants.java
* alibaba cloud config */ public static final String ALIBABA_CLOUD_ACCESS_KEY_ID = "resource.alibaba.cloud.access.key.id"; public static final String ALIBABA_CLOUD_ACCESS_KEY_SECRET = "resource.alibaba.cloud.access.key.secret"; public static final String ALIBABA_CLOUD_REGION = "resource.alibaba.cloud.region"; /** * use for k8s task */ public static final String API_VERSION = "batch/v1"; public static final String IMAGE_PULL_POLICY = "Always"; public static final String RESTART_POLICY = "Never"; public static final String MEMORY = "memory"; public static final String CPU = "cpu"; public static final String LAYER_LABEL = "k8s.cn/layer"; public static final String LAYER_LABEL_VALUE = "batch"; public static final String NAME_LABEL = "k8s.cn/name"; public static final String TASK_INSTANCE_ID = "taskInstanceId"; public static final String MI = "Mi"; public static final int JOB_TTL_SECONDS = 300; public static final int LOG_LINES = 500; public static final String NAMESPACE_NAME = "name"; public static final String CLUSTER = "cluster"; /** * conda config used by jupyter task plugin */ public static final String CONDA_PATH = "conda.path"; public static final Duration DEFAULT_LOOP_STATUS_INTERVAL = Duration.ofSeconds(5L); }
closed
apache/dolphinscheduler
https://github.com/apache/dolphinscheduler
12,383
[Bug] [Service] Condition 'globalParamsMap != null' is always 'true'
### Search before asking - [X] I had searched in the [issues](https://github.com/apache/dolphinscheduler/issues?q=is%3Aissue) and found no similar issues. ### What happened Condition 'globalParamsMap != null' is always 'true' ### What you expected to happen Condition judge correctly ### How to reproduce ![1665798619968](https://user-images.githubusercontent.com/33045461/195963630-ee26282b-7648-44a5-a929-f36db87277d9.png) ### Anything else _No response_ ### Version dev ### 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/12383
https://github.com/apache/dolphinscheduler/pull/12384
1d0d26a416027b9e91d1a21092bb5b4406a757b2
934d6d21eb8a8e903b3632d0e2b873ea87d150ff
2022-10-15T01:52:52Z
java
2022-10-17T06:52:45Z
dolphinscheduler-service/src/main/java/org/apache/dolphinscheduler/service/expand/CuringGlobalParams.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.
closed
apache/dolphinscheduler
https://github.com/apache/dolphinscheduler
12,383
[Bug] [Service] Condition 'globalParamsMap != null' is always 'true'
### Search before asking - [X] I had searched in the [issues](https://github.com/apache/dolphinscheduler/issues?q=is%3Aissue) and found no similar issues. ### What happened Condition 'globalParamsMap != null' is always 'true' ### What you expected to happen Condition judge correctly ### How to reproduce ![1665798619968](https://user-images.githubusercontent.com/33045461/195963630-ee26282b-7648-44a5-a929-f36db87277d9.png) ### Anything else _No response_ ### Version dev ### 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/12383
https://github.com/apache/dolphinscheduler/pull/12384
1d0d26a416027b9e91d1a21092bb5b4406a757b2
934d6d21eb8a8e903b3632d0e2b873ea87d150ff
2022-10-15T01:52:52Z
java
2022-10-17T06:52:45Z
dolphinscheduler-service/src/main/java/org/apache/dolphinscheduler/service/expand/CuringGlobalParams.java
* See the License for the specific language governing permissions and * limitations under the License. */ package org.apache.dolphinscheduler.service.expand; import static org.apache.dolphinscheduler.plugin.task.api.TaskConstants.PARAMETER_TASK_EXECUTE_PATH; import static org.apache.dolphinscheduler.plugin.task.api.TaskConstants.PARAMETER_TASK_INSTANCE_ID; import org.apache.dolphinscheduler.common.Constants; import org.apache.dolphinscheduler.common.enums.CommandType; import org.apache.dolphinscheduler.common.utils.DateUtils; import org.apache.dolphinscheduler.common.utils.JSONUtils; import org.apache.dolphinscheduler.common.utils.placeholder.BusinessTimeUtils; import org.apache.dolphinscheduler.dao.entity.ProcessInstance; import org.apache.dolphinscheduler.dao.entity.TaskInstance; import org.apache.dolphinscheduler.plugin.task.api.model.Property; import org.apache.dolphinscheduler.plugin.task.api.parameters.AbstractParameters; import org.apache.dolphinscheduler.plugin.task.api.parser.ParamUtils; import org.apache.dolphinscheduler.plugin.task.api.utils.MapUtils; import org.apache.dolphinscheduler.plugin.task.api.utils.ParameterUtils; import org.apache.dolphinscheduler.spi.utils.StringUtils; import java.util.Date; import java.util.HashMap; import java.util.Iterator; import java.util.List; import java.util.Map; import java.util.Set; import java.util.stream.Collectors; import lombok.NonNull; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Component; @Component
closed
apache/dolphinscheduler
https://github.com/apache/dolphinscheduler
12,383
[Bug] [Service] Condition 'globalParamsMap != null' is always 'true'
### Search before asking - [X] I had searched in the [issues](https://github.com/apache/dolphinscheduler/issues?q=is%3Aissue) and found no similar issues. ### What happened Condition 'globalParamsMap != null' is always 'true' ### What you expected to happen Condition judge correctly ### How to reproduce ![1665798619968](https://user-images.githubusercontent.com/33045461/195963630-ee26282b-7648-44a5-a929-f36db87277d9.png) ### Anything else _No response_ ### Version dev ### 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/12383
https://github.com/apache/dolphinscheduler/pull/12384
1d0d26a416027b9e91d1a21092bb5b4406a757b2
934d6d21eb8a8e903b3632d0e2b873ea87d150ff
2022-10-15T01:52:52Z
java
2022-10-17T06:52:45Z
dolphinscheduler-service/src/main/java/org/apache/dolphinscheduler/service/expand/CuringGlobalParams.java
public class CuringGlobalParams implements CuringParamsService { @Autowired private TimePlaceholderResolverExpandService timePlaceholderResolverExpandService; @Override public String convertParameterPlaceholders(String val, Map<String, String> allParamMap) { return ParameterUtils.convertParameterPlaceholders(val, allParamMap); } @Override public boolean timeFunctionNeedExpand(String placeholderName) { return timePlaceholderResolverExpandService.timeFunctionNeedExpand(placeholderName); } @Override public String timeFunctionExtension(Integer processInstanceId, String timezone, String placeholderName) { return timePlaceholderResolverExpandService.timeFunctionExtension(processInstanceId, timezone, placeholderName); } /** * here it is judged whether external expansion calculation is required and the calculation result is obtained * @param processInstanceId * @param globalParamMap
closed
apache/dolphinscheduler
https://github.com/apache/dolphinscheduler
12,383
[Bug] [Service] Condition 'globalParamsMap != null' is always 'true'
### Search before asking - [X] I had searched in the [issues](https://github.com/apache/dolphinscheduler/issues?q=is%3Aissue) and found no similar issues. ### What happened Condition 'globalParamsMap != null' is always 'true' ### What you expected to happen Condition judge correctly ### How to reproduce ![1665798619968](https://user-images.githubusercontent.com/33045461/195963630-ee26282b-7648-44a5-a929-f36db87277d9.png) ### Anything else _No response_ ### Version dev ### 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/12383
https://github.com/apache/dolphinscheduler/pull/12384
1d0d26a416027b9e91d1a21092bb5b4406a757b2
934d6d21eb8a8e903b3632d0e2b873ea87d150ff
2022-10-15T01:52:52Z
java
2022-10-17T06:52:45Z
dolphinscheduler-service/src/main/java/org/apache/dolphinscheduler/service/expand/CuringGlobalParams.java
* @param globalParamList * @param commandType * @param scheduleTime * @param timezone * @return */ @Override public String curingGlobalParams(Integer processInstanceId, Map<String, String> globalParamMap, List<Property> globalParamList, CommandType commandType, Date scheduleTime, String timezone) { if (globalParamList == null || globalParamList.isEmpty()) { return null; } Map<String, String> globalMap = new HashMap<>(); if (globalParamMap != null) { globalMap.putAll(globalParamMap); } Map<String, String> allParamMap = new HashMap<>(); Map<String, String> timeParams = BusinessTimeUtils.getBusinessTime(commandType, scheduleTime, timezone); if (timeParams != null) { allParamMap.putAll(timeParams); } allParamMap.putAll(globalMap); Set<Map.Entry<String, String>> entries = allParamMap.entrySet(); Map<String, String> resolveMap = new HashMap<>(); for (Map.Entry<String, String> entry : entries) { String val = entry.getValue(); if (val.startsWith(Constants.FUNCTION_START_WITH)) { String str = "";
closed
apache/dolphinscheduler
https://github.com/apache/dolphinscheduler
12,383
[Bug] [Service] Condition 'globalParamsMap != null' is always 'true'
### Search before asking - [X] I had searched in the [issues](https://github.com/apache/dolphinscheduler/issues?q=is%3Aissue) and found no similar issues. ### What happened Condition 'globalParamsMap != null' is always 'true' ### What you expected to happen Condition judge correctly ### How to reproduce ![1665798619968](https://user-images.githubusercontent.com/33045461/195963630-ee26282b-7648-44a5-a929-f36db87277d9.png) ### Anything else _No response_ ### Version dev ### 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/12383
https://github.com/apache/dolphinscheduler/pull/12384
1d0d26a416027b9e91d1a21092bb5b4406a757b2
934d6d21eb8a8e903b3632d0e2b873ea87d150ff
2022-10-15T01:52:52Z
java
2022-10-17T06:52:45Z
dolphinscheduler-service/src/main/java/org/apache/dolphinscheduler/service/expand/CuringGlobalParams.java
if (timeFunctionNeedExpand(val)) { str = timeFunctionExtension(processInstanceId, timezone, val); } else { str = convertParameterPlaceholders(val, allParamMap); } resolveMap.put(entry.getKey(), str); } } globalMap.putAll(resolveMap); for (Property property : globalParamList) { String val = globalMap.get(property.getProp()); if (val != null) { property.setValue(val); } } return JSONUtils.toJsonString(globalParamList); } /** * the global parameters and local parameters used in the worker will be prepared here. * * @param taskInstance * @param parameters * @param processInstance * @return */ @Override public Map<String, Property> paramParsingPreparation(@NonNull TaskInstance taskInstance, @NonNull AbstractParameters parameters, @NonNull ProcessInstance processInstance) {
closed
apache/dolphinscheduler
https://github.com/apache/dolphinscheduler
12,383
[Bug] [Service] Condition 'globalParamsMap != null' is always 'true'
### Search before asking - [X] I had searched in the [issues](https://github.com/apache/dolphinscheduler/issues?q=is%3Aissue) and found no similar issues. ### What happened Condition 'globalParamsMap != null' is always 'true' ### What you expected to happen Condition judge correctly ### How to reproduce ![1665798619968](https://user-images.githubusercontent.com/33045461/195963630-ee26282b-7648-44a5-a929-f36db87277d9.png) ### Anything else _No response_ ### Version dev ### 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/12383
https://github.com/apache/dolphinscheduler/pull/12384
1d0d26a416027b9e91d1a21092bb5b4406a757b2
934d6d21eb8a8e903b3632d0e2b873ea87d150ff
2022-10-15T01:52:52Z
java
2022-10-17T06:52:45Z
dolphinscheduler-service/src/main/java/org/apache/dolphinscheduler/service/expand/CuringGlobalParams.java
Map<String, String> globalParamsMap = setGlobalParamsMap(processInstance); Map<String, Property> globalParams = ParamUtils.getUserDefParamsMap(globalParamsMap); CommandType commandType = processInstance.getCmdTypeIfComplement(); Date scheduleTime = processInstance.getScheduleTime(); Map<String, Property> localParams = parameters.getInputLocalParametersMap(); parameters.setVarPool(taskInstance.getVarPool()); Map<String, Property> varParams = parameters.getVarPoolMap(); if (globalParams.isEmpty() && localParams.isEmpty() && varParams.isEmpty()) { return null; } Map<String, String> cmdParam = JSONUtils.toMap(processInstance.getCommandParam()); String timeZone = cmdParam.get(Constants.SCHEDULE_TIMEZONE); Map<String, String> params = BusinessTimeUtils.getBusinessTime(commandType, scheduleTime, timeZone); if (globalParamsMap != null) { params.putAll(globalParamsMap); } if (StringUtils.isNotBlank(taskInstance.getExecutePath())) { params.put(PARAMETER_TASK_EXECUTE_PATH, taskInstance.getExecutePath()); } params.put(PARAMETER_TASK_INSTANCE_ID, Integer.toString(taskInstance.getId())); if (varParams.size() != 0) { globalParams.putAll(varParams); } if (localParams.size() != 0) {
closed
apache/dolphinscheduler
https://github.com/apache/dolphinscheduler
12,383
[Bug] [Service] Condition 'globalParamsMap != null' is always 'true'
### Search before asking - [X] I had searched in the [issues](https://github.com/apache/dolphinscheduler/issues?q=is%3Aissue) and found no similar issues. ### What happened Condition 'globalParamsMap != null' is always 'true' ### What you expected to happen Condition judge correctly ### How to reproduce ![1665798619968](https://user-images.githubusercontent.com/33045461/195963630-ee26282b-7648-44a5-a929-f36db87277d9.png) ### Anything else _No response_ ### Version dev ### 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/12383
https://github.com/apache/dolphinscheduler/pull/12384
1d0d26a416027b9e91d1a21092bb5b4406a757b2
934d6d21eb8a8e903b3632d0e2b873ea87d150ff
2022-10-15T01:52:52Z
java
2022-10-17T06:52:45Z
dolphinscheduler-service/src/main/java/org/apache/dolphinscheduler/service/expand/CuringGlobalParams.java
globalParams.putAll(localParams); } Iterator<Map.Entry<String, Property>> iter = globalParams.entrySet().iterator(); while (iter.hasNext()) { Map.Entry<String, Property> en = iter.next(); Property property = en.getValue(); if (StringUtils.isNotEmpty(property.getValue()) && property.getValue().startsWith(Constants.FUNCTION_START_WITH)) { /** * local parameter refers to global parameter with the same name * note: the global parameters of the process instance here are solidified parameters, * and there are no variables in them. */ String val = property.getValue(); if (timeFunctionNeedExpand(val)) { val = timeFunctionExtension(taskInstance.getProcessInstanceId(), timeZone, val); } else { val = convertParameterPlaceholders(val, params); } property.setValue(val); } } if (MapUtils.isEmpty(globalParams)) { globalParams = new HashMap<>(); } Map<String, Property> paramsMap = preBuildBusinessParams(processInstance); if (MapUtils.isNotEmpty(paramsMap)) { globalParams.putAll(paramsMap);
closed
apache/dolphinscheduler
https://github.com/apache/dolphinscheduler
12,383
[Bug] [Service] Condition 'globalParamsMap != null' is always 'true'
### Search before asking - [X] I had searched in the [issues](https://github.com/apache/dolphinscheduler/issues?q=is%3Aissue) and found no similar issues. ### What happened Condition 'globalParamsMap != null' is always 'true' ### What you expected to happen Condition judge correctly ### How to reproduce ![1665798619968](https://user-images.githubusercontent.com/33045461/195963630-ee26282b-7648-44a5-a929-f36db87277d9.png) ### Anything else _No response_ ### Version dev ### 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/12383
https://github.com/apache/dolphinscheduler/pull/12384
1d0d26a416027b9e91d1a21092bb5b4406a757b2
934d6d21eb8a8e903b3632d0e2b873ea87d150ff
2022-10-15T01:52:52Z
java
2022-10-17T06:52:45Z
dolphinscheduler-service/src/main/java/org/apache/dolphinscheduler/service/expand/CuringGlobalParams.java
} return globalParams; } private Map<String, String> setGlobalParamsMap(ProcessInstance processInstance) { Map<String, String> globalParamsMap = new HashMap<>(16); String globalParamsStr = processInstance.getGlobalParams(); if (globalParamsStr != null) { List<Property> globalParamsList = JSONUtils.toList(globalParamsStr, Property.class); globalParamsMap .putAll(globalParamsList.stream().collect(Collectors.toMap(Property::getProp, Property::getValue))); } return globalParamsMap; } @Override public Map<String, Property> preBuildBusinessParams(ProcessInstance processInstance) { Map<String, Property> paramsMap = new HashMap<>(); if (processInstance.getScheduleTime() != null) { Date date = processInstance.getScheduleTime(); String dateTime = DateUtils.format(date, Constants.PARAMETER_FORMAT_TIME, null); Property p = new Property(); p.setValue(dateTime); p.setProp(Constants.PARAMETER_DATETIME); paramsMap.put(Constants.PARAMETER_DATETIME, p); } return paramsMap; } }
closed
apache/dolphinscheduler
https://github.com/apache/dolphinscheduler
12,368
[Bug] [Task plugin] datax task error
### Search before asking - [X] I had searched in the [issues](https://github.com/apache/dolphinscheduler/issues?q=is%3Aissue) and found no similar issues. ### What happened [LOG-PATH]: /opt/dolphinscheduler/worker-server/logs/20221014/7195111179040_2-15-22.log, [HOST]: Host{address='172.16.10.15:1234', ip='172.16.10.15', port=1234} [INFO] 2022-10-14 08:44:09.886 +0800 - Begin to pulling task [INFO] 2022-10-14 08:44:09.887 +0800 - Begin to initialize task [INFO] 2022-10-14 08:44:09.887 +0800 - Set task startTime: Fri Oct 14 08:44:09 CST 2022 [INFO] 2022-10-14 08:44:09.887 +0800 - Set task envFile: /opt/dolphinscheduler/worker-server/conf/dolphinscheduler_env.sh [INFO] 2022-10-14 08:44:09.887 +0800 - Set task appId: 15_22 [INFO] 2022-10-14 08:44:09.887 +0800 - End initialize task [INFO] 2022-10-14 08:44:09.888 +0800 - Set task status to TaskExecutionStatus{code=1, desc='running'} [INFO] 2022-10-14 08:44:09.888 +0800 - TenantCode:root check success [INFO] 2022-10-14 08:44:09.888 +0800 - ProcessExecDir:/tmp/dolphinscheduler/exec/process/7193666667040/7195111179040_2/15/22 check success [INFO] 2022-10-14 08:44:09.888 +0800 - Resources:{} check success [INFO] 2022-10-14 08:44:09.889 +0800 - Task plugin: DATAX create success [INFO] 2022-10-14 08:44:09.889 +0800 - datax task params {"localParams":[],"resourceList":[],"customConfig":0,"dsType":"MYSQL","dataSource":1,"dtType":"MYSQL","dataTarget":1,"sql":"select id,name from ods.ods_jdx_site","targetTable":"ods_jdx_site_copy1","jobSpeedByte":0,"jobSpeedRecord":1000,"preStatements":[],"postStatements":[],"xms":1,"xmx":1} [INFO] 2022-10-14 08:44:09.889 +0800 - Success initialized task plugin instance success [INFO] 2022-10-14 08:44:09.889 +0800 - Success set taskVarPool: null [ERROR] 2022-10-14 08:44:09.890 +0800 - datax task error java.lang.NullPointerException: null at org.apache.dolphinscheduler.plugin.task.datax.DataxTask.addCustomParameters(DataxTask.java:426) at org.apache.dolphinscheduler.plugin.task.datax.DataxTask.buildShellCommandFile(DataxTask.java:400) at org.apache.dolphinscheduler.plugin.task.datax.DataxTask.handle(DataxTask.java:157) at org.apache.dolphinscheduler.server.worker.runner.DefaultWorkerDelayTaskExecuteRunnable.executeTask(DefaultWorkerDelayTaskExecuteRunnable.java:48) at org.apache.dolphinscheduler.server.worker.runner.WorkerTaskExecuteRunnable.run(WorkerTaskExecuteRunnable.java:151) at java.util.concurrent.Executors$RunnableAdapter.call(Executors.java:511) at com.google.common.util.concurrent.TrustedListenableFutureTask$TrustedFutureInterruptibleTask.runInterruptibly(TrustedListenableFutureTask.java:131) at com.google.common.util.concurrent.InterruptibleTask.run(InterruptibleTask.java:74) at com.google.common.util.concurrent.TrustedListenableFutureTask.run(TrustedListenableFutureTask.java:82) at java.util.concurrent.ThreadPoolExecutor.runWorker(ThreadPoolExecutor.java:1149) at java.util.concurrent.ThreadPoolExecutor$Worker.run(ThreadPoolExecutor.java:624) at java.lang.Thread.run(Thread.java:748) [ERROR] 2022-10-14 08:44:09.890 +0800 - Task execute failed, due to meet an exception org.apache.dolphinscheduler.plugin.task.api.TaskException: Execute DataX task failed at org.apache.dolphinscheduler.plugin.task.datax.DataxTask.handle(DataxTask.java:171) at org.apache.dolphinscheduler.server.worker.runner.DefaultWorkerDelayTaskExecuteRunnable.executeTask(DefaultWorkerDelayTaskExecuteRunnable.java:48) at org.apache.dolphinscheduler.server.worker.runner.WorkerTaskExecuteRunnable.run(WorkerTaskExecuteRunnable.java:151) at java.util.concurrent.Executors$RunnableAdapter.call(Executors.java:511) at com.google.common.util.concurrent.TrustedListenableFutureTask$TrustedFutureInterruptibleTask.runInterruptibly(TrustedListenableFutureTask.java:131) at com.google.common.util.concurrent.InterruptibleTask.run(InterruptibleTask.java:74) at com.google.common.util.concurrent.TrustedListenableFutureTask.run(TrustedListenableFutureTask.java:82) at java.util.concurrent.ThreadPoolExecutor.runWorker(ThreadPoolExecutor.java:1149) at java.util.concurrent.ThreadPoolExecutor$Worker.run(ThreadPoolExecutor.java:624) at java.lang.Thread.run(Thread.java:748) Caused by: java.lang.NullPointerException: null at org.apache.dolphinscheduler.plugin.task.datax.DataxTask.addCustomParameters(DataxTask.java:426) at org.apache.dolphinscheduler.plugin.task.datax.DataxTask.buildShellCommandFile(DataxTask.java:400) at org.apache.dolphinscheduler.plugin.task.datax.DataxTask.handle(DataxTask.java:157) ... 9 common frames omitted [INFO] 2022-10-14 08:44:10.900 +0800 - Get a exception when execute the task, will send the task execute result to master, the current task execute result is TaskExecutionStatus{code=6, desc='failure'} ### What you expected to happen task run success ### How to reproduce datax task with mysql2mysql ### Anything else DATAX_HOME=/opt/datax ### Version 3.1.x ### 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/12368
https://github.com/apache/dolphinscheduler/pull/12388
fccbe5593ad2ceb1899524440858c938ef1ae98c
3bef85f546e5ebb9d4c91e48c515756286631069
2022-10-14T01:02:58Z
java
2022-10-18T01:03:16Z
dolphinscheduler-task-plugin/dolphinscheduler-task-datax/src/main/java/org/apache/dolphinscheduler/plugin/task/datax/DataxTask.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
12,368
[Bug] [Task plugin] datax task error
### Search before asking - [X] I had searched in the [issues](https://github.com/apache/dolphinscheduler/issues?q=is%3Aissue) and found no similar issues. ### What happened [LOG-PATH]: /opt/dolphinscheduler/worker-server/logs/20221014/7195111179040_2-15-22.log, [HOST]: Host{address='172.16.10.15:1234', ip='172.16.10.15', port=1234} [INFO] 2022-10-14 08:44:09.886 +0800 - Begin to pulling task [INFO] 2022-10-14 08:44:09.887 +0800 - Begin to initialize task [INFO] 2022-10-14 08:44:09.887 +0800 - Set task startTime: Fri Oct 14 08:44:09 CST 2022 [INFO] 2022-10-14 08:44:09.887 +0800 - Set task envFile: /opt/dolphinscheduler/worker-server/conf/dolphinscheduler_env.sh [INFO] 2022-10-14 08:44:09.887 +0800 - Set task appId: 15_22 [INFO] 2022-10-14 08:44:09.887 +0800 - End initialize task [INFO] 2022-10-14 08:44:09.888 +0800 - Set task status to TaskExecutionStatus{code=1, desc='running'} [INFO] 2022-10-14 08:44:09.888 +0800 - TenantCode:root check success [INFO] 2022-10-14 08:44:09.888 +0800 - ProcessExecDir:/tmp/dolphinscheduler/exec/process/7193666667040/7195111179040_2/15/22 check success [INFO] 2022-10-14 08:44:09.888 +0800 - Resources:{} check success [INFO] 2022-10-14 08:44:09.889 +0800 - Task plugin: DATAX create success [INFO] 2022-10-14 08:44:09.889 +0800 - datax task params {"localParams":[],"resourceList":[],"customConfig":0,"dsType":"MYSQL","dataSource":1,"dtType":"MYSQL","dataTarget":1,"sql":"select id,name from ods.ods_jdx_site","targetTable":"ods_jdx_site_copy1","jobSpeedByte":0,"jobSpeedRecord":1000,"preStatements":[],"postStatements":[],"xms":1,"xmx":1} [INFO] 2022-10-14 08:44:09.889 +0800 - Success initialized task plugin instance success [INFO] 2022-10-14 08:44:09.889 +0800 - Success set taskVarPool: null [ERROR] 2022-10-14 08:44:09.890 +0800 - datax task error java.lang.NullPointerException: null at org.apache.dolphinscheduler.plugin.task.datax.DataxTask.addCustomParameters(DataxTask.java:426) at org.apache.dolphinscheduler.plugin.task.datax.DataxTask.buildShellCommandFile(DataxTask.java:400) at org.apache.dolphinscheduler.plugin.task.datax.DataxTask.handle(DataxTask.java:157) at org.apache.dolphinscheduler.server.worker.runner.DefaultWorkerDelayTaskExecuteRunnable.executeTask(DefaultWorkerDelayTaskExecuteRunnable.java:48) at org.apache.dolphinscheduler.server.worker.runner.WorkerTaskExecuteRunnable.run(WorkerTaskExecuteRunnable.java:151) at java.util.concurrent.Executors$RunnableAdapter.call(Executors.java:511) at com.google.common.util.concurrent.TrustedListenableFutureTask$TrustedFutureInterruptibleTask.runInterruptibly(TrustedListenableFutureTask.java:131) at com.google.common.util.concurrent.InterruptibleTask.run(InterruptibleTask.java:74) at com.google.common.util.concurrent.TrustedListenableFutureTask.run(TrustedListenableFutureTask.java:82) at java.util.concurrent.ThreadPoolExecutor.runWorker(ThreadPoolExecutor.java:1149) at java.util.concurrent.ThreadPoolExecutor$Worker.run(ThreadPoolExecutor.java:624) at java.lang.Thread.run(Thread.java:748) [ERROR] 2022-10-14 08:44:09.890 +0800 - Task execute failed, due to meet an exception org.apache.dolphinscheduler.plugin.task.api.TaskException: Execute DataX task failed at org.apache.dolphinscheduler.plugin.task.datax.DataxTask.handle(DataxTask.java:171) at org.apache.dolphinscheduler.server.worker.runner.DefaultWorkerDelayTaskExecuteRunnable.executeTask(DefaultWorkerDelayTaskExecuteRunnable.java:48) at org.apache.dolphinscheduler.server.worker.runner.WorkerTaskExecuteRunnable.run(WorkerTaskExecuteRunnable.java:151) at java.util.concurrent.Executors$RunnableAdapter.call(Executors.java:511) at com.google.common.util.concurrent.TrustedListenableFutureTask$TrustedFutureInterruptibleTask.runInterruptibly(TrustedListenableFutureTask.java:131) at com.google.common.util.concurrent.InterruptibleTask.run(InterruptibleTask.java:74) at com.google.common.util.concurrent.TrustedListenableFutureTask.run(TrustedListenableFutureTask.java:82) at java.util.concurrent.ThreadPoolExecutor.runWorker(ThreadPoolExecutor.java:1149) at java.util.concurrent.ThreadPoolExecutor$Worker.run(ThreadPoolExecutor.java:624) at java.lang.Thread.run(Thread.java:748) Caused by: java.lang.NullPointerException: null at org.apache.dolphinscheduler.plugin.task.datax.DataxTask.addCustomParameters(DataxTask.java:426) at org.apache.dolphinscheduler.plugin.task.datax.DataxTask.buildShellCommandFile(DataxTask.java:400) at org.apache.dolphinscheduler.plugin.task.datax.DataxTask.handle(DataxTask.java:157) ... 9 common frames omitted [INFO] 2022-10-14 08:44:10.900 +0800 - Get a exception when execute the task, will send the task execute result to master, the current task execute result is TaskExecutionStatus{code=6, desc='failure'} ### What you expected to happen task run success ### How to reproduce datax task with mysql2mysql ### Anything else DATAX_HOME=/opt/datax ### Version 3.1.x ### 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/12368
https://github.com/apache/dolphinscheduler/pull/12388
fccbe5593ad2ceb1899524440858c938ef1ae98c
3bef85f546e5ebb9d4c91e48c515756286631069
2022-10-14T01:02:58Z
java
2022-10-18T01:03:16Z
dolphinscheduler-task-plugin/dolphinscheduler-task-datax/src/main/java/org/apache/dolphinscheduler/plugin/task/datax/DataxTask.java
package org.apache.dolphinscheduler.plugin.task.datax; import com.alibaba.druid.sql.ast.SQLStatement; import com.alibaba.druid.sql.ast.expr.SQLIdentifierExpr; import com.alibaba.druid.sql.ast.expr.SQLPropertyExpr; import com.alibaba.druid.sql.ast.statement.SQLSelect; import com.alibaba.druid.sql.ast.statement.SQLSelectItem; import com.alibaba.druid.sql.ast.statement.SQLSelectQueryBlock; import com.alibaba.druid.sql.ast.statement.SQLSelectStatement; import com.alibaba.druid.sql.ast.statement.SQLUnionQuery; import com.alibaba.druid.sql.parser.SQLStatementParser; import com.fasterxml.jackson.databind.node.ArrayNode; import com.fasterxml.jackson.databind.node.ObjectNode; import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.io.FileUtils; import org.apache.commons.lang3.SystemUtils; import org.apache.dolphinscheduler.plugin.datasource.api.plugin.DataSourceClientProvider; import org.apache.dolphinscheduler.plugin.datasource.api.utils.DataSourceUtils; import org.apache.dolphinscheduler.plugin.task.api.AbstractTask; import org.apache.dolphinscheduler.plugin.task.api.ShellCommandExecutor; import org.apache.dolphinscheduler.plugin.task.api.TaskCallBack; import org.apache.dolphinscheduler.plugin.task.api.TaskConstants; import org.apache.dolphinscheduler.plugin.task.api.TaskException; import org.apache.dolphinscheduler.plugin.task.api.TaskExecutionContext; import org.apache.dolphinscheduler.plugin.task.api.model.Property; import org.apache.dolphinscheduler.plugin.task.api.model.TaskResponse; import org.apache.dolphinscheduler.plugin.task.api.parameters.AbstractParameters; import org.apache.dolphinscheduler.plugin.task.api.parser.ParamUtils; import org.apache.dolphinscheduler.plugin.task.api.parser.ParameterUtils; import org.apache.dolphinscheduler.spi.datasource.BaseConnectionParam; import org.apache.dolphinscheduler.spi.enums.DbType;
closed
apache/dolphinscheduler
https://github.com/apache/dolphinscheduler
12,368
[Bug] [Task plugin] datax task error
### Search before asking - [X] I had searched in the [issues](https://github.com/apache/dolphinscheduler/issues?q=is%3Aissue) and found no similar issues. ### What happened [LOG-PATH]: /opt/dolphinscheduler/worker-server/logs/20221014/7195111179040_2-15-22.log, [HOST]: Host{address='172.16.10.15:1234', ip='172.16.10.15', port=1234} [INFO] 2022-10-14 08:44:09.886 +0800 - Begin to pulling task [INFO] 2022-10-14 08:44:09.887 +0800 - Begin to initialize task [INFO] 2022-10-14 08:44:09.887 +0800 - Set task startTime: Fri Oct 14 08:44:09 CST 2022 [INFO] 2022-10-14 08:44:09.887 +0800 - Set task envFile: /opt/dolphinscheduler/worker-server/conf/dolphinscheduler_env.sh [INFO] 2022-10-14 08:44:09.887 +0800 - Set task appId: 15_22 [INFO] 2022-10-14 08:44:09.887 +0800 - End initialize task [INFO] 2022-10-14 08:44:09.888 +0800 - Set task status to TaskExecutionStatus{code=1, desc='running'} [INFO] 2022-10-14 08:44:09.888 +0800 - TenantCode:root check success [INFO] 2022-10-14 08:44:09.888 +0800 - ProcessExecDir:/tmp/dolphinscheduler/exec/process/7193666667040/7195111179040_2/15/22 check success [INFO] 2022-10-14 08:44:09.888 +0800 - Resources:{} check success [INFO] 2022-10-14 08:44:09.889 +0800 - Task plugin: DATAX create success [INFO] 2022-10-14 08:44:09.889 +0800 - datax task params {"localParams":[],"resourceList":[],"customConfig":0,"dsType":"MYSQL","dataSource":1,"dtType":"MYSQL","dataTarget":1,"sql":"select id,name from ods.ods_jdx_site","targetTable":"ods_jdx_site_copy1","jobSpeedByte":0,"jobSpeedRecord":1000,"preStatements":[],"postStatements":[],"xms":1,"xmx":1} [INFO] 2022-10-14 08:44:09.889 +0800 - Success initialized task plugin instance success [INFO] 2022-10-14 08:44:09.889 +0800 - Success set taskVarPool: null [ERROR] 2022-10-14 08:44:09.890 +0800 - datax task error java.lang.NullPointerException: null at org.apache.dolphinscheduler.plugin.task.datax.DataxTask.addCustomParameters(DataxTask.java:426) at org.apache.dolphinscheduler.plugin.task.datax.DataxTask.buildShellCommandFile(DataxTask.java:400) at org.apache.dolphinscheduler.plugin.task.datax.DataxTask.handle(DataxTask.java:157) at org.apache.dolphinscheduler.server.worker.runner.DefaultWorkerDelayTaskExecuteRunnable.executeTask(DefaultWorkerDelayTaskExecuteRunnable.java:48) at org.apache.dolphinscheduler.server.worker.runner.WorkerTaskExecuteRunnable.run(WorkerTaskExecuteRunnable.java:151) at java.util.concurrent.Executors$RunnableAdapter.call(Executors.java:511) at com.google.common.util.concurrent.TrustedListenableFutureTask$TrustedFutureInterruptibleTask.runInterruptibly(TrustedListenableFutureTask.java:131) at com.google.common.util.concurrent.InterruptibleTask.run(InterruptibleTask.java:74) at com.google.common.util.concurrent.TrustedListenableFutureTask.run(TrustedListenableFutureTask.java:82) at java.util.concurrent.ThreadPoolExecutor.runWorker(ThreadPoolExecutor.java:1149) at java.util.concurrent.ThreadPoolExecutor$Worker.run(ThreadPoolExecutor.java:624) at java.lang.Thread.run(Thread.java:748) [ERROR] 2022-10-14 08:44:09.890 +0800 - Task execute failed, due to meet an exception org.apache.dolphinscheduler.plugin.task.api.TaskException: Execute DataX task failed at org.apache.dolphinscheduler.plugin.task.datax.DataxTask.handle(DataxTask.java:171) at org.apache.dolphinscheduler.server.worker.runner.DefaultWorkerDelayTaskExecuteRunnable.executeTask(DefaultWorkerDelayTaskExecuteRunnable.java:48) at org.apache.dolphinscheduler.server.worker.runner.WorkerTaskExecuteRunnable.run(WorkerTaskExecuteRunnable.java:151) at java.util.concurrent.Executors$RunnableAdapter.call(Executors.java:511) at com.google.common.util.concurrent.TrustedListenableFutureTask$TrustedFutureInterruptibleTask.runInterruptibly(TrustedListenableFutureTask.java:131) at com.google.common.util.concurrent.InterruptibleTask.run(InterruptibleTask.java:74) at com.google.common.util.concurrent.TrustedListenableFutureTask.run(TrustedListenableFutureTask.java:82) at java.util.concurrent.ThreadPoolExecutor.runWorker(ThreadPoolExecutor.java:1149) at java.util.concurrent.ThreadPoolExecutor$Worker.run(ThreadPoolExecutor.java:624) at java.lang.Thread.run(Thread.java:748) Caused by: java.lang.NullPointerException: null at org.apache.dolphinscheduler.plugin.task.datax.DataxTask.addCustomParameters(DataxTask.java:426) at org.apache.dolphinscheduler.plugin.task.datax.DataxTask.buildShellCommandFile(DataxTask.java:400) at org.apache.dolphinscheduler.plugin.task.datax.DataxTask.handle(DataxTask.java:157) ... 9 common frames omitted [INFO] 2022-10-14 08:44:10.900 +0800 - Get a exception when execute the task, will send the task execute result to master, the current task execute result is TaskExecutionStatus{code=6, desc='failure'} ### What you expected to happen task run success ### How to reproduce datax task with mysql2mysql ### Anything else DATAX_HOME=/opt/datax ### Version 3.1.x ### 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/12368
https://github.com/apache/dolphinscheduler/pull/12388
fccbe5593ad2ceb1899524440858c938ef1ae98c
3bef85f546e5ebb9d4c91e48c515756286631069
2022-10-14T01:02:58Z
java
2022-10-18T01:03:16Z
dolphinscheduler-task-plugin/dolphinscheduler-task-datax/src/main/java/org/apache/dolphinscheduler/plugin/task/datax/DataxTask.java
import org.apache.dolphinscheduler.spi.enums.Flag; import org.apache.dolphinscheduler.spi.utils.JSONUtils; import org.apache.dolphinscheduler.spi.utils.StringUtils; import java.io.File; import java.nio.charset.StandardCharsets; import java.nio.file.Files; import java.nio.file.Path; import java.nio.file.Paths; import java.nio.file.StandardOpenOption; import java.nio.file.attribute.FileAttribute; import java.nio.file.attribute.PosixFilePermission; import java.nio.file.attribute.PosixFilePermissions; import java.sql.Connection; import java.sql.PreparedStatement; import java.sql.ResultSet; import java.sql.ResultSetMetaData; import java.sql.SQLException; import java.util.ArrayList; import java.util.List; import java.util.Map; import java.util.Set; import java.util.concurrent.ExecutionException; import java.util.regex.Matcher; import java.util.regex.Pattern; import static org.apache.dolphinscheduler.plugin.datasource.api.utils.PasswordUtils.decodePassword; import static org.apache.dolphinscheduler.plugin.task.api.TaskConstants.EXIT_CODE_FAILURE; import static org.apache.dolphinscheduler.plugin.task.api.TaskConstants.RWXR_XR_X; public class DataxTask extends AbstractTask { /** * jvm parameters
closed
apache/dolphinscheduler
https://github.com/apache/dolphinscheduler
12,368
[Bug] [Task plugin] datax task error
### Search before asking - [X] I had searched in the [issues](https://github.com/apache/dolphinscheduler/issues?q=is%3Aissue) and found no similar issues. ### What happened [LOG-PATH]: /opt/dolphinscheduler/worker-server/logs/20221014/7195111179040_2-15-22.log, [HOST]: Host{address='172.16.10.15:1234', ip='172.16.10.15', port=1234} [INFO] 2022-10-14 08:44:09.886 +0800 - Begin to pulling task [INFO] 2022-10-14 08:44:09.887 +0800 - Begin to initialize task [INFO] 2022-10-14 08:44:09.887 +0800 - Set task startTime: Fri Oct 14 08:44:09 CST 2022 [INFO] 2022-10-14 08:44:09.887 +0800 - Set task envFile: /opt/dolphinscheduler/worker-server/conf/dolphinscheduler_env.sh [INFO] 2022-10-14 08:44:09.887 +0800 - Set task appId: 15_22 [INFO] 2022-10-14 08:44:09.887 +0800 - End initialize task [INFO] 2022-10-14 08:44:09.888 +0800 - Set task status to TaskExecutionStatus{code=1, desc='running'} [INFO] 2022-10-14 08:44:09.888 +0800 - TenantCode:root check success [INFO] 2022-10-14 08:44:09.888 +0800 - ProcessExecDir:/tmp/dolphinscheduler/exec/process/7193666667040/7195111179040_2/15/22 check success [INFO] 2022-10-14 08:44:09.888 +0800 - Resources:{} check success [INFO] 2022-10-14 08:44:09.889 +0800 - Task plugin: DATAX create success [INFO] 2022-10-14 08:44:09.889 +0800 - datax task params {"localParams":[],"resourceList":[],"customConfig":0,"dsType":"MYSQL","dataSource":1,"dtType":"MYSQL","dataTarget":1,"sql":"select id,name from ods.ods_jdx_site","targetTable":"ods_jdx_site_copy1","jobSpeedByte":0,"jobSpeedRecord":1000,"preStatements":[],"postStatements":[],"xms":1,"xmx":1} [INFO] 2022-10-14 08:44:09.889 +0800 - Success initialized task plugin instance success [INFO] 2022-10-14 08:44:09.889 +0800 - Success set taskVarPool: null [ERROR] 2022-10-14 08:44:09.890 +0800 - datax task error java.lang.NullPointerException: null at org.apache.dolphinscheduler.plugin.task.datax.DataxTask.addCustomParameters(DataxTask.java:426) at org.apache.dolphinscheduler.plugin.task.datax.DataxTask.buildShellCommandFile(DataxTask.java:400) at org.apache.dolphinscheduler.plugin.task.datax.DataxTask.handle(DataxTask.java:157) at org.apache.dolphinscheduler.server.worker.runner.DefaultWorkerDelayTaskExecuteRunnable.executeTask(DefaultWorkerDelayTaskExecuteRunnable.java:48) at org.apache.dolphinscheduler.server.worker.runner.WorkerTaskExecuteRunnable.run(WorkerTaskExecuteRunnable.java:151) at java.util.concurrent.Executors$RunnableAdapter.call(Executors.java:511) at com.google.common.util.concurrent.TrustedListenableFutureTask$TrustedFutureInterruptibleTask.runInterruptibly(TrustedListenableFutureTask.java:131) at com.google.common.util.concurrent.InterruptibleTask.run(InterruptibleTask.java:74) at com.google.common.util.concurrent.TrustedListenableFutureTask.run(TrustedListenableFutureTask.java:82) at java.util.concurrent.ThreadPoolExecutor.runWorker(ThreadPoolExecutor.java:1149) at java.util.concurrent.ThreadPoolExecutor$Worker.run(ThreadPoolExecutor.java:624) at java.lang.Thread.run(Thread.java:748) [ERROR] 2022-10-14 08:44:09.890 +0800 - Task execute failed, due to meet an exception org.apache.dolphinscheduler.plugin.task.api.TaskException: Execute DataX task failed at org.apache.dolphinscheduler.plugin.task.datax.DataxTask.handle(DataxTask.java:171) at org.apache.dolphinscheduler.server.worker.runner.DefaultWorkerDelayTaskExecuteRunnable.executeTask(DefaultWorkerDelayTaskExecuteRunnable.java:48) at org.apache.dolphinscheduler.server.worker.runner.WorkerTaskExecuteRunnable.run(WorkerTaskExecuteRunnable.java:151) at java.util.concurrent.Executors$RunnableAdapter.call(Executors.java:511) at com.google.common.util.concurrent.TrustedListenableFutureTask$TrustedFutureInterruptibleTask.runInterruptibly(TrustedListenableFutureTask.java:131) at com.google.common.util.concurrent.InterruptibleTask.run(InterruptibleTask.java:74) at com.google.common.util.concurrent.TrustedListenableFutureTask.run(TrustedListenableFutureTask.java:82) at java.util.concurrent.ThreadPoolExecutor.runWorker(ThreadPoolExecutor.java:1149) at java.util.concurrent.ThreadPoolExecutor$Worker.run(ThreadPoolExecutor.java:624) at java.lang.Thread.run(Thread.java:748) Caused by: java.lang.NullPointerException: null at org.apache.dolphinscheduler.plugin.task.datax.DataxTask.addCustomParameters(DataxTask.java:426) at org.apache.dolphinscheduler.plugin.task.datax.DataxTask.buildShellCommandFile(DataxTask.java:400) at org.apache.dolphinscheduler.plugin.task.datax.DataxTask.handle(DataxTask.java:157) ... 9 common frames omitted [INFO] 2022-10-14 08:44:10.900 +0800 - Get a exception when execute the task, will send the task execute result to master, the current task execute result is TaskExecutionStatus{code=6, desc='failure'} ### What you expected to happen task run success ### How to reproduce datax task with mysql2mysql ### Anything else DATAX_HOME=/opt/datax ### Version 3.1.x ### 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/12368
https://github.com/apache/dolphinscheduler/pull/12388
fccbe5593ad2ceb1899524440858c938ef1ae98c
3bef85f546e5ebb9d4c91e48c515756286631069
2022-10-14T01:02:58Z
java
2022-10-18T01:03:16Z
dolphinscheduler-task-plugin/dolphinscheduler-task-datax/src/main/java/org/apache/dolphinscheduler/plugin/task/datax/DataxTask.java
*/ public static final String JVM_PARAM = " --jvm=\"-Xms%sG -Xmx%sG\" "; public static final String CUSTOM_PARAM = " -D%s=%s"; /** * python process(datax only supports version 2.7 by default) */ private static final String DATAX_PYTHON = "python2.7"; private static final Pattern PYTHON_PATH_PATTERN = Pattern.compile("/bin/python[\\d.]*$"); /** * datax path */ private static final String DATAX_PATH = "${DATAX_HOME}/bin/datax.py"; /** * datax channel count */ private static final int DATAX_CHANNEL_COUNT = 1; /** * datax parameters */ private DataxParameters dataXParameters; /** * shell command executor */ private ShellCommandExecutor shellCommandExecutor; /** * taskExecutionContext */ private TaskExecutionContext taskExecutionContext; private DataxTaskExecutionContext dataxTaskExecutionContext; /**