status
stringclasses
1 value
repo_name
stringclasses
31 values
repo_url
stringclasses
31 values
issue_id
int64
1
104k
title
stringlengths
4
233
body
stringlengths
0
186k
issue_url
stringlengths
38
56
pull_url
stringlengths
37
54
before_fix_sha
stringlengths
40
40
after_fix_sha
stringlengths
40
40
report_datetime
unknown
language
stringclasses
5 values
commit_datetime
unknown
updated_file
stringlengths
7
188
chunk_content
stringlengths
1
1.03M
closed
apache/dolphinscheduler
https://github.com/apache/dolphinscheduler
5,229
[Feature][server port] server port custom config
**Describe the feature** all application can custom config server port
https://github.com/apache/dolphinscheduler/issues/5229
https://github.com/apache/dolphinscheduler/pull/6947
100a9ba3fc21764158593bd33e2b261b0ef39982
0dcff1425a28da0ce0004fc3e594b97d080c5fd9
"2021-04-07T09:22:45Z"
java
"2021-11-30T16:21:03Z"
dolphinscheduler-service/src/main/java/org/apache/dolphinscheduler/service/process/ProcessService.java
} /** * check the input command exists in queue list * * @param command command * @return create command result */ public boolean verifyIsNeedCreateCommand(Command command) { boolean isNeedCreate = true; EnumMap<CommandType, Integer> cmdTypeMap = new EnumMap<>(CommandType.class); cmdTypeMap.put(CommandType.REPEAT_RUNNING, 1); cmdTypeMap.put(CommandType.RECOVER_SUSPENDED_PROCESS, 1); cmdTypeMap.put(CommandType.START_FAILURE_TASK_PROCESS, 1); CommandType commandType = command.getCommandType(); if (cmdTypeMap.containsKey(commandType)) { ObjectNode cmdParamObj = JSONUtils.parseObject(command.getCommandParam()); int processInstanceId = cmdParamObj.path(CMD_PARAM_RECOVER_PROCESS_ID_STRING).asInt(); List<Command> commands = commandMapper.selectList(null); for (Command tmpCommand : commands) { if (cmdTypeMap.containsKey(tmpCommand.getCommandType())) { ObjectNode tempObj = JSONUtils.parseObject(tmpCommand.getCommandParam()); if (tempObj != null && processInstanceId == tempObj.path(CMD_PARAM_RECOVER_PROCESS_ID_STRING).asInt()) { isNeedCreate = false; break; } } } } return isNeedCreate;
closed
apache/dolphinscheduler
https://github.com/apache/dolphinscheduler
5,229
[Feature][server port] server port custom config
**Describe the feature** all application can custom config server port
https://github.com/apache/dolphinscheduler/issues/5229
https://github.com/apache/dolphinscheduler/pull/6947
100a9ba3fc21764158593bd33e2b261b0ef39982
0dcff1425a28da0ce0004fc3e594b97d080c5fd9
"2021-04-07T09:22:45Z"
java
"2021-11-30T16:21:03Z"
dolphinscheduler-service/src/main/java/org/apache/dolphinscheduler/service/process/ProcessService.java
} /** * find process instance detail by id * * @param processId processId * @return process instance */ public ProcessInstance findProcessInstanceDetailById(int processId) { return processInstanceMapper.queryDetailById(processId); } /** * get task node list by definitionId */ public List<TaskDefinition> getTaskNodeListByDefinition(long defineCode) { ProcessDefinition processDefinition = processDefineMapper.queryByCode(defineCode); if (processDefinition == null) { logger.error("process define not exists"); return new ArrayList<>(); } List<ProcessTaskRelationLog> processTaskRelations = processTaskRelationLogMapper.queryByProcessCodeAndVersion(processDefinition.getCode(), processDefinition.getVersion()); Set<TaskDefinition> taskDefinitionSet = new HashSet<>(); for (ProcessTaskRelationLog processTaskRelation : processTaskRelations) { if (processTaskRelation.getPostTaskCode() > 0) { taskDefinitionSet.add(new TaskDefinition(processTaskRelation.getPostTaskCode(), processTaskRelation.getPostTaskVersion())); } } List<TaskDefinitionLog> taskDefinitionLogs = taskDefinitionLogMapper.queryByTaskDefinitions(taskDefinitionSet); return new ArrayList<>(taskDefinitionLogs); } /**
closed
apache/dolphinscheduler
https://github.com/apache/dolphinscheduler
5,229
[Feature][server port] server port custom config
**Describe the feature** all application can custom config server port
https://github.com/apache/dolphinscheduler/issues/5229
https://github.com/apache/dolphinscheduler/pull/6947
100a9ba3fc21764158593bd33e2b261b0ef39982
0dcff1425a28da0ce0004fc3e594b97d080c5fd9
"2021-04-07T09:22:45Z"
java
"2021-11-30T16:21:03Z"
dolphinscheduler-service/src/main/java/org/apache/dolphinscheduler/service/process/ProcessService.java
* find process instance by id * * @param processId processId * @return process instance */ public ProcessInstance findProcessInstanceById(int processId) { return processInstanceMapper.selectById(processId); } /** * find process define by id. * * @param processDefinitionId processDefinitionId * @return process definition */ public ProcessDefinition findProcessDefineById(int processDefinitionId) { return processDefineMapper.selectById(processDefinitionId); } /** * find process define by code and version. * * @param processDefinitionCode processDefinitionCode * @return process definition */ public ProcessDefinition findProcessDefinition(Long processDefinitionCode, int version) { ProcessDefinition processDefinition = processDefineMapper.queryByCode(processDefinitionCode); if (processDefinition == null || processDefinition.getVersion() != version) { processDefinition = processDefineLogMapper.queryByDefinitionCodeAndVersion(processDefinitionCode, version); if (processDefinition != null) { processDefinition.setId(0); }
closed
apache/dolphinscheduler
https://github.com/apache/dolphinscheduler
5,229
[Feature][server port] server port custom config
**Describe the feature** all application can custom config server port
https://github.com/apache/dolphinscheduler/issues/5229
https://github.com/apache/dolphinscheduler/pull/6947
100a9ba3fc21764158593bd33e2b261b0ef39982
0dcff1425a28da0ce0004fc3e594b97d080c5fd9
"2021-04-07T09:22:45Z"
java
"2021-11-30T16:21:03Z"
dolphinscheduler-service/src/main/java/org/apache/dolphinscheduler/service/process/ProcessService.java
} return processDefinition; } /** * find process define by code. * * @param processDefinitionCode processDefinitionCode * @return process definition */ public ProcessDefinition findProcessDefinitionByCode(Long processDefinitionCode) { return processDefineMapper.queryByCode(processDefinitionCode); } /** * delete work process instance by id * * @param processInstanceId processInstanceId * @return delete process instance result */ public int deleteWorkProcessInstanceById(int processInstanceId) { return processInstanceMapper.deleteById(processInstanceId); } /** * delete all sub process by parent instance id * * @param processInstanceId processInstanceId * @return delete all sub process instance result */ public int deleteAllSubWorkProcessByParentId(int processInstanceId) { List<Integer> subProcessIdList = processInstanceMapMapper.querySubIdListByParentId(processInstanceId); for (Integer subId : subProcessIdList) {
closed
apache/dolphinscheduler
https://github.com/apache/dolphinscheduler
5,229
[Feature][server port] server port custom config
**Describe the feature** all application can custom config server port
https://github.com/apache/dolphinscheduler/issues/5229
https://github.com/apache/dolphinscheduler/pull/6947
100a9ba3fc21764158593bd33e2b261b0ef39982
0dcff1425a28da0ce0004fc3e594b97d080c5fd9
"2021-04-07T09:22:45Z"
java
"2021-11-30T16:21:03Z"
dolphinscheduler-service/src/main/java/org/apache/dolphinscheduler/service/process/ProcessService.java
deleteAllSubWorkProcessByParentId(subId); deleteWorkProcessMapByParentId(subId); removeTaskLogFile(subId); deleteWorkProcessInstanceById(subId); } return 1; } /** * remove task log file * * @param processInstanceId processInstanceId */ public void removeTaskLogFile(Integer processInstanceId) { List<TaskInstance> taskInstanceList = findValidTaskListByProcessId(processInstanceId); if (CollectionUtils.isEmpty(taskInstanceList)) { return; } try (LogClientService logClient = new LogClientService()) { for (TaskInstance taskInstance : taskInstanceList) { String taskLogPath = taskInstance.getLogPath(); if (StringUtils.isEmpty(taskInstance.getHost())) { continue; } int port = Constants.RPC_PORT; String ip = ""; try { ip = Host.of(taskInstance.getHost()).getIp(); } catch (Exception e) { ip = taskInstance.getHost();
closed
apache/dolphinscheduler
https://github.com/apache/dolphinscheduler
5,229
[Feature][server port] server port custom config
**Describe the feature** all application can custom config server port
https://github.com/apache/dolphinscheduler/issues/5229
https://github.com/apache/dolphinscheduler/pull/6947
100a9ba3fc21764158593bd33e2b261b0ef39982
0dcff1425a28da0ce0004fc3e594b97d080c5fd9
"2021-04-07T09:22:45Z"
java
"2021-11-30T16:21:03Z"
dolphinscheduler-service/src/main/java/org/apache/dolphinscheduler/service/process/ProcessService.java
} logClient.removeTaskLog(ip, port, taskLogPath); } } } /** * recursive query sub process definition id by parent id. * * @param parentCode parentCode * @param ids ids */ public void recurseFindSubProcess(long parentCode, List<Long> ids) { List<TaskDefinition> taskNodeList = this.getTaskNodeListByDefinition(parentCode); if (taskNodeList != null && !taskNodeList.isEmpty()) { for (TaskDefinition taskNode : taskNodeList) { String parameter = taskNode.getTaskParams(); ObjectNode parameterJson = JSONUtils.parseObject(parameter); if (parameterJson.get(CMD_PARAM_SUB_PROCESS_DEFINE_CODE) != null) { SubProcessParameters subProcessParam = JSONUtils.parseObject(parameter, SubProcessParameters.class); ids.add(subProcessParam.getProcessDefinitionCode()); recurseFindSubProcess(subProcessParam.getProcessDefinitionCode(), ids); } } } } /** * create recovery waiting thread command when thread pool is not enough for the process instance. * sub work process instance need not to create recovery command. * create recovery waiting thread command and delete origin command at the same time.
closed
apache/dolphinscheduler
https://github.com/apache/dolphinscheduler
5,229
[Feature][server port] server port custom config
**Describe the feature** all application can custom config server port
https://github.com/apache/dolphinscheduler/issues/5229
https://github.com/apache/dolphinscheduler/pull/6947
100a9ba3fc21764158593bd33e2b261b0ef39982
0dcff1425a28da0ce0004fc3e594b97d080c5fd9
"2021-04-07T09:22:45Z"
java
"2021-11-30T16:21:03Z"
dolphinscheduler-service/src/main/java/org/apache/dolphinscheduler/service/process/ProcessService.java
* if the recovery command is exists, only update the field update_time * * @param originCommand originCommand * @param processInstance processInstance */ public void createRecoveryWaitingThreadCommand(Command originCommand, ProcessInstance processInstance) { if (processInstance.getIsSubProcess() == Flag.YES) { if (originCommand != null) { commandMapper.deleteById(originCommand.getId()); } return; } Map<String, String> cmdParam = new HashMap<>(); cmdParam.put(Constants.CMD_PARAM_RECOVERY_WAITING_THREAD, String.valueOf(processInstance.getId())); if (originCommand == null) { Command command = new Command( CommandType.RECOVER_WAITING_THREAD, processInstance.getTaskDependType(), processInstance.getFailureStrategy(), processInstance.getExecutorId(), processInstance.getProcessDefinition().getCode(), JSONUtils.toJsonString(cmdParam), processInstance.getWarningType(), processInstance.getWarningGroupId(), processInstance.getScheduleTime(), processInstance.getWorkerGroup(), processInstance.getEnvironmentCode(), processInstance.getProcessInstancePriority(),
closed
apache/dolphinscheduler
https://github.com/apache/dolphinscheduler
5,229
[Feature][server port] server port custom config
**Describe the feature** all application can custom config server port
https://github.com/apache/dolphinscheduler/issues/5229
https://github.com/apache/dolphinscheduler/pull/6947
100a9ba3fc21764158593bd33e2b261b0ef39982
0dcff1425a28da0ce0004fc3e594b97d080c5fd9
"2021-04-07T09:22:45Z"
java
"2021-11-30T16:21:03Z"
dolphinscheduler-service/src/main/java/org/apache/dolphinscheduler/service/process/ProcessService.java
processInstance.getDryRun(), processInstance.getId(), processInstance.getProcessDefinitionVersion() ); saveCommand(command); return; } if (originCommand.getCommandType() == CommandType.RECOVER_WAITING_THREAD) { originCommand.setUpdateTime(new Date()); saveCommand(originCommand); } else { commandMapper.deleteById(originCommand.getId()); originCommand.setId(0); originCommand.setCommandType(CommandType.RECOVER_WAITING_THREAD); originCommand.setUpdateTime(new Date()); originCommand.setCommandParam(JSONUtils.toJsonString(cmdParam)); originCommand.setProcessInstancePriority(processInstance.getProcessInstancePriority()); saveCommand(originCommand); } } /** * get schedule time from command * * @param command command * @param cmdParam cmdParam map * @return date */ private Date getScheduleTime(Command command, Map<String, String> cmdParam) {
closed
apache/dolphinscheduler
https://github.com/apache/dolphinscheduler
5,229
[Feature][server port] server port custom config
**Describe the feature** all application can custom config server port
https://github.com/apache/dolphinscheduler/issues/5229
https://github.com/apache/dolphinscheduler/pull/6947
100a9ba3fc21764158593bd33e2b261b0ef39982
0dcff1425a28da0ce0004fc3e594b97d080c5fd9
"2021-04-07T09:22:45Z"
java
"2021-11-30T16:21:03Z"
dolphinscheduler-service/src/main/java/org/apache/dolphinscheduler/service/process/ProcessService.java
Date scheduleTime = command.getScheduleTime(); if (scheduleTime == null && cmdParam != null && cmdParam.containsKey(CMDPARAM_COMPLEMENT_DATA_START_DATE)) { Date start = DateUtils.stringToDate(cmdParam.get(CMDPARAM_COMPLEMENT_DATA_START_DATE)); Date end = DateUtils.stringToDate(cmdParam.get(CMDPARAM_COMPLEMENT_DATA_END_DATE)); List<Schedule> schedules = queryReleaseSchedulerListByProcessDefinitionCode(command.getProcessDefinitionCode()); List<Date> complementDateList = CronUtils.getSelfFireDateList(start, end, schedules); if (complementDateList.size() > 0) { scheduleTime = complementDateList.get(0); } else { logger.error("set scheduler time error: complement date list is empty, command: {}", command.toString()); } } return scheduleTime; } /** * generate a new work process instance from command. * * @param processDefinition processDefinition * @param command command * @param cmdParam cmdParam map * @return process instance */ private ProcessInstance generateNewProcessInstance(ProcessDefinition processDefinition, Command command, Map<String, String> cmdParam) { ProcessInstance processInstance = new ProcessInstance(processDefinition); processInstance.setProcessDefinitionCode(processDefinition.getCode());
closed
apache/dolphinscheduler
https://github.com/apache/dolphinscheduler
5,229
[Feature][server port] server port custom config
**Describe the feature** all application can custom config server port
https://github.com/apache/dolphinscheduler/issues/5229
https://github.com/apache/dolphinscheduler/pull/6947
100a9ba3fc21764158593bd33e2b261b0ef39982
0dcff1425a28da0ce0004fc3e594b97d080c5fd9
"2021-04-07T09:22:45Z"
java
"2021-11-30T16:21:03Z"
dolphinscheduler-service/src/main/java/org/apache/dolphinscheduler/service/process/ProcessService.java
processInstance.setProcessDefinitionVersion(processDefinition.getVersion()); processInstance.setState(ExecutionStatus.RUNNING_EXECUTION); processInstance.setRecovery(Flag.NO); processInstance.setStartTime(new Date()); processInstance.setRunTimes(1); processInstance.setMaxTryTimes(0); processInstance.setCommandParam(command.getCommandParam()); processInstance.setCommandType(command.getCommandType()); processInstance.setIsSubProcess(Flag.NO); processInstance.setTaskDependType(command.getTaskDependType()); processInstance.setFailureStrategy(command.getFailureStrategy()); processInstance.setExecutorId(command.getExecutorId()); WarningType warningType = command.getWarningType() == null ? WarningType.NONE : command.getWarningType(); processInstance.setWarningType(warningType); Integer warningGroupId = command.getWarningGroupId() == null ? 0 : command.getWarningGroupId(); processInstance.setWarningGroupId(warningGroupId); processInstance.setDryRun(command.getDryRun()); if (command.getScheduleTime() != null) { processInstance.setScheduleTime(command.getScheduleTime()); } processInstance.setCommandStartTime(command.getStartTime()); processInstance.setLocations(processDefinition.getLocations()); setGlobalParamIfCommanded(processDefinition, cmdParam); processInstance.setGlobalParams(ParameterUtils.curingGlobalParams( processDefinition.getGlobalParamMap(), processDefinition.getGlobalParamList(), getCommandTypeIfComplement(processInstance, command), processInstance.getScheduleTime()));
closed
apache/dolphinscheduler
https://github.com/apache/dolphinscheduler
5,229
[Feature][server port] server port custom config
**Describe the feature** all application can custom config server port
https://github.com/apache/dolphinscheduler/issues/5229
https://github.com/apache/dolphinscheduler/pull/6947
100a9ba3fc21764158593bd33e2b261b0ef39982
0dcff1425a28da0ce0004fc3e594b97d080c5fd9
"2021-04-07T09:22:45Z"
java
"2021-11-30T16:21:03Z"
dolphinscheduler-service/src/main/java/org/apache/dolphinscheduler/service/process/ProcessService.java
processInstance.setProcessInstancePriority(command.getProcessInstancePriority()); String workerGroup = StringUtils.isBlank(command.getWorkerGroup()) ? Constants.DEFAULT_WORKER_GROUP : command.getWorkerGroup(); processInstance.setWorkerGroup(workerGroup); processInstance.setEnvironmentCode(Objects.isNull(command.getEnvironmentCode()) ? -1 : command.getEnvironmentCode()); processInstance.setTimeout(processDefinition.getTimeout()); processInstance.setTenantId(processDefinition.getTenantId()); return processInstance; } private void setGlobalParamIfCommanded(ProcessDefinition processDefinition, Map<String, String> cmdParam) { Map<String, String> startParamMap = new HashMap<>(); if (cmdParam != null && cmdParam.containsKey(Constants.CMD_PARAM_START_PARAMS)) { String startParamJson = cmdParam.get(Constants.CMD_PARAM_START_PARAMS); startParamMap = JSONUtils.toMap(startParamJson); } Map<String, String> fatherParamMap = new HashMap<>(); if (cmdParam != null && cmdParam.containsKey(Constants.CMD_PARAM_FATHER_PARAMS)) { String fatherParamJson = cmdParam.get(Constants.CMD_PARAM_FATHER_PARAMS); fatherParamMap = JSONUtils.toMap(fatherParamJson); } startParamMap.putAll(fatherParamMap); if (startParamMap.size() > 0 && processDefinition.getGlobalParamMap() != null) { for (Map.Entry<String, String> param : processDefinition.getGlobalParamMap().entrySet()) { String val = startParamMap.get(param.getKey()); if (val != null) { param.setValue(val); }
closed
apache/dolphinscheduler
https://github.com/apache/dolphinscheduler
5,229
[Feature][server port] server port custom config
**Describe the feature** all application can custom config server port
https://github.com/apache/dolphinscheduler/issues/5229
https://github.com/apache/dolphinscheduler/pull/6947
100a9ba3fc21764158593bd33e2b261b0ef39982
0dcff1425a28da0ce0004fc3e594b97d080c5fd9
"2021-04-07T09:22:45Z"
java
"2021-11-30T16:21:03Z"
dolphinscheduler-service/src/main/java/org/apache/dolphinscheduler/service/process/ProcessService.java
} } } /** * get process tenant * there is tenant id in definition, use the tenant of the definition. * if there is not tenant id in the definiton or the tenant not exist * use definition creator's tenant. * * @param tenantId tenantId * @param userId userId * @return tenant */ public Tenant getTenantForProcess(int tenantId, int userId) { Tenant tenant = null; if (tenantId >= 0) { tenant = tenantCacheProcessor.queryById(tenantId); } if (userId == 0) { return null; } if (tenant == null) { User user = userCacheProcessor.selectById(userId); tenant = tenantCacheProcessor.queryById(user.getTenantId()); } return tenant; } /** * get an environment * use the code of the environment to find a environment.
closed
apache/dolphinscheduler
https://github.com/apache/dolphinscheduler
5,229
[Feature][server port] server port custom config
**Describe the feature** all application can custom config server port
https://github.com/apache/dolphinscheduler/issues/5229
https://github.com/apache/dolphinscheduler/pull/6947
100a9ba3fc21764158593bd33e2b261b0ef39982
0dcff1425a28da0ce0004fc3e594b97d080c5fd9
"2021-04-07T09:22:45Z"
java
"2021-11-30T16:21:03Z"
dolphinscheduler-service/src/main/java/org/apache/dolphinscheduler/service/process/ProcessService.java
* * @param environmentCode environmentCode * @return Environment */ public Environment findEnvironmentByCode(Long environmentCode) { Environment environment = null; if (environmentCode >= 0) { environment = environmentMapper.queryByEnvironmentCode(environmentCode); } return environment; } /** * check command parameters is valid * * @param command command * @param cmdParam cmdParam map * @return whether command param is valid */ private Boolean checkCmdParam(Command command, Map<String, String> cmdParam) { if (command.getTaskDependType() == TaskDependType.TASK_ONLY || command.getTaskDependType() == TaskDependType.TASK_PRE) { if (cmdParam == null || !cmdParam.containsKey(Constants.CMD_PARAM_START_NODES) || cmdParam.get(Constants.CMD_PARAM_START_NODES).isEmpty()) { logger.error("command node depend type is {}, but start nodes is null ", command.getTaskDependType()); return false; } } return true; } /**
closed
apache/dolphinscheduler
https://github.com/apache/dolphinscheduler
5,229
[Feature][server port] server port custom config
**Describe the feature** all application can custom config server port
https://github.com/apache/dolphinscheduler/issues/5229
https://github.com/apache/dolphinscheduler/pull/6947
100a9ba3fc21764158593bd33e2b261b0ef39982
0dcff1425a28da0ce0004fc3e594b97d080c5fd9
"2021-04-07T09:22:45Z"
java
"2021-11-30T16:21:03Z"
dolphinscheduler-service/src/main/java/org/apache/dolphinscheduler/service/process/ProcessService.java
* construct process instance according to one command. * * @param command command * @param host host * @return process instance */ private ProcessInstance constructProcessInstance(Command command, String host, HashMap<String, ProcessDefinition> processDefinitionCacheMaps) { ProcessInstance processInstance; ProcessDefinition processDefinition; CommandType commandType = command.getCommandType(); String key = String.format("%d-%d", command.getProcessDefinitionCode(), command.getProcessDefinitionVersion()); if (processDefinitionCacheMaps.containsKey(key)) { processDefinition = processDefinitionCacheMaps.get(key); } else { processDefinition = this.findProcessDefinition(command.getProcessDefinitionCode(), command.getProcessDefinitionVersion()); if (processDefinition != null) { processDefinitionCacheMaps.put(key, processDefinition); } } if (processDefinition == null) { logger.error("cannot find the work process define! define code : {}", command.getProcessDefinitionCode()); return null; } Map<String, String> cmdParam = JSONUtils.toMap(command.getCommandParam()); int processInstanceId = command.getProcessInstanceId(); if (processInstanceId == 0) { processInstance = generateNewProcessInstance(processDefinition, command, cmdParam); } else { processInstance = this.findProcessInstanceDetailById(processInstanceId); if (processInstance == null) {
closed
apache/dolphinscheduler
https://github.com/apache/dolphinscheduler
5,229
[Feature][server port] server port custom config
**Describe the feature** all application can custom config server port
https://github.com/apache/dolphinscheduler/issues/5229
https://github.com/apache/dolphinscheduler/pull/6947
100a9ba3fc21764158593bd33e2b261b0ef39982
0dcff1425a28da0ce0004fc3e594b97d080c5fd9
"2021-04-07T09:22:45Z"
java
"2021-11-30T16:21:03Z"
dolphinscheduler-service/src/main/java/org/apache/dolphinscheduler/service/process/ProcessService.java
return processInstance; } } if (cmdParam != null) { CommandType commandTypeIfComplement = getCommandTypeIfComplement(processInstance, command); if (commandTypeIfComplement == CommandType.REPEAT_RUNNING) { setGlobalParamIfCommanded(processDefinition, cmdParam); } processInstance.setGlobalParams(ParameterUtils.curingGlobalParams( processDefinition.getGlobalParamMap(), processDefinition.getGlobalParamList(), commandTypeIfComplement, processInstance.getScheduleTime())); processInstance.setProcessDefinition(processDefinition); } if (processInstance.getCommandParam() != null) { Map<String, String> processCmdParam = JSONUtils.toMap(processInstance.getCommandParam()); for (Map.Entry<String, String> entry : processCmdParam.entrySet()) { if (!cmdParam.containsKey(entry.getKey())) { cmdParam.put(entry.getKey(), entry.getValue()); } } } if (cmdParam != null && cmdParam.containsKey(Constants.CMD_PARAM_SUB_PROCESS)) { processInstance.setCommandParam(command.getCommandParam()); }
closed
apache/dolphinscheduler
https://github.com/apache/dolphinscheduler
5,229
[Feature][server port] server port custom config
**Describe the feature** all application can custom config server port
https://github.com/apache/dolphinscheduler/issues/5229
https://github.com/apache/dolphinscheduler/pull/6947
100a9ba3fc21764158593bd33e2b261b0ef39982
0dcff1425a28da0ce0004fc3e594b97d080c5fd9
"2021-04-07T09:22:45Z"
java
"2021-11-30T16:21:03Z"
dolphinscheduler-service/src/main/java/org/apache/dolphinscheduler/service/process/ProcessService.java
if (Boolean.FALSE.equals(checkCmdParam(command, cmdParam))) { logger.error("command parameter check failed!"); return null; } if (command.getScheduleTime() != null) { processInstance.setScheduleTime(command.getScheduleTime()); } processInstance.setHost(host); ExecutionStatus runStatus = ExecutionStatus.RUNNING_EXECUTION; int runTime = processInstance.getRunTimes(); switch (commandType) { case START_PROCESS: break; case START_FAILURE_TASK_PROCESS: List<Integer> failedList = this.findTaskIdByInstanceState(processInstance.getId(), ExecutionStatus.FAILURE); List<Integer> toleranceList = this.findTaskIdByInstanceState(processInstance.getId(), ExecutionStatus.NEED_FAULT_TOLERANCE); List<Integer> killedList = this.findTaskIdByInstanceState(processInstance.getId(), ExecutionStatus.KILL); cmdParam.remove(Constants.CMD_PARAM_RECOVERY_START_NODE_STRING); failedList.addAll(killedList); failedList.addAll(toleranceList); for (Integer taskId : failedList) { initTaskInstance(this.findTaskInstanceById(taskId)); } cmdParam.put(Constants.CMD_PARAM_RECOVERY_START_NODE_STRING, String.join(Constants.COMMA, convertIntListToString(failedList))); processInstance.setCommandParam(JSONUtils.toJsonString(cmdParam)); processInstance.setRunTimes(runTime + 1); break; case START_CURRENT_TASK_PROCESS:
closed
apache/dolphinscheduler
https://github.com/apache/dolphinscheduler
5,229
[Feature][server port] server port custom config
**Describe the feature** all application can custom config server port
https://github.com/apache/dolphinscheduler/issues/5229
https://github.com/apache/dolphinscheduler/pull/6947
100a9ba3fc21764158593bd33e2b261b0ef39982
0dcff1425a28da0ce0004fc3e594b97d080c5fd9
"2021-04-07T09:22:45Z"
java
"2021-11-30T16:21:03Z"
dolphinscheduler-service/src/main/java/org/apache/dolphinscheduler/service/process/ProcessService.java
break; case RECOVER_WAITING_THREAD: break; case RECOVER_SUSPENDED_PROCESS: cmdParam.remove(Constants.CMD_PARAM_RECOVERY_START_NODE_STRING); List<Integer> suspendedNodeList = this.findTaskIdByInstanceState(processInstance.getId(), ExecutionStatus.PAUSE); List<Integer> stopNodeList = findTaskIdByInstanceState(processInstance.getId(), ExecutionStatus.KILL); suspendedNodeList.addAll(stopNodeList); for (Integer taskId : suspendedNodeList) { initTaskInstance(this.findTaskInstanceById(taskId)); } cmdParam.put(Constants.CMD_PARAM_RECOVERY_START_NODE_STRING, String.join(",", convertIntListToString(suspendedNodeList))); processInstance.setCommandParam(JSONUtils.toJsonString(cmdParam)); processInstance.setRunTimes(runTime + 1); break; case RECOVER_TOLERANCE_FAULT_PROCESS: processInstance.setRecovery(Flag.YES); runStatus = processInstance.getState(); break; case COMPLEMENT_DATA: if (processInstance.getId() != 0) { List<TaskInstance> taskInstanceList = this.findValidTaskListByProcessId(processInstance.getId()); for (TaskInstance taskInstance : taskInstanceList) { taskInstance.setFlag(Flag.NO); this.updateTaskInstance(taskInstance);
closed
apache/dolphinscheduler
https://github.com/apache/dolphinscheduler
5,229
[Feature][server port] server port custom config
**Describe the feature** all application can custom config server port
https://github.com/apache/dolphinscheduler/issues/5229
https://github.com/apache/dolphinscheduler/pull/6947
100a9ba3fc21764158593bd33e2b261b0ef39982
0dcff1425a28da0ce0004fc3e594b97d080c5fd9
"2021-04-07T09:22:45Z"
java
"2021-11-30T16:21:03Z"
dolphinscheduler-service/src/main/java/org/apache/dolphinscheduler/service/process/ProcessService.java
} } break; case REPEAT_RUNNING: if (cmdParam.containsKey(Constants.CMD_PARAM_RECOVERY_START_NODE_STRING)) { cmdParam.remove(Constants.CMD_PARAM_RECOVERY_START_NODE_STRING); processInstance.setCommandParam(JSONUtils.toJsonString(cmdParam)); } List<TaskInstance> validTaskList = findValidTaskListByProcessId(processInstance.getId()); for (TaskInstance taskInstance : validTaskList) { taskInstance.setFlag(Flag.NO); updateTaskInstance(taskInstance); } processInstance.setStartTime(new Date()); processInstance.setEndTime(null); processInstance.setRunTimes(runTime + 1); initComplementDataParam(processDefinition, processInstance, cmdParam); break; case SCHEDULER: break; default: break; } processInstance.setState(runStatus); return processInstance; } /** * get process definition by command
closed
apache/dolphinscheduler
https://github.com/apache/dolphinscheduler
5,229
[Feature][server port] server port custom config
**Describe the feature** all application can custom config server port
https://github.com/apache/dolphinscheduler/issues/5229
https://github.com/apache/dolphinscheduler/pull/6947
100a9ba3fc21764158593bd33e2b261b0ef39982
0dcff1425a28da0ce0004fc3e594b97d080c5fd9
"2021-04-07T09:22:45Z"
java
"2021-11-30T16:21:03Z"
dolphinscheduler-service/src/main/java/org/apache/dolphinscheduler/service/process/ProcessService.java
* If it is a fault-tolerant command, get the specified version of ProcessDefinition through ProcessInstance * Otherwise, get the latest version of ProcessDefinition * * @return ProcessDefinition */ private ProcessDefinition getProcessDefinitionByCommand(long processDefinitionCode, Map<String, String> cmdParam) { if (cmdParam != null) { int processInstanceId = 0; if (cmdParam.containsKey(Constants.CMD_PARAM_RECOVER_PROCESS_ID_STRING)) { processInstanceId = Integer.parseInt(cmdParam.get(Constants.CMD_PARAM_RECOVER_PROCESS_ID_STRING)); } else if (cmdParam.containsKey(Constants.CMD_PARAM_SUB_PROCESS)) { processInstanceId = Integer.parseInt(cmdParam.get(Constants.CMD_PARAM_SUB_PROCESS)); } else if (cmdParam.containsKey(Constants.CMD_PARAM_RECOVERY_WAITING_THREAD)) { processInstanceId = Integer.parseInt(cmdParam.get(Constants.CMD_PARAM_RECOVERY_WAITING_THREAD)); } if (processInstanceId != 0) { ProcessInstance processInstance = this.findProcessInstanceDetailById(processInstanceId); if (processInstance == null) { return null; } return processDefineLogMapper.queryByDefinitionCodeAndVersion( processInstance.getProcessDefinitionCode(), processInstance.getProcessDefinitionVersion()); } } return processDefineMapper.queryByCode(processDefinitionCode); } /** * return complement data if the process start with complement data * * @param processInstance processInstance
closed
apache/dolphinscheduler
https://github.com/apache/dolphinscheduler
5,229
[Feature][server port] server port custom config
**Describe the feature** all application can custom config server port
https://github.com/apache/dolphinscheduler/issues/5229
https://github.com/apache/dolphinscheduler/pull/6947
100a9ba3fc21764158593bd33e2b261b0ef39982
0dcff1425a28da0ce0004fc3e594b97d080c5fd9
"2021-04-07T09:22:45Z"
java
"2021-11-30T16:21:03Z"
dolphinscheduler-service/src/main/java/org/apache/dolphinscheduler/service/process/ProcessService.java
* @param command command * @return command type */ private CommandType getCommandTypeIfComplement(ProcessInstance processInstance, Command command) { if (CommandType.COMPLEMENT_DATA == processInstance.getCmdTypeIfComplement()) { return CommandType.COMPLEMENT_DATA; } else { return command.getCommandType(); } } /** * initialize complement data parameters * * @param processDefinition processDefinition * @param processInstance processInstance * @param cmdParam cmdParam */ private void initComplementDataParam(ProcessDefinition processDefinition, ProcessInstance processInstance, Map<String, String> cmdParam) { if (!processInstance.isComplementData()) { return; } Date start = DateUtils.stringToDate(cmdParam.get(CMDPARAM_COMPLEMENT_DATA_START_DATE)); Date end = DateUtils.stringToDate(cmdParam.get(CMDPARAM_COMPLEMENT_DATA_END_DATE)); List<Schedule> listSchedules = queryReleaseSchedulerListByProcessDefinitionCode(processInstance.getProcessDefinitionCode()); List<Date> complementDate = CronUtils.getSelfFireDateList(start, end, listSchedules); if (complementDate.size() > 0 && Flag.NO == processInstance.getIsSubProcess()) { processInstance.setScheduleTime(complementDate.get(0));
closed
apache/dolphinscheduler
https://github.com/apache/dolphinscheduler
5,229
[Feature][server port] server port custom config
**Describe the feature** all application can custom config server port
https://github.com/apache/dolphinscheduler/issues/5229
https://github.com/apache/dolphinscheduler/pull/6947
100a9ba3fc21764158593bd33e2b261b0ef39982
0dcff1425a28da0ce0004fc3e594b97d080c5fd9
"2021-04-07T09:22:45Z"
java
"2021-11-30T16:21:03Z"
dolphinscheduler-service/src/main/java/org/apache/dolphinscheduler/service/process/ProcessService.java
} processInstance.setGlobalParams(ParameterUtils.curingGlobalParams( processDefinition.getGlobalParamMap(), processDefinition.getGlobalParamList(), CommandType.COMPLEMENT_DATA, processInstance.getScheduleTime())); } /** * set sub work process parameters. * handle sub work process instance, update relation table and command parameters * set sub work process flag, extends parent work process command parameters * * @param subProcessInstance subProcessInstance */ public void setSubProcessParam(ProcessInstance subProcessInstance) { String cmdParam = subProcessInstance.getCommandParam(); if (StringUtils.isEmpty(cmdParam)) { return; } Map<String, String> paramMap = JSONUtils.toMap(cmdParam); if (paramMap.containsKey(CMD_PARAM_SUB_PROCESS) && CMD_PARAM_EMPTY_SUB_PROCESS.equals(paramMap.get(CMD_PARAM_SUB_PROCESS))) { paramMap.remove(CMD_PARAM_SUB_PROCESS); paramMap.put(CMD_PARAM_SUB_PROCESS, String.valueOf(subProcessInstance.getId())); subProcessInstance.setCommandParam(JSONUtils.toJsonString(paramMap)); subProcessInstance.setIsSubProcess(Flag.YES); this.saveProcessInstance(subProcessInstance); } String parentInstanceId = paramMap.get(CMD_PARAM_SUB_PROCESS_PARENT_INSTANCE_ID);
closed
apache/dolphinscheduler
https://github.com/apache/dolphinscheduler
5,229
[Feature][server port] server port custom config
**Describe the feature** all application can custom config server port
https://github.com/apache/dolphinscheduler/issues/5229
https://github.com/apache/dolphinscheduler/pull/6947
100a9ba3fc21764158593bd33e2b261b0ef39982
0dcff1425a28da0ce0004fc3e594b97d080c5fd9
"2021-04-07T09:22:45Z"
java
"2021-11-30T16:21:03Z"
dolphinscheduler-service/src/main/java/org/apache/dolphinscheduler/service/process/ProcessService.java
if (StringUtils.isNotEmpty(parentInstanceId)) { ProcessInstance parentInstance = findProcessInstanceDetailById(Integer.parseInt(parentInstanceId)); if (parentInstance != null) { subProcessInstance.setGlobalParams( joinGlobalParams(parentInstance.getGlobalParams(), subProcessInstance.getGlobalParams())); this.saveProcessInstance(subProcessInstance); } else { logger.error("sub process command params error, cannot find parent instance: {} ", cmdParam); } } ProcessInstanceMap processInstanceMap = JSONUtils.parseObject(cmdParam, ProcessInstanceMap.class); if (processInstanceMap == null || processInstanceMap.getParentProcessInstanceId() == 0) { return; } processInstanceMap.setProcessInstanceId(subProcessInstance.getId()); this.updateWorkProcessInstanceMap(processInstanceMap); } /** * join parent global params into sub process. * only the keys doesn't in sub process global would be joined. * * @param parentGlobalParams parentGlobalParams * @param subGlobalParams subGlobalParams * @return global params join */ private String joinGlobalParams(String parentGlobalParams, String subGlobalParams) { List<Property> parentPropertyList = JSONUtils.toList(parentGlobalParams, Property.class); List<Property> subPropertyList = JSONUtils.toList(subGlobalParams, Property.class); Map<String, String> subMap = subPropertyList.stream().collect(Collectors.toMap(Property::getProp, Property::getValue));
closed
apache/dolphinscheduler
https://github.com/apache/dolphinscheduler
5,229
[Feature][server port] server port custom config
**Describe the feature** all application can custom config server port
https://github.com/apache/dolphinscheduler/issues/5229
https://github.com/apache/dolphinscheduler/pull/6947
100a9ba3fc21764158593bd33e2b261b0ef39982
0dcff1425a28da0ce0004fc3e594b97d080c5fd9
"2021-04-07T09:22:45Z"
java
"2021-11-30T16:21:03Z"
dolphinscheduler-service/src/main/java/org/apache/dolphinscheduler/service/process/ProcessService.java
for (Property parent : parentPropertyList) { if (!subMap.containsKey(parent.getProp())) { subPropertyList.add(parent); } } return JSONUtils.toJsonString(subPropertyList); } /** * initialize task instance * * @param taskInstance taskInstance */ private void initTaskInstance(TaskInstance taskInstance) { if (!taskInstance.isSubProcess() && (taskInstance.getState().typeIsCancel() || taskInstance.getState().typeIsFailure())) { taskInstance.setFlag(Flag.NO); updateTaskInstance(taskInstance); return; } taskInstance.setState(ExecutionStatus.SUBMITTED_SUCCESS); updateTaskInstance(taskInstance); } /** * retry submit task to db */ public TaskInstance submitTaskWithRetry(ProcessInstance processInstance, TaskInstance taskInstance, int commitRetryTimes, int commitInterval) { int retryTimes = 1; TaskInstance task = null; while (retryTimes <= commitRetryTimes) { try {
closed
apache/dolphinscheduler
https://github.com/apache/dolphinscheduler
5,229
[Feature][server port] server port custom config
**Describe the feature** all application can custom config server port
https://github.com/apache/dolphinscheduler/issues/5229
https://github.com/apache/dolphinscheduler/pull/6947
100a9ba3fc21764158593bd33e2b261b0ef39982
0dcff1425a28da0ce0004fc3e594b97d080c5fd9
"2021-04-07T09:22:45Z"
java
"2021-11-30T16:21:03Z"
dolphinscheduler-service/src/main/java/org/apache/dolphinscheduler/service/process/ProcessService.java
task = SpringApplicationContext.getBean(ProcessService.class).submitTask(processInstance, taskInstance); if (task != null && task.getId() != 0) { break; } logger.error("task commit to db failed , taskId {} has already retry {} times, please check the database", taskInstance.getId(), retryTimes); Thread.sleep(commitInterval); } catch (Exception e) { logger.error("task commit to mysql failed", e); } retryTimes += 1; } return task; } /** * submit task to db * submit sub process to command * * @param processInstance processInstance * @param taskInstance taskInstance * @return task instance */ @Transactional(rollbackFor = Exception.class) public TaskInstance submitTask(ProcessInstance processInstance, TaskInstance taskInstance) { logger.info("start submit task : {}, instance id:{}, state: {}", taskInstance.getName(), taskInstance.getProcessInstanceId(), processInstance.getState()); TaskInstance task = submitTaskInstanceToDB(taskInstance, processInstance); if (task == null) { logger.error("end submit task to db error, task name:{}, process id:{} state: {} ",
closed
apache/dolphinscheduler
https://github.com/apache/dolphinscheduler
5,229
[Feature][server port] server port custom config
**Describe the feature** all application can custom config server port
https://github.com/apache/dolphinscheduler/issues/5229
https://github.com/apache/dolphinscheduler/pull/6947
100a9ba3fc21764158593bd33e2b261b0ef39982
0dcff1425a28da0ce0004fc3e594b97d080c5fd9
"2021-04-07T09:22:45Z"
java
"2021-11-30T16:21:03Z"
dolphinscheduler-service/src/main/java/org/apache/dolphinscheduler/service/process/ProcessService.java
taskInstance.getName(), taskInstance.getProcessInstance(), processInstance.getState()); return null; } if (!task.getState().typeIsFinished()) { createSubWorkProcess(processInstance, task); } logger.info("end submit task to db successfully:{} {} state:{} complete, instance id:{} state: {} ", taskInstance.getId(), taskInstance.getName(), task.getState(), processInstance.getId(), processInstance.getState()); return task; } /** * set work process instance map * consider o * repeat running does not generate new sub process instance * set map {parent instance id, task instance id, 0(child instance id)} * * @param parentInstance parentInstance * @param parentTask parentTask * @return process instance map */ private ProcessInstanceMap setProcessInstanceMap(ProcessInstance parentInstance, TaskInstance parentTask) { ProcessInstanceMap processMap = findWorkProcessMapByParent(parentInstance.getId(), parentTask.getId()); if (processMap != null) { return processMap; } if (parentInstance.getCommandType() == CommandType.REPEAT_RUNNING) { processMap = findPreviousTaskProcessMap(parentInstance, parentTask); if (processMap != null) { processMap.setParentTaskInstanceId(parentTask.getId());
closed
apache/dolphinscheduler
https://github.com/apache/dolphinscheduler
5,229
[Feature][server port] server port custom config
**Describe the feature** all application can custom config server port
https://github.com/apache/dolphinscheduler/issues/5229
https://github.com/apache/dolphinscheduler/pull/6947
100a9ba3fc21764158593bd33e2b261b0ef39982
0dcff1425a28da0ce0004fc3e594b97d080c5fd9
"2021-04-07T09:22:45Z"
java
"2021-11-30T16:21:03Z"
dolphinscheduler-service/src/main/java/org/apache/dolphinscheduler/service/process/ProcessService.java
updateWorkProcessInstanceMap(processMap); return processMap; } } processMap = new ProcessInstanceMap(); processMap.setParentProcessInstanceId(parentInstance.getId()); processMap.setParentTaskInstanceId(parentTask.getId()); createWorkProcessInstanceMap(processMap); return processMap; } /** * find previous task work process map. * * @param parentProcessInstance parentProcessInstance * @param parentTask parentTask * @return process instance map */ private ProcessInstanceMap findPreviousTaskProcessMap(ProcessInstance parentProcessInstance, TaskInstance parentTask) { Integer preTaskId = 0; List<TaskInstance> preTaskList = this.findPreviousTaskListByWorkProcessId(parentProcessInstance.getId()); for (TaskInstance task : preTaskList) { if (task.getName().equals(parentTask.getName())) { preTaskId = task.getId(); ProcessInstanceMap map = findWorkProcessMapByParent(parentProcessInstance.getId(), preTaskId); if (map != null) { return map; } }
closed
apache/dolphinscheduler
https://github.com/apache/dolphinscheduler
5,229
[Feature][server port] server port custom config
**Describe the feature** all application can custom config server port
https://github.com/apache/dolphinscheduler/issues/5229
https://github.com/apache/dolphinscheduler/pull/6947
100a9ba3fc21764158593bd33e2b261b0ef39982
0dcff1425a28da0ce0004fc3e594b97d080c5fd9
"2021-04-07T09:22:45Z"
java
"2021-11-30T16:21:03Z"
dolphinscheduler-service/src/main/java/org/apache/dolphinscheduler/service/process/ProcessService.java
} logger.info("sub process instance is not found,parent task:{},parent instance:{}", parentTask.getId(), parentProcessInstance.getId()); return null; } /** * create sub work process command * * @param parentProcessInstance parentProcessInstance * @param task task */ public void createSubWorkProcess(ProcessInstance parentProcessInstance, TaskInstance task) { if (!task.isSubProcess()) { return; } ProcessInstanceMap instanceMap = findWorkProcessMapByParent(parentProcessInstance.getId(), task.getId()); if (null != instanceMap && CommandType.RECOVER_TOLERANCE_FAULT_PROCESS == parentProcessInstance.getCommandType()) { return; } instanceMap = setProcessInstanceMap(parentProcessInstance, task); ProcessInstance childInstance = null; if (instanceMap.getProcessInstanceId() != 0) { childInstance = findProcessInstanceById(instanceMap.getProcessInstanceId()); } Command subProcessCommand = createSubProcessCommand(parentProcessInstance, childInstance, instanceMap, task); updateSubProcessDefinitionByParent(parentProcessInstance, subProcessCommand.getProcessDefinitionCode()); initSubInstanceState(childInstance); createCommand(subProcessCommand);
closed
apache/dolphinscheduler
https://github.com/apache/dolphinscheduler
5,229
[Feature][server port] server port custom config
**Describe the feature** all application can custom config server port
https://github.com/apache/dolphinscheduler/issues/5229
https://github.com/apache/dolphinscheduler/pull/6947
100a9ba3fc21764158593bd33e2b261b0ef39982
0dcff1425a28da0ce0004fc3e594b97d080c5fd9
"2021-04-07T09:22:45Z"
java
"2021-11-30T16:21:03Z"
dolphinscheduler-service/src/main/java/org/apache/dolphinscheduler/service/process/ProcessService.java
logger.info("sub process command created: {} ", subProcessCommand); } /** * complement data needs transform parent parameter to child. */ private String getSubWorkFlowParam(ProcessInstanceMap instanceMap, ProcessInstance parentProcessInstance, Map<String, String> fatherParams) { String processMapStr = JSONUtils.toJsonString(instanceMap); Map<String, String> cmdParam = JSONUtils.toMap(processMapStr); if (parentProcessInstance.isComplementData()) { Map<String, String> parentParam = JSONUtils.toMap(parentProcessInstance.getCommandParam()); String endTime = parentParam.get(CMDPARAM_COMPLEMENT_DATA_END_DATE); String startTime = parentParam.get(CMDPARAM_COMPLEMENT_DATA_START_DATE); cmdParam.put(CMDPARAM_COMPLEMENT_DATA_END_DATE, endTime); cmdParam.put(CMDPARAM_COMPLEMENT_DATA_START_DATE, startTime); processMapStr = JSONUtils.toJsonString(cmdParam); } if (fatherParams.size() != 0) { cmdParam.put(CMD_PARAM_FATHER_PARAMS, JSONUtils.toJsonString(fatherParams)); processMapStr = JSONUtils.toJsonString(cmdParam); } return processMapStr; } public Map<String, String> getGlobalParamMap(String globalParams) { List<Property> propList; Map<String, String> globalParamMap = new HashMap<>(); if (StringUtils.isNotEmpty(globalParams)) { propList = JSONUtils.toList(globalParams, Property.class); globalParamMap = propList.stream().collect(Collectors.toMap(Property::getProp, Property::getValue)); }
closed
apache/dolphinscheduler
https://github.com/apache/dolphinscheduler
5,229
[Feature][server port] server port custom config
**Describe the feature** all application can custom config server port
https://github.com/apache/dolphinscheduler/issues/5229
https://github.com/apache/dolphinscheduler/pull/6947
100a9ba3fc21764158593bd33e2b261b0ef39982
0dcff1425a28da0ce0004fc3e594b97d080c5fd9
"2021-04-07T09:22:45Z"
java
"2021-11-30T16:21:03Z"
dolphinscheduler-service/src/main/java/org/apache/dolphinscheduler/service/process/ProcessService.java
return globalParamMap; } /** * create sub work process command */ public Command createSubProcessCommand(ProcessInstance parentProcessInstance, ProcessInstance childInstance, ProcessInstanceMap instanceMap, TaskInstance task) { CommandType commandType = getSubCommandType(parentProcessInstance, childInstance); Map<String, String> subProcessParam = JSONUtils.toMap(task.getTaskParams()); long childDefineCode = 0L; if (subProcessParam.containsKey(Constants.CMD_PARAM_SUB_PROCESS_DEFINE_CODE)) { childDefineCode = Long.parseLong(subProcessParam.get(Constants.CMD_PARAM_SUB_PROCESS_DEFINE_CODE)); } ProcessDefinition subProcessDefinition = processDefineMapper.queryByCode(childDefineCode); Object localParams = subProcessParam.get(Constants.LOCAL_PARAMS); List<Property> allParam = JSONUtils.toList(JSONUtils.toJsonString(localParams), Property.class); Map<String, String> globalMap = this.getGlobalParamMap(parentProcessInstance.getGlobalParams()); Map<String, String> fatherParams = new HashMap<>(); if (CollectionUtils.isNotEmpty(allParam)) { for (Property info : allParam) { fatherParams.put(info.getProp(), globalMap.get(info.getProp())); } } String processParam = getSubWorkFlowParam(instanceMap, parentProcessInstance, fatherParams); int subProcessInstanceId = childInstance == null ? 0 : childInstance.getId(); return new Command( commandType, TaskDependType.TASK_POST,
closed
apache/dolphinscheduler
https://github.com/apache/dolphinscheduler
5,229
[Feature][server port] server port custom config
**Describe the feature** all application can custom config server port
https://github.com/apache/dolphinscheduler/issues/5229
https://github.com/apache/dolphinscheduler/pull/6947
100a9ba3fc21764158593bd33e2b261b0ef39982
0dcff1425a28da0ce0004fc3e594b97d080c5fd9
"2021-04-07T09:22:45Z"
java
"2021-11-30T16:21:03Z"
dolphinscheduler-service/src/main/java/org/apache/dolphinscheduler/service/process/ProcessService.java
parentProcessInstance.getFailureStrategy(), parentProcessInstance.getExecutorId(), subProcessDefinition.getCode(), processParam, parentProcessInstance.getWarningType(), parentProcessInstance.getWarningGroupId(), parentProcessInstance.getScheduleTime(), task.getWorkerGroup(), task.getEnvironmentCode(), parentProcessInstance.getProcessInstancePriority(), parentProcessInstance.getDryRun(), subProcessInstanceId, subProcessDefinition.getVersion() ); } /** * initialize sub work flow state * child instance state would be initialized when 'recovery from pause/stop/failure' */ private void initSubInstanceState(ProcessInstance childInstance) { if (childInstance != null) { childInstance.setState(ExecutionStatus.RUNNING_EXECUTION); updateProcessInstance(childInstance); } } /** * get sub work flow command type * child instance exist: child command = fatherCommand * child instance not exists: child command = fatherCommand[0] */
closed
apache/dolphinscheduler
https://github.com/apache/dolphinscheduler
5,229
[Feature][server port] server port custom config
**Describe the feature** all application can custom config server port
https://github.com/apache/dolphinscheduler/issues/5229
https://github.com/apache/dolphinscheduler/pull/6947
100a9ba3fc21764158593bd33e2b261b0ef39982
0dcff1425a28da0ce0004fc3e594b97d080c5fd9
"2021-04-07T09:22:45Z"
java
"2021-11-30T16:21:03Z"
dolphinscheduler-service/src/main/java/org/apache/dolphinscheduler/service/process/ProcessService.java
private CommandType getSubCommandType(ProcessInstance parentProcessInstance, ProcessInstance childInstance) { CommandType commandType = parentProcessInstance.getCommandType(); if (childInstance == null) { String fatherHistoryCommand = parentProcessInstance.getHistoryCmd(); commandType = CommandType.valueOf(fatherHistoryCommand.split(Constants.COMMA)[0]); } return commandType; } /** * update sub process definition * * @param parentProcessInstance parentProcessInstance * @param childDefinitionCode childDefinitionId */ private void updateSubProcessDefinitionByParent(ProcessInstance parentProcessInstance, long childDefinitionCode) { ProcessDefinition fatherDefinition = this.findProcessDefinition(parentProcessInstance.getProcessDefinitionCode(), parentProcessInstance.getProcessDefinitionVersion()); ProcessDefinition childDefinition = this.findProcessDefinitionByCode(childDefinitionCode); if (childDefinition != null && fatherDefinition != null) { childDefinition.setWarningGroupId(fatherDefinition.getWarningGroupId()); processDefineMapper.updateById(childDefinition); } } /** * submit task to mysql * * @param taskInstance taskInstance * @param processInstance processInstance * @return task instance */
closed
apache/dolphinscheduler
https://github.com/apache/dolphinscheduler
5,229
[Feature][server port] server port custom config
**Describe the feature** all application can custom config server port
https://github.com/apache/dolphinscheduler/issues/5229
https://github.com/apache/dolphinscheduler/pull/6947
100a9ba3fc21764158593bd33e2b261b0ef39982
0dcff1425a28da0ce0004fc3e594b97d080c5fd9
"2021-04-07T09:22:45Z"
java
"2021-11-30T16:21:03Z"
dolphinscheduler-service/src/main/java/org/apache/dolphinscheduler/service/process/ProcessService.java
public TaskInstance submitTaskInstanceToDB(TaskInstance taskInstance, ProcessInstance processInstance) { ExecutionStatus processInstanceState = processInstance.getState(); if (taskInstance.getState().typeIsFailure()) { if (taskInstance.isSubProcess()) { taskInstance.setRetryTimes(taskInstance.getRetryTimes() + 1); } else { if (processInstanceState != ExecutionStatus.READY_STOP && processInstanceState != ExecutionStatus.READY_PAUSE) { taskInstance.setFlag(Flag.NO); updateTaskInstance(taskInstance); if (taskInstance.getState() != ExecutionStatus.NEED_FAULT_TOLERANCE) { taskInstance.setRetryTimes(taskInstance.getRetryTimes() + 1); } taskInstance.setSubmitTime(null); taskInstance.setLogPath(null); taskInstance.setExecutePath(null); taskInstance.setStartTime(null); taskInstance.setEndTime(null); taskInstance.setFlag(Flag.YES); taskInstance.setHost(null); taskInstance.setId(0); } } } taskInstance.setExecutorId(processInstance.getExecutorId()); taskInstance.setProcessInstancePriority(processInstance.getProcessInstancePriority()); taskInstance.setState(getSubmitTaskState(taskInstance, processInstance)); if (taskInstance.getSubmitTime() == null) {
closed
apache/dolphinscheduler
https://github.com/apache/dolphinscheduler
5,229
[Feature][server port] server port custom config
**Describe the feature** all application can custom config server port
https://github.com/apache/dolphinscheduler/issues/5229
https://github.com/apache/dolphinscheduler/pull/6947
100a9ba3fc21764158593bd33e2b261b0ef39982
0dcff1425a28da0ce0004fc3e594b97d080c5fd9
"2021-04-07T09:22:45Z"
java
"2021-11-30T16:21:03Z"
dolphinscheduler-service/src/main/java/org/apache/dolphinscheduler/service/process/ProcessService.java
taskInstance.setSubmitTime(new Date()); } if (taskInstance.getFirstSubmitTime() == null) { taskInstance.setFirstSubmitTime(taskInstance.getSubmitTime()); } boolean saveResult = saveTaskInstance(taskInstance); if (!saveResult) { return null; } return taskInstance; } /** * get submit task instance state by the work process state * cannot modify the task state when running/kill/submit success, or this * task instance is already exists in task queue . * return pause if work process state is ready pause * return stop if work process state is ready stop * if all of above are not satisfied, return submit success * * @param taskInstance taskInstance * @param processInstance processInstance * @return process instance state */ public ExecutionStatus getSubmitTaskState(TaskInstance taskInstance, ProcessInstance processInstance) { ExecutionStatus state = taskInstance.getState(); if ( state == ExecutionStatus.RUNNING_EXECUTION
closed
apache/dolphinscheduler
https://github.com/apache/dolphinscheduler
5,229
[Feature][server port] server port custom config
**Describe the feature** all application can custom config server port
https://github.com/apache/dolphinscheduler/issues/5229
https://github.com/apache/dolphinscheduler/pull/6947
100a9ba3fc21764158593bd33e2b261b0ef39982
0dcff1425a28da0ce0004fc3e594b97d080c5fd9
"2021-04-07T09:22:45Z"
java
"2021-11-30T16:21:03Z"
dolphinscheduler-service/src/main/java/org/apache/dolphinscheduler/service/process/ProcessService.java
|| state == ExecutionStatus.DELAY_EXECUTION || state == ExecutionStatus.KILL ) { return state; } if (processInstance.getState() == ExecutionStatus.READY_PAUSE) { state = ExecutionStatus.PAUSE; } else if (processInstance.getState() == ExecutionStatus.READY_STOP || !checkProcessStrategy(taskInstance, processInstance)) { state = ExecutionStatus.KILL; } else { state = ExecutionStatus.SUBMITTED_SUCCESS; } return state; } /** * check process instance strategy * * @param taskInstance taskInstance * @return check strategy result */ private boolean checkProcessStrategy(TaskInstance taskInstance, ProcessInstance processInstance) { FailureStrategy failureStrategy = processInstance.getFailureStrategy(); if (failureStrategy == FailureStrategy.CONTINUE) { return true; } List<TaskInstance> taskInstances = this.findValidTaskListByProcessId(taskInstance.getProcessInstanceId()); for (TaskInstance task : taskInstances) {
closed
apache/dolphinscheduler
https://github.com/apache/dolphinscheduler
5,229
[Feature][server port] server port custom config
**Describe the feature** all application can custom config server port
https://github.com/apache/dolphinscheduler/issues/5229
https://github.com/apache/dolphinscheduler/pull/6947
100a9ba3fc21764158593bd33e2b261b0ef39982
0dcff1425a28da0ce0004fc3e594b97d080c5fd9
"2021-04-07T09:22:45Z"
java
"2021-11-30T16:21:03Z"
dolphinscheduler-service/src/main/java/org/apache/dolphinscheduler/service/process/ProcessService.java
if (task.getState() == ExecutionStatus.FAILURE && task.getRetryTimes() >= task.getMaxRetryTimes()) { return false; } } return true; } /** * insert or update work process instance to data base * * @param processInstance processInstance */ public void saveProcessInstance(ProcessInstance processInstance) { if (processInstance == null) { logger.error("save error, process instance is null!"); return; } if (processInstance.getId() != 0) { processInstanceMapper.updateById(processInstance); } else { processInstanceMapper.insert(processInstance); } } /** * insert or update command * * @param command command * @return save command result */ public int saveCommand(Command command) {
closed
apache/dolphinscheduler
https://github.com/apache/dolphinscheduler
5,229
[Feature][server port] server port custom config
**Describe the feature** all application can custom config server port
https://github.com/apache/dolphinscheduler/issues/5229
https://github.com/apache/dolphinscheduler/pull/6947
100a9ba3fc21764158593bd33e2b261b0ef39982
0dcff1425a28da0ce0004fc3e594b97d080c5fd9
"2021-04-07T09:22:45Z"
java
"2021-11-30T16:21:03Z"
dolphinscheduler-service/src/main/java/org/apache/dolphinscheduler/service/process/ProcessService.java
if (command.getId() != 0) { return commandMapper.updateById(command); } else { return commandMapper.insert(command); } } /** * insert or update task instance * * @param taskInstance taskInstance * @return save task instance result */ public boolean saveTaskInstance(TaskInstance taskInstance) { if (taskInstance.getId() != 0) { return updateTaskInstance(taskInstance); } else { return createTaskInstance(taskInstance); } } /** * insert task instance * * @param taskInstance taskInstance * @return create task instance result */ public boolean createTaskInstance(TaskInstance taskInstance) { int count = taskInstanceMapper.insert(taskInstance); return count > 0; } /**
closed
apache/dolphinscheduler
https://github.com/apache/dolphinscheduler
5,229
[Feature][server port] server port custom config
**Describe the feature** all application can custom config server port
https://github.com/apache/dolphinscheduler/issues/5229
https://github.com/apache/dolphinscheduler/pull/6947
100a9ba3fc21764158593bd33e2b261b0ef39982
0dcff1425a28da0ce0004fc3e594b97d080c5fd9
"2021-04-07T09:22:45Z"
java
"2021-11-30T16:21:03Z"
dolphinscheduler-service/src/main/java/org/apache/dolphinscheduler/service/process/ProcessService.java
* update task instance * * @param taskInstance taskInstance * @return update task instance result */ public boolean updateTaskInstance(TaskInstance taskInstance) { int count = taskInstanceMapper.updateById(taskInstance); return count > 0; } /** * find task instance by id * * @param taskId task id * @return task intance */ public TaskInstance findTaskInstanceById(Integer taskId) { return taskInstanceMapper.selectById(taskId); } /** * package task instance */ public void packageTaskInstance(TaskInstance taskInstance, ProcessInstance processInstance) { taskInstance.setProcessInstance(processInstance); taskInstance.setProcessDefine(processInstance.getProcessDefinition()); TaskDefinition taskDefinition = this.findTaskDefinition( taskInstance.getTaskCode(), taskInstance.getTaskDefinitionVersion()); this.updateTaskDefinitionResources(taskDefinition); taskInstance.setTaskDefine(taskDefinition); }
closed
apache/dolphinscheduler
https://github.com/apache/dolphinscheduler
5,229
[Feature][server port] server port custom config
**Describe the feature** all application can custom config server port
https://github.com/apache/dolphinscheduler/issues/5229
https://github.com/apache/dolphinscheduler/pull/6947
100a9ba3fc21764158593bd33e2b261b0ef39982
0dcff1425a28da0ce0004fc3e594b97d080c5fd9
"2021-04-07T09:22:45Z"
java
"2021-11-30T16:21:03Z"
dolphinscheduler-service/src/main/java/org/apache/dolphinscheduler/service/process/ProcessService.java
/** * Update {@link ResourceInfo} information in {@link TaskDefinition} * * @param taskDefinition the given {@link TaskDefinition} */ public void updateTaskDefinitionResources(TaskDefinition taskDefinition) { Map<String, Object> taskParameters = JSONUtils.parseObject( taskDefinition.getTaskParams(), new TypeReference<Map<String, Object>>() { }); if (taskParameters != null) { if (taskParameters.containsKey("mainJar")) { Object mainJarObj = taskParameters.get("mainJar"); ResourceInfo mainJar = JSONUtils.parseObject( JSONUtils.toJsonString(mainJarObj), ResourceInfo.class); ResourceInfo resourceInfo = updateResourceInfo(mainJar); if (resourceInfo != null) { taskParameters.put("mainJar", resourceInfo); } } if (taskParameters.containsKey("resourceList")) { String resourceListStr = JSONUtils.toJsonString(taskParameters.get("resourceList")); List<ResourceInfo> resourceInfos = JSONUtils.toList(resourceListStr, ResourceInfo.class); List<ResourceInfo> updatedResourceInfos = resourceInfos .stream() .map(this::updateResourceInfo)
closed
apache/dolphinscheduler
https://github.com/apache/dolphinscheduler
5,229
[Feature][server port] server port custom config
**Describe the feature** all application can custom config server port
https://github.com/apache/dolphinscheduler/issues/5229
https://github.com/apache/dolphinscheduler/pull/6947
100a9ba3fc21764158593bd33e2b261b0ef39982
0dcff1425a28da0ce0004fc3e594b97d080c5fd9
"2021-04-07T09:22:45Z"
java
"2021-11-30T16:21:03Z"
dolphinscheduler-service/src/main/java/org/apache/dolphinscheduler/service/process/ProcessService.java
.filter(Objects::nonNull) .collect(Collectors.toList()); taskParameters.put("resourceList", updatedResourceInfos); } taskDefinition.setTaskParams(JSONUtils.toJsonString(taskParameters)); } } /** * update {@link ResourceInfo} by given original ResourceInfo * * @param res origin resource info * @return {@link ResourceInfo} */ private ResourceInfo updateResourceInfo(ResourceInfo res) { ResourceInfo resourceInfo = null; if (res != null) { int resourceId = res.getId(); if (resourceId <= 0) { logger.error("invalid resourceId, {}", resourceId); return null; } resourceInfo = new ResourceInfo(); Resource resource = getResourceById(resourceId); resourceInfo.setId(resourceId); resourceInfo.setRes(resource.getFileName()); resourceInfo.setResourceName(resource.getFullName()); if (logger.isInfoEnabled()) {
closed
apache/dolphinscheduler
https://github.com/apache/dolphinscheduler
5,229
[Feature][server port] server port custom config
**Describe the feature** all application can custom config server port
https://github.com/apache/dolphinscheduler/issues/5229
https://github.com/apache/dolphinscheduler/pull/6947
100a9ba3fc21764158593bd33e2b261b0ef39982
0dcff1425a28da0ce0004fc3e594b97d080c5fd9
"2021-04-07T09:22:45Z"
java
"2021-11-30T16:21:03Z"
dolphinscheduler-service/src/main/java/org/apache/dolphinscheduler/service/process/ProcessService.java
logger.info("updated resource info {}", JSONUtils.toJsonString(resourceInfo)); } } return resourceInfo; } /** * get id list by task state * * @param instanceId instanceId * @param state state * @return task instance states */ public List<Integer> findTaskIdByInstanceState(int instanceId, ExecutionStatus state) { return taskInstanceMapper.queryTaskByProcessIdAndState(instanceId, state.ordinal()); } /** * find valid task list by process definition id * * @param processInstanceId processInstanceId * @return task instance list */ public List<TaskInstance> findValidTaskListByProcessId(Integer processInstanceId) { return taskInstanceMapper.findValidTaskListByProcessId(processInstanceId, Flag.YES); } /** * find previous task list by work process id * * @param processInstanceId processInstanceId * @return task instance list
closed
apache/dolphinscheduler
https://github.com/apache/dolphinscheduler
5,229
[Feature][server port] server port custom config
**Describe the feature** all application can custom config server port
https://github.com/apache/dolphinscheduler/issues/5229
https://github.com/apache/dolphinscheduler/pull/6947
100a9ba3fc21764158593bd33e2b261b0ef39982
0dcff1425a28da0ce0004fc3e594b97d080c5fd9
"2021-04-07T09:22:45Z"
java
"2021-11-30T16:21:03Z"
dolphinscheduler-service/src/main/java/org/apache/dolphinscheduler/service/process/ProcessService.java
*/ public List<TaskInstance> findPreviousTaskListByWorkProcessId(Integer processInstanceId) { return taskInstanceMapper.findValidTaskListByProcessId(processInstanceId, Flag.NO); } /** * update work process instance map * * @param processInstanceMap processInstanceMap * @return update process instance result */ public int updateWorkProcessInstanceMap(ProcessInstanceMap processInstanceMap) { return processInstanceMapMapper.updateById(processInstanceMap); } /** * create work process instance map * * @param processInstanceMap processInstanceMap * @return create process instance result */ public int createWorkProcessInstanceMap(ProcessInstanceMap processInstanceMap) { int count = 0; if (processInstanceMap != null) { return processInstanceMapMapper.insert(processInstanceMap); } return count; } /** * find work process map by parent process id and parent task id. * * @param parentWorkProcessId parentWorkProcessId
closed
apache/dolphinscheduler
https://github.com/apache/dolphinscheduler
5,229
[Feature][server port] server port custom config
**Describe the feature** all application can custom config server port
https://github.com/apache/dolphinscheduler/issues/5229
https://github.com/apache/dolphinscheduler/pull/6947
100a9ba3fc21764158593bd33e2b261b0ef39982
0dcff1425a28da0ce0004fc3e594b97d080c5fd9
"2021-04-07T09:22:45Z"
java
"2021-11-30T16:21:03Z"
dolphinscheduler-service/src/main/java/org/apache/dolphinscheduler/service/process/ProcessService.java
* @param parentTaskId parentTaskId * @return process instance map */ public ProcessInstanceMap findWorkProcessMapByParent(Integer parentWorkProcessId, Integer parentTaskId) { return processInstanceMapMapper.queryByParentId(parentWorkProcessId, parentTaskId); } /** * delete work process map by parent process id * * @param parentWorkProcessId parentWorkProcessId * @return delete process map result */ public int deleteWorkProcessMapByParentId(int parentWorkProcessId) { return processInstanceMapMapper.deleteByParentProcessId(parentWorkProcessId); } /** * find sub process instance * * @param parentProcessId parentProcessId * @param parentTaskId parentTaskId * @return process instance */ public ProcessInstance findSubProcessInstance(Integer parentProcessId, Integer parentTaskId) { ProcessInstance processInstance = null; ProcessInstanceMap processInstanceMap = processInstanceMapMapper.queryByParentId(parentProcessId, parentTaskId); if (processInstanceMap == null || processInstanceMap.getProcessInstanceId() == 0) { return processInstance; } processInstance = findProcessInstanceById(processInstanceMap.getProcessInstanceId()); return processInstance;
closed
apache/dolphinscheduler
https://github.com/apache/dolphinscheduler
5,229
[Feature][server port] server port custom config
**Describe the feature** all application can custom config server port
https://github.com/apache/dolphinscheduler/issues/5229
https://github.com/apache/dolphinscheduler/pull/6947
100a9ba3fc21764158593bd33e2b261b0ef39982
0dcff1425a28da0ce0004fc3e594b97d080c5fd9
"2021-04-07T09:22:45Z"
java
"2021-11-30T16:21:03Z"
dolphinscheduler-service/src/main/java/org/apache/dolphinscheduler/service/process/ProcessService.java
} /** * find parent process instance * * @param subProcessId subProcessId * @return process instance */ public ProcessInstance findParentProcessInstance(Integer subProcessId) { ProcessInstance processInstance = null; ProcessInstanceMap processInstanceMap = processInstanceMapMapper.queryBySubProcessId(subProcessId); if (processInstanceMap == null || processInstanceMap.getProcessInstanceId() == 0) { return processInstance; } processInstance = findProcessInstanceById(processInstanceMap.getParentProcessInstanceId()); return processInstance; } /** * change task state * * @param state state * @param startTime startTime * @param host host * @param executePath executePath * @param logPath logPath */ public void changeTaskState(TaskInstance taskInstance, ExecutionStatus state, Date startTime, String host, String executePath, String logPath) { taskInstance.setState(state); taskInstance.setStartTime(startTime);
closed
apache/dolphinscheduler
https://github.com/apache/dolphinscheduler
5,229
[Feature][server port] server port custom config
**Describe the feature** all application can custom config server port
https://github.com/apache/dolphinscheduler/issues/5229
https://github.com/apache/dolphinscheduler/pull/6947
100a9ba3fc21764158593bd33e2b261b0ef39982
0dcff1425a28da0ce0004fc3e594b97d080c5fd9
"2021-04-07T09:22:45Z"
java
"2021-11-30T16:21:03Z"
dolphinscheduler-service/src/main/java/org/apache/dolphinscheduler/service/process/ProcessService.java
taskInstance.setHost(host); taskInstance.setExecutePath(executePath); taskInstance.setLogPath(logPath); saveTaskInstance(taskInstance); } /** * update process instance * * @param processInstance processInstance * @return update process instance result */ public int updateProcessInstance(ProcessInstance processInstance) { return processInstanceMapper.updateById(processInstance); } /** * change task state * * @param state state * @param endTime endTime * @param varPool varPool */ public void changeTaskState(TaskInstance taskInstance, ExecutionStatus state, Date endTime, int processId, String appIds, String varPool) { taskInstance.setPid(processId); taskInstance.setAppLink(appIds); taskInstance.setState(state); taskInstance.setEndTime(endTime);
closed
apache/dolphinscheduler
https://github.com/apache/dolphinscheduler
5,229
[Feature][server port] server port custom config
**Describe the feature** all application can custom config server port
https://github.com/apache/dolphinscheduler/issues/5229
https://github.com/apache/dolphinscheduler/pull/6947
100a9ba3fc21764158593bd33e2b261b0ef39982
0dcff1425a28da0ce0004fc3e594b97d080c5fd9
"2021-04-07T09:22:45Z"
java
"2021-11-30T16:21:03Z"
dolphinscheduler-service/src/main/java/org/apache/dolphinscheduler/service/process/ProcessService.java
taskInstance.setVarPool(varPool); changeOutParam(taskInstance); saveTaskInstance(taskInstance); } /** * for show in page of taskInstance */ public void changeOutParam(TaskInstance taskInstance) { if (StringUtils.isEmpty(taskInstance.getVarPool())) { return; } List<Property> properties = JSONUtils.toList(taskInstance.getVarPool(), Property.class); if (CollectionUtils.isEmpty(properties)) { return; } Map<String, Object> taskParams = JSONUtils.parseObject(taskInstance.getTaskParams(), new TypeReference<Map<String, Object>>() { }); Object localParams = taskParams.get(LOCAL_PARAMS); if (localParams == null) { return; } List<Property> allParam = JSONUtils.toList(JSONUtils.toJsonString(localParams), Property.class); Map<String, String> outProperty = new HashMap<>(); for (Property info : properties) { if (info.getDirect() == Direct.OUT) { outProperty.put(info.getProp(), info.getValue()); } } for (Property info : allParam) {
closed
apache/dolphinscheduler
https://github.com/apache/dolphinscheduler
5,229
[Feature][server port] server port custom config
**Describe the feature** all application can custom config server port
https://github.com/apache/dolphinscheduler/issues/5229
https://github.com/apache/dolphinscheduler/pull/6947
100a9ba3fc21764158593bd33e2b261b0ef39982
0dcff1425a28da0ce0004fc3e594b97d080c5fd9
"2021-04-07T09:22:45Z"
java
"2021-11-30T16:21:03Z"
dolphinscheduler-service/src/main/java/org/apache/dolphinscheduler/service/process/ProcessService.java
if (info.getDirect() == Direct.OUT) { String paramName = info.getProp(); info.setValue(outProperty.get(paramName)); } } taskParams.put(LOCAL_PARAMS, allParam); taskInstance.setTaskParams(JSONUtils.toJsonString(taskParams)); } /** * convert integer list to string list * * @param intList intList * @return string list */ public List<String> convertIntListToString(List<Integer> intList) { if (intList == null) { return new ArrayList<>(); } List<String> result = new ArrayList<>(intList.size()); for (Integer intVar : intList) { result.add(String.valueOf(intVar)); } return result; } /** * query schedule by id * * @param id id * @return schedule */
closed
apache/dolphinscheduler
https://github.com/apache/dolphinscheduler
5,229
[Feature][server port] server port custom config
**Describe the feature** all application can custom config server port
https://github.com/apache/dolphinscheduler/issues/5229
https://github.com/apache/dolphinscheduler/pull/6947
100a9ba3fc21764158593bd33e2b261b0ef39982
0dcff1425a28da0ce0004fc3e594b97d080c5fd9
"2021-04-07T09:22:45Z"
java
"2021-11-30T16:21:03Z"
dolphinscheduler-service/src/main/java/org/apache/dolphinscheduler/service/process/ProcessService.java
public Schedule querySchedule(int id) { return scheduleMapper.selectById(id); } /** * query Schedule by processDefinitionCode * * @param processDefinitionCode processDefinitionCode * @see Schedule */ public List<Schedule> queryReleaseSchedulerListByProcessDefinitionCode(long processDefinitionCode) { return scheduleMapper.queryReleaseSchedulerListByProcessDefinitionCode(processDefinitionCode); } /** * query need failover process instance * * @param host host * @return process instance list */ public List<ProcessInstance> queryNeedFailoverProcessInstances(String host) { return processInstanceMapper.queryByHostAndStatus(host, stateArray); } /** * process need failover process instance * * @param processInstance processInstance */ @Transactional(rollbackFor = RuntimeException.class) public void processNeedFailoverProcessInstances(ProcessInstance processInstance) { processInstance.setHost(Constants.NULL);
closed
apache/dolphinscheduler
https://github.com/apache/dolphinscheduler
5,229
[Feature][server port] server port custom config
**Describe the feature** all application can custom config server port
https://github.com/apache/dolphinscheduler/issues/5229
https://github.com/apache/dolphinscheduler/pull/6947
100a9ba3fc21764158593bd33e2b261b0ef39982
0dcff1425a28da0ce0004fc3e594b97d080c5fd9
"2021-04-07T09:22:45Z"
java
"2021-11-30T16:21:03Z"
dolphinscheduler-service/src/main/java/org/apache/dolphinscheduler/service/process/ProcessService.java
processInstanceMapper.updateById(processInstance); ProcessDefinition processDefinition = findProcessDefinition(processInstance.getProcessDefinitionCode(), processInstance.getProcessDefinitionVersion()); Command cmd = new Command(); cmd.setProcessDefinitionCode(processDefinition.getCode()); cmd.setProcessDefinitionVersion(processDefinition.getVersion()); cmd.setProcessInstanceId(processInstance.getId()); cmd.setCommandParam(String.format("{\"%s\":%d}", Constants.CMD_PARAM_RECOVER_PROCESS_ID_STRING, processInstance.getId())); cmd.setExecutorId(processInstance.getExecutorId()); cmd.setCommandType(CommandType.RECOVER_TOLERANCE_FAULT_PROCESS); createCommand(cmd); } /** * query all need failover task instances by host * * @param host host * @return task instance list */ public List<TaskInstance> queryNeedFailoverTaskInstances(String host) { return taskInstanceMapper.queryByHostAndStatus(host, stateArray); } /** * find data source by id * * @param id id * @return datasource */ public DataSource findDataSourceById(int id) { return dataSourceMapper.selectById(id);
closed
apache/dolphinscheduler
https://github.com/apache/dolphinscheduler
5,229
[Feature][server port] server port custom config
**Describe the feature** all application can custom config server port
https://github.com/apache/dolphinscheduler/issues/5229
https://github.com/apache/dolphinscheduler/pull/6947
100a9ba3fc21764158593bd33e2b261b0ef39982
0dcff1425a28da0ce0004fc3e594b97d080c5fd9
"2021-04-07T09:22:45Z"
java
"2021-11-30T16:21:03Z"
dolphinscheduler-service/src/main/java/org/apache/dolphinscheduler/service/process/ProcessService.java
} /** * update process instance state by id * * @param processInstanceId processInstanceId * @param executionStatus executionStatus * @return update process result */ public int updateProcessInstanceState(Integer processInstanceId, ExecutionStatus executionStatus) { ProcessInstance instance = processInstanceMapper.selectById(processInstanceId); instance.setState(executionStatus); return processInstanceMapper.updateById(instance); } /** * find process instance by the task id * * @param taskId taskId * @return process instance */ public ProcessInstance findProcessInstanceByTaskId(int taskId) { TaskInstance taskInstance = taskInstanceMapper.selectById(taskId); if (taskInstance != null) { return processInstanceMapper.selectById(taskInstance.getProcessInstanceId()); } return null; } /** * find udf function list by id list string * * @param ids ids
closed
apache/dolphinscheduler
https://github.com/apache/dolphinscheduler
5,229
[Feature][server port] server port custom config
**Describe the feature** all application can custom config server port
https://github.com/apache/dolphinscheduler/issues/5229
https://github.com/apache/dolphinscheduler/pull/6947
100a9ba3fc21764158593bd33e2b261b0ef39982
0dcff1425a28da0ce0004fc3e594b97d080c5fd9
"2021-04-07T09:22:45Z"
java
"2021-11-30T16:21:03Z"
dolphinscheduler-service/src/main/java/org/apache/dolphinscheduler/service/process/ProcessService.java
* @return udf function list */ public List<UdfFunc> queryUdfFunListByIds(int[] ids) { return udfFuncMapper.queryUdfByIdStr(ids, null); } /** * find tenant code by resource name * * @param resName resource name * @param resourceType resource type * @return tenant code */ public String queryTenantCodeByResName(String resName, ResourceType resourceType) { String fullName = resName.startsWith("/") ? resName : String.format("/%s", resName); List<Resource> resourceList = resourceMapper.queryResource(fullName, resourceType.ordinal()); if (CollectionUtils.isEmpty(resourceList)) { return StringUtils.EMPTY; } int userId = resourceList.get(0).getUserId(); User user = userCacheProcessor.selectById(userId); if (Objects.isNull(user)) { return StringUtils.EMPTY; } Tenant tenant = tenantCacheProcessor.queryById(user.getTenantId()); if (Objects.isNull(tenant)) { return StringUtils.EMPTY; } return tenant.getTenantCode(); }
closed
apache/dolphinscheduler
https://github.com/apache/dolphinscheduler
5,229
[Feature][server port] server port custom config
**Describe the feature** all application can custom config server port
https://github.com/apache/dolphinscheduler/issues/5229
https://github.com/apache/dolphinscheduler/pull/6947
100a9ba3fc21764158593bd33e2b261b0ef39982
0dcff1425a28da0ce0004fc3e594b97d080c5fd9
"2021-04-07T09:22:45Z"
java
"2021-11-30T16:21:03Z"
dolphinscheduler-service/src/main/java/org/apache/dolphinscheduler/service/process/ProcessService.java
/** * find schedule list by process define codes. * * @param codes codes * @return schedule list */ public List<Schedule> selectAllByProcessDefineCode(long[] codes) { return scheduleMapper.selectAllByProcessDefineArray(codes); } /** * find last scheduler process instance in the date interval * * @param definitionCode definitionCode * @param dateInterval dateInterval * @return process instance */ public ProcessInstance findLastSchedulerProcessInterval(Long definitionCode, DateInterval dateInterval) { return processInstanceMapper.queryLastSchedulerProcess(definitionCode, dateInterval.getStartTime(), dateInterval.getEndTime()); } /** * find last manual process instance interval * * @param definitionCode process definition code * @param dateInterval dateInterval * @return process instance */ public ProcessInstance findLastManualProcessInterval(Long definitionCode, DateInterval dateInterval) { return processInstanceMapper.queryLastManualProcess(definitionCode,
closed
apache/dolphinscheduler
https://github.com/apache/dolphinscheduler
5,229
[Feature][server port] server port custom config
**Describe the feature** all application can custom config server port
https://github.com/apache/dolphinscheduler/issues/5229
https://github.com/apache/dolphinscheduler/pull/6947
100a9ba3fc21764158593bd33e2b261b0ef39982
0dcff1425a28da0ce0004fc3e594b97d080c5fd9
"2021-04-07T09:22:45Z"
java
"2021-11-30T16:21:03Z"
dolphinscheduler-service/src/main/java/org/apache/dolphinscheduler/service/process/ProcessService.java
dateInterval.getStartTime(), dateInterval.getEndTime()); } /** * find last running process instance * * @param definitionCode process definition code * @param startTime start time * @param endTime end time * @return process instance */ public ProcessInstance findLastRunningProcess(Long definitionCode, Date startTime, Date endTime) { return processInstanceMapper.queryLastRunningProcess(definitionCode, startTime, endTime, stateArray); } /** * query user queue by process instance * * @param processInstance processInstance * @return queue */ public String queryUserQueueByProcessInstance(ProcessInstance processInstance) { String queue = ""; if (processInstance == null) { return queue; } User executor = userCacheProcessor.selectById(processInstance.getExecutorId()); if (executor != null) {
closed
apache/dolphinscheduler
https://github.com/apache/dolphinscheduler
5,229
[Feature][server port] server port custom config
**Describe the feature** all application can custom config server port
https://github.com/apache/dolphinscheduler/issues/5229
https://github.com/apache/dolphinscheduler/pull/6947
100a9ba3fc21764158593bd33e2b261b0ef39982
0dcff1425a28da0ce0004fc3e594b97d080c5fd9
"2021-04-07T09:22:45Z"
java
"2021-11-30T16:21:03Z"
dolphinscheduler-service/src/main/java/org/apache/dolphinscheduler/service/process/ProcessService.java
queue = executor.getQueue(); } return queue; } /** * query project name and user name by processInstanceId. * * @param processInstanceId processInstanceId * @return projectName and userName */ public ProjectUser queryProjectWithUserByProcessInstanceId(int processInstanceId) { return projectMapper.queryProjectWithUserByProcessInstanceId(processInstanceId); } /** * get task worker group * * @param taskInstance taskInstance * @return workerGroupId */ public String getTaskWorkerGroup(TaskInstance taskInstance) { String workerGroup = taskInstance.getWorkerGroup(); if (StringUtils.isNotBlank(workerGroup)) { return workerGroup; } int processInstanceId = taskInstance.getProcessInstanceId(); ProcessInstance processInstance = findProcessInstanceById(processInstanceId); if (processInstance != null) { return processInstance.getWorkerGroup(); } logger.info("task : {} will use default worker group", taskInstance.getId());
closed
apache/dolphinscheduler
https://github.com/apache/dolphinscheduler
5,229
[Feature][server port] server port custom config
**Describe the feature** all application can custom config server port
https://github.com/apache/dolphinscheduler/issues/5229
https://github.com/apache/dolphinscheduler/pull/6947
100a9ba3fc21764158593bd33e2b261b0ef39982
0dcff1425a28da0ce0004fc3e594b97d080c5fd9
"2021-04-07T09:22:45Z"
java
"2021-11-30T16:21:03Z"
dolphinscheduler-service/src/main/java/org/apache/dolphinscheduler/service/process/ProcessService.java
return Constants.DEFAULT_WORKER_GROUP; } /** * get have perm project list * * @param userId userId * @return project list */ public List<Project> getProjectListHavePerm(int userId) { List<Project> createProjects = projectMapper.queryProjectCreatedByUser(userId); List<Project> authedProjects = projectMapper.queryAuthedProjectListByUserId(userId); if (createProjects == null) { createProjects = new ArrayList<>(); } if (authedProjects != null) { createProjects.addAll(authedProjects); } return createProjects; } /** * list unauthorized udf function * * @param userId user id * @param needChecks data source id array * @return unauthorized udf function list */ public <T> List<T> listUnauthorized(int userId, T[] needChecks, AuthorizationType authorizationType) { List<T> resultList = new ArrayList<>(); if (Objects.nonNull(needChecks) && needChecks.length > 0) { Set<T> originResSet = new HashSet<>(Arrays.asList(needChecks));
closed
apache/dolphinscheduler
https://github.com/apache/dolphinscheduler
5,229
[Feature][server port] server port custom config
**Describe the feature** all application can custom config server port
https://github.com/apache/dolphinscheduler/issues/5229
https://github.com/apache/dolphinscheduler/pull/6947
100a9ba3fc21764158593bd33e2b261b0ef39982
0dcff1425a28da0ce0004fc3e594b97d080c5fd9
"2021-04-07T09:22:45Z"
java
"2021-11-30T16:21:03Z"
dolphinscheduler-service/src/main/java/org/apache/dolphinscheduler/service/process/ProcessService.java
switch (authorizationType) { case RESOURCE_FILE_ID: case UDF_FILE: List<Resource> ownUdfResources = resourceMapper.listAuthorizedResourceById(userId, needChecks); addAuthorizedResources(ownUdfResources, userId); Set<Integer> authorizedResourceFiles = ownUdfResources.stream().map(Resource::getId).collect(toSet()); originResSet.removeAll(authorizedResourceFiles); break; case RESOURCE_FILE_NAME: List<Resource> ownResources = resourceMapper.listAuthorizedResource(userId, needChecks); addAuthorizedResources(ownResources, userId); Set<String> authorizedResources = ownResources.stream().map(Resource::getFullName).collect(toSet()); originResSet.removeAll(authorizedResources); break; case DATASOURCE: Set<Integer> authorizedDatasources = dataSourceMapper.listAuthorizedDataSource(userId, needChecks).stream().map(DataSource::getId).collect(toSet()); originResSet.removeAll(authorizedDatasources); break; case UDF: Set<Integer> authorizedUdfs = udfFuncMapper.listAuthorizedUdfFunc(userId, needChecks).stream().map(UdfFunc::getId).collect(toSet()); originResSet.removeAll(authorizedUdfs); break; default: break; } resultList.addAll(originResSet); } return resultList; } /**
closed
apache/dolphinscheduler
https://github.com/apache/dolphinscheduler
5,229
[Feature][server port] server port custom config
**Describe the feature** all application can custom config server port
https://github.com/apache/dolphinscheduler/issues/5229
https://github.com/apache/dolphinscheduler/pull/6947
100a9ba3fc21764158593bd33e2b261b0ef39982
0dcff1425a28da0ce0004fc3e594b97d080c5fd9
"2021-04-07T09:22:45Z"
java
"2021-11-30T16:21:03Z"
dolphinscheduler-service/src/main/java/org/apache/dolphinscheduler/service/process/ProcessService.java
* get user by user id * * @param userId user id * @return User */ public User getUserById(int userId) { return userCacheProcessor.selectById(userId); } /** * get resource by resource id * * @param resourceId resource id * @return Resource */ public Resource getResourceById(int resourceId) { return resourceMapper.selectById(resourceId); } /** * list resources by ids * * @param resIds resIds * @return resource list */ public List<Resource> listResourceByIds(Integer[] resIds) { return resourceMapper.listResourceByIds(resIds); } /** * format task app id in task instance */ public String formatTaskAppId(TaskInstance taskInstance) {
closed
apache/dolphinscheduler
https://github.com/apache/dolphinscheduler
5,229
[Feature][server port] server port custom config
**Describe the feature** all application can custom config server port
https://github.com/apache/dolphinscheduler/issues/5229
https://github.com/apache/dolphinscheduler/pull/6947
100a9ba3fc21764158593bd33e2b261b0ef39982
0dcff1425a28da0ce0004fc3e594b97d080c5fd9
"2021-04-07T09:22:45Z"
java
"2021-11-30T16:21:03Z"
dolphinscheduler-service/src/main/java/org/apache/dolphinscheduler/service/process/ProcessService.java
ProcessInstance processInstance = findProcessInstanceById(taskInstance.getProcessInstanceId()); if (processInstance == null) { return ""; } ProcessDefinition definition = findProcessDefinition(processInstance.getProcessDefinitionCode(), processInstance.getProcessDefinitionVersion()); if (definition == null) { return ""; } return String.format("%s_%s_%s", definition.getId(), processInstance.getId(), taskInstance.getId()); } /** * switch process definition version to process definition log version */ public int switchVersion(ProcessDefinition processDefinition, ProcessDefinitionLog processDefinitionLog) { if (null == processDefinition || null == processDefinitionLog) { return Constants.DEFINITION_FAILURE; } processDefinitionLog.setId(processDefinition.getId()); processDefinitionLog.setReleaseState(ReleaseState.OFFLINE); processDefinitionLog.setFlag(Flag.YES); int result = processDefineMapper.updateById(processDefinitionLog); if (result > 0) { result = switchProcessTaskRelationVersion(processDefinitionLog); if (result <= 0) { return Constants.DEFINITION_FAILURE; } } return result; } public int switchProcessTaskRelationVersion(ProcessDefinition processDefinition) {
closed
apache/dolphinscheduler
https://github.com/apache/dolphinscheduler
5,229
[Feature][server port] server port custom config
**Describe the feature** all application can custom config server port
https://github.com/apache/dolphinscheduler/issues/5229
https://github.com/apache/dolphinscheduler/pull/6947
100a9ba3fc21764158593bd33e2b261b0ef39982
0dcff1425a28da0ce0004fc3e594b97d080c5fd9
"2021-04-07T09:22:45Z"
java
"2021-11-30T16:21:03Z"
dolphinscheduler-service/src/main/java/org/apache/dolphinscheduler/service/process/ProcessService.java
List<ProcessTaskRelation> processTaskRelationList = processTaskRelationMapper.queryByProcessCode(processDefinition.getProjectCode(), processDefinition.getCode()); if (!processTaskRelationList.isEmpty()) { processTaskRelationMapper.deleteByCode(processDefinition.getProjectCode(), processDefinition.getCode()); } List<ProcessTaskRelationLog> processTaskRelationLogList = processTaskRelationLogMapper.queryByProcessCodeAndVersion(processDefinition.getCode(), processDefinition.getVersion()); return processTaskRelationMapper.batchInsert(processTaskRelationLogList); } /** * get resource ids * * @param taskDefinition taskDefinition * @return resource ids */ public String getResourceIds(TaskDefinition taskDefinition) { Set<Integer> resourceIds = null; AbstractParameters params = TaskParametersUtils.getParameters(taskDefinition.getTaskType(), taskDefinition.getTaskParams()); if (params != null && CollectionUtils.isNotEmpty(params.getResourceFilesList())) { resourceIds = params.getResourceFilesList(). stream() .filter(t -> t.getId() != 0) .map(ResourceInfo::getId) .collect(Collectors.toSet()); } if (CollectionUtils.isEmpty(resourceIds)) { return StringUtils.EMPTY; } return StringUtils.join(resourceIds, ","); } public int saveTaskDefine(User operator, long projectCode, List<TaskDefinitionLog> taskDefinitionLogs) { Date now = new Date();
closed
apache/dolphinscheduler
https://github.com/apache/dolphinscheduler
5,229
[Feature][server port] server port custom config
**Describe the feature** all application can custom config server port
https://github.com/apache/dolphinscheduler/issues/5229
https://github.com/apache/dolphinscheduler/pull/6947
100a9ba3fc21764158593bd33e2b261b0ef39982
0dcff1425a28da0ce0004fc3e594b97d080c5fd9
"2021-04-07T09:22:45Z"
java
"2021-11-30T16:21:03Z"
dolphinscheduler-service/src/main/java/org/apache/dolphinscheduler/service/process/ProcessService.java
List<TaskDefinitionLog> newTaskDefinitionLogs = new ArrayList<>(); List<TaskDefinitionLog> updateTaskDefinitionLogs = new ArrayList<>(); for (TaskDefinitionLog taskDefinitionLog : taskDefinitionLogs) { taskDefinitionLog.setProjectCode(projectCode); taskDefinitionLog.setUpdateTime(now); taskDefinitionLog.setOperateTime(now); taskDefinitionLog.setOperator(operator.getId()); taskDefinitionLog.setResourceIds(getResourceIds(taskDefinitionLog)); if (taskDefinitionLog.getCode() > 0 && taskDefinitionLog.getVersion() > 0) { TaskDefinitionLog definitionCodeAndVersion = taskDefinitionLogMapper .queryByDefinitionCodeAndVersion(taskDefinitionLog.getCode(), taskDefinitionLog.getVersion()); if (definitionCodeAndVersion != null) { if (!taskDefinitionLog.equals(definitionCodeAndVersion)) { taskDefinitionLog.setUserId(definitionCodeAndVersion.getUserId()); Integer version = taskDefinitionLogMapper.queryMaxVersionForDefinition(taskDefinitionLog.getCode()); taskDefinitionLog.setVersion(version + 1); taskDefinitionLog.setCreateTime(definitionCodeAndVersion.getCreateTime()); updateTaskDefinitionLogs.add(taskDefinitionLog); } continue; } } taskDefinitionLog.setUserId(operator.getId()); taskDefinitionLog.setVersion(Constants.VERSION_FIRST); taskDefinitionLog.setCreateTime(now); if (taskDefinitionLog.getCode() == 0) { try { taskDefinitionLog.setCode(CodeGenerateUtils.getInstance().genCode()); } catch (CodeGenerateException e) { logger.error("Task code get error, ", e);
closed
apache/dolphinscheduler
https://github.com/apache/dolphinscheduler
5,229
[Feature][server port] server port custom config
**Describe the feature** all application can custom config server port
https://github.com/apache/dolphinscheduler/issues/5229
https://github.com/apache/dolphinscheduler/pull/6947
100a9ba3fc21764158593bd33e2b261b0ef39982
0dcff1425a28da0ce0004fc3e594b97d080c5fd9
"2021-04-07T09:22:45Z"
java
"2021-11-30T16:21:03Z"
dolphinscheduler-service/src/main/java/org/apache/dolphinscheduler/service/process/ProcessService.java
return Constants.DEFINITION_FAILURE; } } newTaskDefinitionLogs.add(taskDefinitionLog); } int insertResult = 0; int updateResult = 0; for (TaskDefinitionLog taskDefinitionToUpdate : updateTaskDefinitionLogs) { TaskDefinition task = taskDefinitionMapper.queryByCode(taskDefinitionToUpdate.getCode()); if (task == null) { newTaskDefinitionLogs.add(taskDefinitionToUpdate); } else { insertResult += taskDefinitionLogMapper.insert(taskDefinitionToUpdate); taskDefinitionToUpdate.setId(task.getId()); updateResult += taskDefinitionMapper.updateById(taskDefinitionToUpdate); } } if (!newTaskDefinitionLogs.isEmpty()) { updateResult += taskDefinitionMapper.batchInsert(newTaskDefinitionLogs); insertResult += taskDefinitionLogMapper.batchInsert(newTaskDefinitionLogs); } return (insertResult & updateResult) > 0 ? 1 : Constants.EXIT_CODE_SUCCESS; } /** * save processDefinition (including create or update processDefinition) */ public int saveProcessDefine(User operator, ProcessDefinition processDefinition, Boolean isFromProcessDefine) { ProcessDefinitionLog processDefinitionLog = new ProcessDefinitionLog(processDefinition); Integer version = processDefineLogMapper.queryMaxVersionForDefinition(processDefinition.getCode()); int insertVersion = version == null || version == 0 ? Constants.VERSION_FIRST : version + 1;
closed
apache/dolphinscheduler
https://github.com/apache/dolphinscheduler
5,229
[Feature][server port] server port custom config
**Describe the feature** all application can custom config server port
https://github.com/apache/dolphinscheduler/issues/5229
https://github.com/apache/dolphinscheduler/pull/6947
100a9ba3fc21764158593bd33e2b261b0ef39982
0dcff1425a28da0ce0004fc3e594b97d080c5fd9
"2021-04-07T09:22:45Z"
java
"2021-11-30T16:21:03Z"
dolphinscheduler-service/src/main/java/org/apache/dolphinscheduler/service/process/ProcessService.java
processDefinitionLog.setVersion(insertVersion); processDefinitionLog.setReleaseState(isFromProcessDefine ? ReleaseState.OFFLINE : ReleaseState.ONLINE); processDefinitionLog.setOperator(operator.getId()); processDefinitionLog.setOperateTime(processDefinition.getUpdateTime()); int insertLog = processDefineLogMapper.insert(processDefinitionLog); int result; if (0 == processDefinition.getId()) { result = processDefineMapper.insert(processDefinitionLog); } else { processDefinitionLog.setId(processDefinition.getId()); result = processDefineMapper.updateById(processDefinitionLog); } return (insertLog & result) > 0 ? insertVersion : 0; } /** * save task relations */ public int saveTaskRelation(User operator, long projectCode, long processDefinitionCode, int processDefinitionVersion, List<ProcessTaskRelationLog> taskRelationList, List<TaskDefinitionLog> taskDefinitionLogs) { Map<Long, TaskDefinitionLog> taskDefinitionLogMap = null; if (CollectionUtils.isNotEmpty(taskDefinitionLogs)) { taskDefinitionLogMap = taskDefinitionLogs.stream() .collect(Collectors.toMap(TaskDefinition::getCode, taskDefinitionLog -> taskDefinitionLog)); } Date now = new Date(); for (ProcessTaskRelationLog processTaskRelationLog : taskRelationList) { processTaskRelationLog.setProjectCode(projectCode); processTaskRelationLog.setProcessDefinitionCode(processDefinitionCode); processTaskRelationLog.setProcessDefinitionVersion(processDefinitionVersion); if (taskDefinitionLogMap != null) {
closed
apache/dolphinscheduler
https://github.com/apache/dolphinscheduler
5,229
[Feature][server port] server port custom config
**Describe the feature** all application can custom config server port
https://github.com/apache/dolphinscheduler/issues/5229
https://github.com/apache/dolphinscheduler/pull/6947
100a9ba3fc21764158593bd33e2b261b0ef39982
0dcff1425a28da0ce0004fc3e594b97d080c5fd9
"2021-04-07T09:22:45Z"
java
"2021-11-30T16:21:03Z"
dolphinscheduler-service/src/main/java/org/apache/dolphinscheduler/service/process/ProcessService.java
TaskDefinitionLog taskDefinitionLog = taskDefinitionLogMap.get(processTaskRelationLog.getPreTaskCode()); if (taskDefinitionLog != null) { processTaskRelationLog.setPreTaskVersion(taskDefinitionLog.getVersion()); } processTaskRelationLog.setPostTaskVersion(taskDefinitionLogMap.get(processTaskRelationLog.getPostTaskCode()).getVersion()); } processTaskRelationLog.setCreateTime(now); processTaskRelationLog.setUpdateTime(now); processTaskRelationLog.setOperator(operator.getId()); processTaskRelationLog.setOperateTime(now); } List<ProcessTaskRelation> processTaskRelationList = processTaskRelationMapper.queryByProcessCode(projectCode, processDefinitionCode); if (!processTaskRelationList.isEmpty()) { Set<Integer> processTaskRelationSet = processTaskRelationList.stream().map(ProcessTaskRelation::hashCode).collect(toSet()); Set<Integer> taskRelationSet = taskRelationList.stream().map(ProcessTaskRelationLog::hashCode).collect(toSet()); boolean result = CollectionUtils.isEqualCollection(processTaskRelationSet, taskRelationSet); if (result) { return Constants.EXIT_CODE_SUCCESS; } processTaskRelationMapper.deleteByCode(projectCode, processDefinitionCode); } int result = processTaskRelationMapper.batchInsert(taskRelationList); int resultLog = processTaskRelationLogMapper.batchInsert(taskRelationList); return (result & resultLog) > 0 ? Constants.EXIT_CODE_SUCCESS : Constants.EXIT_CODE_FAILURE; } public boolean isTaskOnline(long taskCode) { List<ProcessTaskRelation> processTaskRelationList = processTaskRelationMapper.queryByTaskCode(taskCode); if (!processTaskRelationList.isEmpty()) { Set<Long> processDefinitionCodes = processTaskRelationList .stream()
closed
apache/dolphinscheduler
https://github.com/apache/dolphinscheduler
5,229
[Feature][server port] server port custom config
**Describe the feature** all application can custom config server port
https://github.com/apache/dolphinscheduler/issues/5229
https://github.com/apache/dolphinscheduler/pull/6947
100a9ba3fc21764158593bd33e2b261b0ef39982
0dcff1425a28da0ce0004fc3e594b97d080c5fd9
"2021-04-07T09:22:45Z"
java
"2021-11-30T16:21:03Z"
dolphinscheduler-service/src/main/java/org/apache/dolphinscheduler/service/process/ProcessService.java
.map(ProcessTaskRelation::getProcessDefinitionCode) .collect(Collectors.toSet()); List<ProcessDefinition> processDefinitionList = processDefineMapper.queryByCodes(processDefinitionCodes); for (ProcessDefinition processDefinition : processDefinitionList) { if (processDefinition.getReleaseState() == ReleaseState.ONLINE) { return true; } } } return false; } /** * Generate the DAG Graph based on the process definition id * * @param processDefinition process definition * @return dag graph */ public DAG<String, TaskNode, TaskNodeRelation> genDagGraph(ProcessDefinition processDefinition) { List<ProcessTaskRelation> processTaskRelations = processTaskRelationMapper.queryByProcessCode(processDefinition.getProjectCode(), processDefinition.getCode()); List<TaskNode> taskNodeList = transformTask(processTaskRelations, Lists.newArrayList()); ProcessDag processDag = DagHelper.getProcessDag(taskNodeList, new ArrayList<>(processTaskRelations)); return DagHelper.buildDagGraph(processDag); } /** * generate DagData */ public DagData genDagData(ProcessDefinition processDefinition) { List<ProcessTaskRelation> processTaskRelations = processTaskRelationMapper.queryByProcessCode(processDefinition.getProjectCode(), processDefinition.getCode());
closed
apache/dolphinscheduler
https://github.com/apache/dolphinscheduler
5,229
[Feature][server port] server port custom config
**Describe the feature** all application can custom config server port
https://github.com/apache/dolphinscheduler/issues/5229
https://github.com/apache/dolphinscheduler/pull/6947
100a9ba3fc21764158593bd33e2b261b0ef39982
0dcff1425a28da0ce0004fc3e594b97d080c5fd9
"2021-04-07T09:22:45Z"
java
"2021-11-30T16:21:03Z"
dolphinscheduler-service/src/main/java/org/apache/dolphinscheduler/service/process/ProcessService.java
List<TaskDefinitionLog> taskDefinitionLogList = genTaskDefineList(processTaskRelations); List<TaskDefinition> taskDefinitions = taskDefinitionLogList.stream() .map(taskDefinitionLog -> JSONUtils.parseObject(JSONUtils.toJsonString(taskDefinitionLog), TaskDefinition.class)) .collect(Collectors.toList()); return new DagData(processDefinition, processTaskRelations, taskDefinitions); } public List<TaskDefinitionLog> genTaskDefineList(List<ProcessTaskRelation> processTaskRelations) { Set<TaskDefinition> taskDefinitionSet = new HashSet<>(); for (ProcessTaskRelation processTaskRelation : processTaskRelations) { if (processTaskRelation.getPreTaskCode() > 0) { taskDefinitionSet.add(new TaskDefinition(processTaskRelation.getPreTaskCode(), processTaskRelation.getPreTaskVersion())); } if (processTaskRelation.getPostTaskCode() > 0) { taskDefinitionSet.add(new TaskDefinition(processTaskRelation.getPostTaskCode(), processTaskRelation.getPostTaskVersion())); } } return taskDefinitionLogMapper.queryByTaskDefinitions(taskDefinitionSet); } /** * find task definition by code and version */ public TaskDefinition findTaskDefinition(long taskCode, int taskDefinitionVersion) { return taskDefinitionLogMapper.queryByDefinitionCodeAndVersion(taskCode, taskDefinitionVersion); } /** * find process task relation list by projectCode and processDefinitionCode */ public List<ProcessTaskRelation> findRelationByCode(long projectCode, long processDefinitionCode) { return processTaskRelationMapper.queryByProcessCode(projectCode, processDefinitionCode); }
closed
apache/dolphinscheduler
https://github.com/apache/dolphinscheduler
5,229
[Feature][server port] server port custom config
**Describe the feature** all application can custom config server port
https://github.com/apache/dolphinscheduler/issues/5229
https://github.com/apache/dolphinscheduler/pull/6947
100a9ba3fc21764158593bd33e2b261b0ef39982
0dcff1425a28da0ce0004fc3e594b97d080c5fd9
"2021-04-07T09:22:45Z"
java
"2021-11-30T16:21:03Z"
dolphinscheduler-service/src/main/java/org/apache/dolphinscheduler/service/process/ProcessService.java
/** * add authorized resources * * @param ownResources own resources * @param userId userId */ private void addAuthorizedResources(List<Resource> ownResources, int userId) { List<Integer> relationResourceIds = resourceUserMapper.queryResourcesIdListByUserIdAndPerm(userId, 7); List<Resource> relationResources = CollectionUtils.isNotEmpty(relationResourceIds) ? resourceMapper.queryResourceListById(relationResourceIds) : new ArrayList<>(); ownResources.addAll(relationResources); } /** * Use temporarily before refactoring taskNode */ public List<TaskNode> transformTask(List<ProcessTaskRelation> taskRelationList, List<TaskDefinitionLog> taskDefinitionLogs) { Map<Long, List<Long>> taskCodeMap = new HashMap<>(); for (ProcessTaskRelation processTaskRelation : taskRelationList) { taskCodeMap.compute(processTaskRelation.getPostTaskCode(), (k, v) -> { if (v == null) { v = new ArrayList<>(); } if (processTaskRelation.getPreTaskCode() != 0L) { v.add(processTaskRelation.getPreTaskCode()); } return v; }); } if (CollectionUtils.isEmpty(taskDefinitionLogs)) { taskDefinitionLogs = genTaskDefineList(taskRelationList); }
closed
apache/dolphinscheduler
https://github.com/apache/dolphinscheduler
5,229
[Feature][server port] server port custom config
**Describe the feature** all application can custom config server port
https://github.com/apache/dolphinscheduler/issues/5229
https://github.com/apache/dolphinscheduler/pull/6947
100a9ba3fc21764158593bd33e2b261b0ef39982
0dcff1425a28da0ce0004fc3e594b97d080c5fd9
"2021-04-07T09:22:45Z"
java
"2021-11-30T16:21:03Z"
dolphinscheduler-service/src/main/java/org/apache/dolphinscheduler/service/process/ProcessService.java
Map<Long, TaskDefinitionLog> taskDefinitionLogMap = taskDefinitionLogs.stream() .collect(Collectors.toMap(TaskDefinitionLog::getCode, taskDefinitionLog -> taskDefinitionLog)); List<TaskNode> taskNodeList = new ArrayList<>(); for (Entry<Long, List<Long>> code : taskCodeMap.entrySet()) { TaskDefinitionLog taskDefinitionLog = taskDefinitionLogMap.get(code.getKey()); if (taskDefinitionLog != null) { TaskNode taskNode = new TaskNode(); taskNode.setCode(taskDefinitionLog.getCode()); taskNode.setVersion(taskDefinitionLog.getVersion()); taskNode.setName(taskDefinitionLog.getName()); taskNode.setDesc(taskDefinitionLog.getDescription()); taskNode.setType(taskDefinitionLog.getTaskType().toUpperCase()); taskNode.setRunFlag(taskDefinitionLog.getFlag() == Flag.YES ? Constants.FLOWNODE_RUN_FLAG_NORMAL : Constants.FLOWNODE_RUN_FLAG_FORBIDDEN); taskNode.setMaxRetryTimes(taskDefinitionLog.getFailRetryTimes()); taskNode.setRetryInterval(taskDefinitionLog.getFailRetryInterval()); Map<String, Object> taskParamsMap = taskNode.taskParamsToJsonObj(taskDefinitionLog.getTaskParams()); taskNode.setConditionResult(JSONUtils.toJsonString(taskParamsMap.get(Constants.CONDITION_RESULT))); taskNode.setSwitchResult(JSONUtils.toJsonString(taskParamsMap.get(Constants.SWITCH_RESULT))); taskNode.setDependence(JSONUtils.toJsonString(taskParamsMap.get(Constants.DEPENDENCE))); taskParamsMap.remove(Constants.CONDITION_RESULT); taskParamsMap.remove(Constants.DEPENDENCE); taskNode.setParams(JSONUtils.toJsonString(taskParamsMap)); taskNode.setTaskInstancePriority(taskDefinitionLog.getTaskPriority()); taskNode.setWorkerGroup(taskDefinitionLog.getWorkerGroup()); taskNode.setEnvironmentCode(taskDefinitionLog.getEnvironmentCode()); taskNode.setTimeout(JSONUtils.toJsonString(new TaskTimeoutParameter(taskDefinitionLog.getTimeoutFlag() == TimeoutFlag.OPEN, taskDefinitionLog.getTimeoutNotifyStrategy(), taskDefinitionLog.getTimeout()))); taskNode.setDelayTime(taskDefinitionLog.getDelayTime()); taskNode.setPreTasks(JSONUtils.toJsonString(code.getValue().stream().map(taskDefinitionLogMap::get).map(TaskDefinition::getCode).collect(Collectors.toList())));
closed
apache/dolphinscheduler
https://github.com/apache/dolphinscheduler
5,229
[Feature][server port] server port custom config
**Describe the feature** all application can custom config server port
https://github.com/apache/dolphinscheduler/issues/5229
https://github.com/apache/dolphinscheduler/pull/6947
100a9ba3fc21764158593bd33e2b261b0ef39982
0dcff1425a28da0ce0004fc3e594b97d080c5fd9
"2021-04-07T09:22:45Z"
java
"2021-11-30T16:21:03Z"
dolphinscheduler-service/src/main/java/org/apache/dolphinscheduler/service/process/ProcessService.java
taskNodeList.add(taskNode); } } return taskNodeList; } public Map<ProcessInstance, TaskInstance> notifyProcessList(int processId, int taskId) { HashMap<ProcessInstance, TaskInstance> processTaskMap = new HashMap<>(); ProcessInstanceMap processInstanceMap = processInstanceMapMapper.queryBySubProcessId(processId); if (processInstanceMap == null) { return processTaskMap; } ProcessInstance fatherProcess = this.findProcessInstanceById(processInstanceMap.getParentProcessInstanceId()); TaskInstance fatherTask = this.findTaskInstanceById(processInstanceMap.getParentTaskInstanceId()); if (fatherProcess != null) { processTaskMap.put(fatherProcess, fatherTask); } return processTaskMap; } public ProcessInstance loadNextProcess4Serial(long code, int state) { return this.processInstanceMapper.loadNextProcess4Serial(code, state); } private void deleteCommandWithCheck(int commandId) { int delete = this.commandMapper.deleteById(commandId); if (delete != 1) { throw new ServiceException("delete command fail, id:" + commandId); } } }
closed
apache/dolphinscheduler
https://github.com/apache/dolphinscheduler
6,809
[Bug] [dolphinscheduler-task-sql] NullPointerException happened when send alert.
### Search before asking - [X] I had searched in the [issues](https://github.com/apache/dolphinscheduler/issues?q=is%3Aissue) and found no similar issues. ### What happened NullPointerException happened when run sql task. -[2.0.0-release-prepare] ### What you expected to happen Run sql task with alert successful. ### How to reproduce [ERROR] 2021-11-11 14:31:19.462 org.apache.dolphinscheduler.server.worker.runner.TaskExecuteThread:[210] - task scheduler failure java.lang.NullPointerException: null at org.apache.dolphinscheduler.server.worker.runner.TaskExecuteThread.sendAlert(TaskExecuteThread.java:225) at org.apache.dolphinscheduler.server.worker.runner.TaskExecuteThread.run(TaskExecuteThread.java:196) at java.util.concurrent.Executors$RunnableAdapter.call(Executors.java:511) at java.util.concurrent.FutureTask.run(FutureTask.java:266) 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) at org.apache.dolphinscheduler.plugin.task.sql.SqlTask.sendAttachment(SqlTask:280); `private void sendAttachment(int groupId, String title, String content) {` ` setNeedAlert(Boolean.TRUE);` ` TaskAlertInfo taskAlertInfo = new TaskAlertInfo();` ` taskAlertInfo.setAlertGroupId(groupId);` ` taskAlertInfo.setContent(content);` ` taskAlertInfo.setTitle(title);` `}` Forget to setTaskAlertInfo? `private void sendAttachment(int groupId, String title, String content) {` ` setNeedAlert(Boolean.TRUE);` ` TaskAlertInfo taskAlertInfo = new TaskAlertInfo();` ` taskAlertInfo.setAlertGroupId(groupId);` ` taskAlertInfo.setContent(content);` ` taskAlertInfo.setTitle(title);` ` setTaskAlertInfo(taskAlertInfo);` `}` ### Anything else _No response_ ### Are you willing to submit PR? - [X] Yes I am willing to submit a PR! ### Code of Conduct - [X] I agree to follow this project's [Code of Conduct](https://www.apache.org/foundation/policies/conduct)
https://github.com/apache/dolphinscheduler/issues/6809
https://github.com/apache/dolphinscheduler/pull/7089
2ed3c0c3a76dd6ff631b0e63f6328d32fc1c81b3
463fc76bb7bf83d2826c680cc7531b102a7abe65
"2021-11-11T11:52:11Z"
java
"2021-12-01T06:08:40Z"
dolphinscheduler-task-plugin/dolphinscheduler-task-sql/src/main/java/org/apache/dolphinscheduler/plugin/task/sql/SqlTask.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.sql; import org.apache.dolphinscheduler.plugin.datasource.api.plugin.DataSourceClientProvider; import org.apache.dolphinscheduler.plugin.datasource.api.utils.CommonUtils; import org.apache.dolphinscheduler.plugin.datasource.api.utils.DatasourceUtil; import org.apache.dolphinscheduler.plugin.task.api.AbstractTaskExecutor; import org.apache.dolphinscheduler.plugin.task.api.TaskException; import org.apache.dolphinscheduler.plugin.task.util.MapUtils; import org.apache.dolphinscheduler.spi.datasource.BaseConnectionParam; import org.apache.dolphinscheduler.spi.enums.DbType; import org.apache.dolphinscheduler.spi.enums.TaskTimeoutStrategy; import org.apache.dolphinscheduler.spi.task.AbstractParameters; import org.apache.dolphinscheduler.spi.task.Direct; import org.apache.dolphinscheduler.spi.task.Property; import org.apache.dolphinscheduler.spi.task.TaskAlertInfo;
closed
apache/dolphinscheduler
https://github.com/apache/dolphinscheduler
6,809
[Bug] [dolphinscheduler-task-sql] NullPointerException happened when send alert.
### Search before asking - [X] I had searched in the [issues](https://github.com/apache/dolphinscheduler/issues?q=is%3Aissue) and found no similar issues. ### What happened NullPointerException happened when run sql task. -[2.0.0-release-prepare] ### What you expected to happen Run sql task with alert successful. ### How to reproduce [ERROR] 2021-11-11 14:31:19.462 org.apache.dolphinscheduler.server.worker.runner.TaskExecuteThread:[210] - task scheduler failure java.lang.NullPointerException: null at org.apache.dolphinscheduler.server.worker.runner.TaskExecuteThread.sendAlert(TaskExecuteThread.java:225) at org.apache.dolphinscheduler.server.worker.runner.TaskExecuteThread.run(TaskExecuteThread.java:196) at java.util.concurrent.Executors$RunnableAdapter.call(Executors.java:511) at java.util.concurrent.FutureTask.run(FutureTask.java:266) 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) at org.apache.dolphinscheduler.plugin.task.sql.SqlTask.sendAttachment(SqlTask:280); `private void sendAttachment(int groupId, String title, String content) {` ` setNeedAlert(Boolean.TRUE);` ` TaskAlertInfo taskAlertInfo = new TaskAlertInfo();` ` taskAlertInfo.setAlertGroupId(groupId);` ` taskAlertInfo.setContent(content);` ` taskAlertInfo.setTitle(title);` `}` Forget to setTaskAlertInfo? `private void sendAttachment(int groupId, String title, String content) {` ` setNeedAlert(Boolean.TRUE);` ` TaskAlertInfo taskAlertInfo = new TaskAlertInfo();` ` taskAlertInfo.setAlertGroupId(groupId);` ` taskAlertInfo.setContent(content);` ` taskAlertInfo.setTitle(title);` ` setTaskAlertInfo(taskAlertInfo);` `}` ### Anything else _No response_ ### Are you willing to submit PR? - [X] Yes I am willing to submit a PR! ### Code of Conduct - [X] I agree to follow this project's [Code of Conduct](https://www.apache.org/foundation/policies/conduct)
https://github.com/apache/dolphinscheduler/issues/6809
https://github.com/apache/dolphinscheduler/pull/7089
2ed3c0c3a76dd6ff631b0e63f6328d32fc1c81b3
463fc76bb7bf83d2826c680cc7531b102a7abe65
"2021-11-11T11:52:11Z"
java
"2021-12-01T06:08:40Z"
dolphinscheduler-task-plugin/dolphinscheduler-task-sql/src/main/java/org/apache/dolphinscheduler/plugin/task/sql/SqlTask.java
import org.apache.dolphinscheduler.spi.task.TaskConstants; import org.apache.dolphinscheduler.spi.task.paramparser.ParamUtils; import org.apache.dolphinscheduler.spi.task.paramparser.ParameterUtils; import org.apache.dolphinscheduler.spi.task.request.SQLTaskExecutionContext; import org.apache.dolphinscheduler.spi.task.request.TaskRequest; import org.apache.dolphinscheduler.spi.task.request.UdfFuncRequest; import org.apache.dolphinscheduler.spi.utils.JSONUtils; import org.apache.dolphinscheduler.spi.utils.StringUtils; import org.apache.commons.collections.CollectionUtils; import java.sql.Connection; import java.sql.PreparedStatement; import java.sql.ResultSet; import java.sql.ResultSetMetaData; import java.sql.SQLException; import java.sql.Statement; import java.text.MessageFormat; import java.util.ArrayList; import java.util.HashMap; import java.util.List; import java.util.Map; import java.util.Map.Entry; import java.util.Optional; import java.util.Set; import java.util.regex.Matcher; import java.util.regex.Pattern; import java.util.stream.Collectors; import org.slf4j.Logger; import com.fasterxml.jackson.databind.node.ArrayNode; import com.fasterxml.jackson.databind.node.ObjectNode; public class SqlTask extends AbstractTaskExecutor {
closed
apache/dolphinscheduler
https://github.com/apache/dolphinscheduler
6,809
[Bug] [dolphinscheduler-task-sql] NullPointerException happened when send alert.
### Search before asking - [X] I had searched in the [issues](https://github.com/apache/dolphinscheduler/issues?q=is%3Aissue) and found no similar issues. ### What happened NullPointerException happened when run sql task. -[2.0.0-release-prepare] ### What you expected to happen Run sql task with alert successful. ### How to reproduce [ERROR] 2021-11-11 14:31:19.462 org.apache.dolphinscheduler.server.worker.runner.TaskExecuteThread:[210] - task scheduler failure java.lang.NullPointerException: null at org.apache.dolphinscheduler.server.worker.runner.TaskExecuteThread.sendAlert(TaskExecuteThread.java:225) at org.apache.dolphinscheduler.server.worker.runner.TaskExecuteThread.run(TaskExecuteThread.java:196) at java.util.concurrent.Executors$RunnableAdapter.call(Executors.java:511) at java.util.concurrent.FutureTask.run(FutureTask.java:266) 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) at org.apache.dolphinscheduler.plugin.task.sql.SqlTask.sendAttachment(SqlTask:280); `private void sendAttachment(int groupId, String title, String content) {` ` setNeedAlert(Boolean.TRUE);` ` TaskAlertInfo taskAlertInfo = new TaskAlertInfo();` ` taskAlertInfo.setAlertGroupId(groupId);` ` taskAlertInfo.setContent(content);` ` taskAlertInfo.setTitle(title);` `}` Forget to setTaskAlertInfo? `private void sendAttachment(int groupId, String title, String content) {` ` setNeedAlert(Boolean.TRUE);` ` TaskAlertInfo taskAlertInfo = new TaskAlertInfo();` ` taskAlertInfo.setAlertGroupId(groupId);` ` taskAlertInfo.setContent(content);` ` taskAlertInfo.setTitle(title);` ` setTaskAlertInfo(taskAlertInfo);` `}` ### Anything else _No response_ ### Are you willing to submit PR? - [X] Yes I am willing to submit a PR! ### Code of Conduct - [X] I agree to follow this project's [Code of Conduct](https://www.apache.org/foundation/policies/conduct)
https://github.com/apache/dolphinscheduler/issues/6809
https://github.com/apache/dolphinscheduler/pull/7089
2ed3c0c3a76dd6ff631b0e63f6328d32fc1c81b3
463fc76bb7bf83d2826c680cc7531b102a7abe65
"2021-11-11T11:52:11Z"
java
"2021-12-01T06:08:40Z"
dolphinscheduler-task-plugin/dolphinscheduler-task-sql/src/main/java/org/apache/dolphinscheduler/plugin/task/sql/SqlTask.java
/** * taskExecutionContext */
closed
apache/dolphinscheduler
https://github.com/apache/dolphinscheduler
6,809
[Bug] [dolphinscheduler-task-sql] NullPointerException happened when send alert.
### Search before asking - [X] I had searched in the [issues](https://github.com/apache/dolphinscheduler/issues?q=is%3Aissue) and found no similar issues. ### What happened NullPointerException happened when run sql task. -[2.0.0-release-prepare] ### What you expected to happen Run sql task with alert successful. ### How to reproduce [ERROR] 2021-11-11 14:31:19.462 org.apache.dolphinscheduler.server.worker.runner.TaskExecuteThread:[210] - task scheduler failure java.lang.NullPointerException: null at org.apache.dolphinscheduler.server.worker.runner.TaskExecuteThread.sendAlert(TaskExecuteThread.java:225) at org.apache.dolphinscheduler.server.worker.runner.TaskExecuteThread.run(TaskExecuteThread.java:196) at java.util.concurrent.Executors$RunnableAdapter.call(Executors.java:511) at java.util.concurrent.FutureTask.run(FutureTask.java:266) 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) at org.apache.dolphinscheduler.plugin.task.sql.SqlTask.sendAttachment(SqlTask:280); `private void sendAttachment(int groupId, String title, String content) {` ` setNeedAlert(Boolean.TRUE);` ` TaskAlertInfo taskAlertInfo = new TaskAlertInfo();` ` taskAlertInfo.setAlertGroupId(groupId);` ` taskAlertInfo.setContent(content);` ` taskAlertInfo.setTitle(title);` `}` Forget to setTaskAlertInfo? `private void sendAttachment(int groupId, String title, String content) {` ` setNeedAlert(Boolean.TRUE);` ` TaskAlertInfo taskAlertInfo = new TaskAlertInfo();` ` taskAlertInfo.setAlertGroupId(groupId);` ` taskAlertInfo.setContent(content);` ` taskAlertInfo.setTitle(title);` ` setTaskAlertInfo(taskAlertInfo);` `}` ### Anything else _No response_ ### Are you willing to submit PR? - [X] Yes I am willing to submit a PR! ### Code of Conduct - [X] I agree to follow this project's [Code of Conduct](https://www.apache.org/foundation/policies/conduct)
https://github.com/apache/dolphinscheduler/issues/6809
https://github.com/apache/dolphinscheduler/pull/7089
2ed3c0c3a76dd6ff631b0e63f6328d32fc1c81b3
463fc76bb7bf83d2826c680cc7531b102a7abe65
"2021-11-11T11:52:11Z"
java
"2021-12-01T06:08:40Z"
dolphinscheduler-task-plugin/dolphinscheduler-task-sql/src/main/java/org/apache/dolphinscheduler/plugin/task/sql/SqlTask.java
private TaskRequest taskExecutionContext; /** * sql parameters */ private SqlParameters sqlParameters; /** * base datasource */ private BaseConnectionParam baseConnectionParam; /** * create function format */ private static final String CREATE_FUNCTION_FORMAT = "create temporary function {0} as ''{1}''"; /** * default query sql limit */ private static final int QUERY_LIMIT = 10000; /** * Abstract Yarn Task * * @param taskRequest taskRequest */ public SqlTask(TaskRequest taskRequest) { super(taskRequest); this.taskExecutionContext = taskRequest; this.sqlParameters = JSONUtils.parseObject(taskExecutionContext.getTaskParams(), SqlParameters.class); assert sqlParameters != null; if (!sqlParameters.checkParameters()) { throw new RuntimeException("sql task params is not valid"); }
closed
apache/dolphinscheduler
https://github.com/apache/dolphinscheduler
6,809
[Bug] [dolphinscheduler-task-sql] NullPointerException happened when send alert.
### Search before asking - [X] I had searched in the [issues](https://github.com/apache/dolphinscheduler/issues?q=is%3Aissue) and found no similar issues. ### What happened NullPointerException happened when run sql task. -[2.0.0-release-prepare] ### What you expected to happen Run sql task with alert successful. ### How to reproduce [ERROR] 2021-11-11 14:31:19.462 org.apache.dolphinscheduler.server.worker.runner.TaskExecuteThread:[210] - task scheduler failure java.lang.NullPointerException: null at org.apache.dolphinscheduler.server.worker.runner.TaskExecuteThread.sendAlert(TaskExecuteThread.java:225) at org.apache.dolphinscheduler.server.worker.runner.TaskExecuteThread.run(TaskExecuteThread.java:196) at java.util.concurrent.Executors$RunnableAdapter.call(Executors.java:511) at java.util.concurrent.FutureTask.run(FutureTask.java:266) 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) at org.apache.dolphinscheduler.plugin.task.sql.SqlTask.sendAttachment(SqlTask:280); `private void sendAttachment(int groupId, String title, String content) {` ` setNeedAlert(Boolean.TRUE);` ` TaskAlertInfo taskAlertInfo = new TaskAlertInfo();` ` taskAlertInfo.setAlertGroupId(groupId);` ` taskAlertInfo.setContent(content);` ` taskAlertInfo.setTitle(title);` `}` Forget to setTaskAlertInfo? `private void sendAttachment(int groupId, String title, String content) {` ` setNeedAlert(Boolean.TRUE);` ` TaskAlertInfo taskAlertInfo = new TaskAlertInfo();` ` taskAlertInfo.setAlertGroupId(groupId);` ` taskAlertInfo.setContent(content);` ` taskAlertInfo.setTitle(title);` ` setTaskAlertInfo(taskAlertInfo);` `}` ### Anything else _No response_ ### Are you willing to submit PR? - [X] Yes I am willing to submit a PR! ### Code of Conduct - [X] I agree to follow this project's [Code of Conduct](https://www.apache.org/foundation/policies/conduct)
https://github.com/apache/dolphinscheduler/issues/6809
https://github.com/apache/dolphinscheduler/pull/7089
2ed3c0c3a76dd6ff631b0e63f6328d32fc1c81b3
463fc76bb7bf83d2826c680cc7531b102a7abe65
"2021-11-11T11:52:11Z"
java
"2021-12-01T06:08:40Z"
dolphinscheduler-task-plugin/dolphinscheduler-task-sql/src/main/java/org/apache/dolphinscheduler/plugin/task/sql/SqlTask.java
} @Override public AbstractParameters getParameters() { return sqlParameters; } @Override public void handle() throws Exception { String threadLoggerInfoName = String.format(TaskConstants.TASK_LOG_INFO_FORMAT, taskExecutionContext.getTaskAppId()); Thread.currentThread().setName(threadLoggerInfoName); logger.info("Full sql parameters: {}", sqlParameters); logger.info("sql type : {}, datasource : {}, sql : {} , localParams : {},udfs : {},showType : {},connParams : {},varPool : {} ,query max result limit {}", sqlParameters.getType(), sqlParameters.getDatasource(), sqlParameters.getSql(), sqlParameters.getLocalParams(), sqlParameters.getUdfs(), sqlParameters.getShowType(), sqlParameters.getConnParams(), sqlParameters.getVarPool(), sqlParameters.getLimit()); try { SQLTaskExecutionContext sqlTaskExecutionContext = taskExecutionContext.getSqlTaskExecutionContext(); baseConnectionParam = (BaseConnectionParam) DatasourceUtil.buildConnectionParams( DbType.valueOf(sqlParameters.getType()), sqlTaskExecutionContext.getConnectionParams()); SqlBinds mainSqlBinds = getSqlAndSqlParamsMap(sqlParameters.getSql()); List<SqlBinds> preStatementSqlBinds = Optional.ofNullable(sqlParameters.getPreStatements())
closed
apache/dolphinscheduler
https://github.com/apache/dolphinscheduler
6,809
[Bug] [dolphinscheduler-task-sql] NullPointerException happened when send alert.
### Search before asking - [X] I had searched in the [issues](https://github.com/apache/dolphinscheduler/issues?q=is%3Aissue) and found no similar issues. ### What happened NullPointerException happened when run sql task. -[2.0.0-release-prepare] ### What you expected to happen Run sql task with alert successful. ### How to reproduce [ERROR] 2021-11-11 14:31:19.462 org.apache.dolphinscheduler.server.worker.runner.TaskExecuteThread:[210] - task scheduler failure java.lang.NullPointerException: null at org.apache.dolphinscheduler.server.worker.runner.TaskExecuteThread.sendAlert(TaskExecuteThread.java:225) at org.apache.dolphinscheduler.server.worker.runner.TaskExecuteThread.run(TaskExecuteThread.java:196) at java.util.concurrent.Executors$RunnableAdapter.call(Executors.java:511) at java.util.concurrent.FutureTask.run(FutureTask.java:266) 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) at org.apache.dolphinscheduler.plugin.task.sql.SqlTask.sendAttachment(SqlTask:280); `private void sendAttachment(int groupId, String title, String content) {` ` setNeedAlert(Boolean.TRUE);` ` TaskAlertInfo taskAlertInfo = new TaskAlertInfo();` ` taskAlertInfo.setAlertGroupId(groupId);` ` taskAlertInfo.setContent(content);` ` taskAlertInfo.setTitle(title);` `}` Forget to setTaskAlertInfo? `private void sendAttachment(int groupId, String title, String content) {` ` setNeedAlert(Boolean.TRUE);` ` TaskAlertInfo taskAlertInfo = new TaskAlertInfo();` ` taskAlertInfo.setAlertGroupId(groupId);` ` taskAlertInfo.setContent(content);` ` taskAlertInfo.setTitle(title);` ` setTaskAlertInfo(taskAlertInfo);` `}` ### Anything else _No response_ ### Are you willing to submit PR? - [X] Yes I am willing to submit a PR! ### Code of Conduct - [X] I agree to follow this project's [Code of Conduct](https://www.apache.org/foundation/policies/conduct)
https://github.com/apache/dolphinscheduler/issues/6809
https://github.com/apache/dolphinscheduler/pull/7089
2ed3c0c3a76dd6ff631b0e63f6328d32fc1c81b3
463fc76bb7bf83d2826c680cc7531b102a7abe65
"2021-11-11T11:52:11Z"
java
"2021-12-01T06:08:40Z"
dolphinscheduler-task-plugin/dolphinscheduler-task-sql/src/main/java/org/apache/dolphinscheduler/plugin/task/sql/SqlTask.java
.orElse(new ArrayList<>()) .stream() .map(this::getSqlAndSqlParamsMap) .collect(Collectors.toList()); List<SqlBinds> postStatementSqlBinds = Optional.ofNullable(sqlParameters.getPostStatements()) .orElse(new ArrayList<>()) .stream() .map(this::getSqlAndSqlParamsMap) .collect(Collectors.toList()); List<String> createFuncs = createFuncs(sqlTaskExecutionContext.getUdfFuncTenantCodeMap(), sqlTaskExecutionContext.getDefaultFS(), logger); executeFuncAndSql(mainSqlBinds, preStatementSqlBinds, postStatementSqlBinds, createFuncs); setExitStatusCode(TaskConstants.EXIT_CODE_SUCCESS); } catch (Exception e) { setExitStatusCode(TaskConstants.EXIT_CODE_FAILURE); logger.error("sql task error: {}", e.toString()); throw e; } } /** * execute function and sql * * @param mainSqlBinds main sql binds * @param preStatementsBinds pre statements binds * @param postStatementsBinds post statements binds * @param createFuncs create functions */ public void executeFuncAndSql(SqlBinds mainSqlBinds, List<SqlBinds> preStatementsBinds,
closed
apache/dolphinscheduler
https://github.com/apache/dolphinscheduler
6,809
[Bug] [dolphinscheduler-task-sql] NullPointerException happened when send alert.
### Search before asking - [X] I had searched in the [issues](https://github.com/apache/dolphinscheduler/issues?q=is%3Aissue) and found no similar issues. ### What happened NullPointerException happened when run sql task. -[2.0.0-release-prepare] ### What you expected to happen Run sql task with alert successful. ### How to reproduce [ERROR] 2021-11-11 14:31:19.462 org.apache.dolphinscheduler.server.worker.runner.TaskExecuteThread:[210] - task scheduler failure java.lang.NullPointerException: null at org.apache.dolphinscheduler.server.worker.runner.TaskExecuteThread.sendAlert(TaskExecuteThread.java:225) at org.apache.dolphinscheduler.server.worker.runner.TaskExecuteThread.run(TaskExecuteThread.java:196) at java.util.concurrent.Executors$RunnableAdapter.call(Executors.java:511) at java.util.concurrent.FutureTask.run(FutureTask.java:266) 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) at org.apache.dolphinscheduler.plugin.task.sql.SqlTask.sendAttachment(SqlTask:280); `private void sendAttachment(int groupId, String title, String content) {` ` setNeedAlert(Boolean.TRUE);` ` TaskAlertInfo taskAlertInfo = new TaskAlertInfo();` ` taskAlertInfo.setAlertGroupId(groupId);` ` taskAlertInfo.setContent(content);` ` taskAlertInfo.setTitle(title);` `}` Forget to setTaskAlertInfo? `private void sendAttachment(int groupId, String title, String content) {` ` setNeedAlert(Boolean.TRUE);` ` TaskAlertInfo taskAlertInfo = new TaskAlertInfo();` ` taskAlertInfo.setAlertGroupId(groupId);` ` taskAlertInfo.setContent(content);` ` taskAlertInfo.setTitle(title);` ` setTaskAlertInfo(taskAlertInfo);` `}` ### Anything else _No response_ ### Are you willing to submit PR? - [X] Yes I am willing to submit a PR! ### Code of Conduct - [X] I agree to follow this project's [Code of Conduct](https://www.apache.org/foundation/policies/conduct)
https://github.com/apache/dolphinscheduler/issues/6809
https://github.com/apache/dolphinscheduler/pull/7089
2ed3c0c3a76dd6ff631b0e63f6328d32fc1c81b3
463fc76bb7bf83d2826c680cc7531b102a7abe65
"2021-11-11T11:52:11Z"
java
"2021-12-01T06:08:40Z"
dolphinscheduler-task-plugin/dolphinscheduler-task-sql/src/main/java/org/apache/dolphinscheduler/plugin/task/sql/SqlTask.java
List<SqlBinds> postStatementsBinds, List<String> createFuncs) throws Exception { Connection connection = null; PreparedStatement stmt = null; ResultSet resultSet = null; try { connection = DataSourceClientProvider.getInstance().getConnection(DbType.valueOf(sqlParameters.getType()), baseConnectionParam); if (CollectionUtils.isNotEmpty(createFuncs)) { createTempFunction(connection, createFuncs); } preSql(connection, preStatementsBinds); stmt = prepareStatementAndBind(connection, mainSqlBinds); String result = null; if (sqlParameters.getSqlType() == SqlType.QUERY.ordinal()) { resultSet = stmt.executeQuery(); result = resultProcess(resultSet); } else if (sqlParameters.getSqlType() == SqlType.NON_QUERY.ordinal()) { String updateResult = String.valueOf(stmt.executeUpdate()); result = setNonQuerySqlReturn(updateResult, sqlParameters.getLocalParams()); } sqlParameters.dealOutParam(result); postSql(connection, postStatementsBinds); } catch (Exception e) {
closed
apache/dolphinscheduler
https://github.com/apache/dolphinscheduler
6,809
[Bug] [dolphinscheduler-task-sql] NullPointerException happened when send alert.
### Search before asking - [X] I had searched in the [issues](https://github.com/apache/dolphinscheduler/issues?q=is%3Aissue) and found no similar issues. ### What happened NullPointerException happened when run sql task. -[2.0.0-release-prepare] ### What you expected to happen Run sql task with alert successful. ### How to reproduce [ERROR] 2021-11-11 14:31:19.462 org.apache.dolphinscheduler.server.worker.runner.TaskExecuteThread:[210] - task scheduler failure java.lang.NullPointerException: null at org.apache.dolphinscheduler.server.worker.runner.TaskExecuteThread.sendAlert(TaskExecuteThread.java:225) at org.apache.dolphinscheduler.server.worker.runner.TaskExecuteThread.run(TaskExecuteThread.java:196) at java.util.concurrent.Executors$RunnableAdapter.call(Executors.java:511) at java.util.concurrent.FutureTask.run(FutureTask.java:266) 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) at org.apache.dolphinscheduler.plugin.task.sql.SqlTask.sendAttachment(SqlTask:280); `private void sendAttachment(int groupId, String title, String content) {` ` setNeedAlert(Boolean.TRUE);` ` TaskAlertInfo taskAlertInfo = new TaskAlertInfo();` ` taskAlertInfo.setAlertGroupId(groupId);` ` taskAlertInfo.setContent(content);` ` taskAlertInfo.setTitle(title);` `}` Forget to setTaskAlertInfo? `private void sendAttachment(int groupId, String title, String content) {` ` setNeedAlert(Boolean.TRUE);` ` TaskAlertInfo taskAlertInfo = new TaskAlertInfo();` ` taskAlertInfo.setAlertGroupId(groupId);` ` taskAlertInfo.setContent(content);` ` taskAlertInfo.setTitle(title);` ` setTaskAlertInfo(taskAlertInfo);` `}` ### Anything else _No response_ ### Are you willing to submit PR? - [X] Yes I am willing to submit a PR! ### Code of Conduct - [X] I agree to follow this project's [Code of Conduct](https://www.apache.org/foundation/policies/conduct)
https://github.com/apache/dolphinscheduler/issues/6809
https://github.com/apache/dolphinscheduler/pull/7089
2ed3c0c3a76dd6ff631b0e63f6328d32fc1c81b3
463fc76bb7bf83d2826c680cc7531b102a7abe65
"2021-11-11T11:52:11Z"
java
"2021-12-01T06:08:40Z"
dolphinscheduler-task-plugin/dolphinscheduler-task-sql/src/main/java/org/apache/dolphinscheduler/plugin/task/sql/SqlTask.java
logger.error("execute sql error: {}", e.getMessage()); throw e; } finally { close(resultSet, stmt, connection); } } private String setNonQuerySqlReturn(String updateResult, List<Property> properties) { String result = null; for (Property info : properties) { if (Direct.OUT == info.getDirect()) { List<Map<String, String>> updateRL = new ArrayList<>(); Map<String, String> updateRM = new HashMap<>(); updateRM.put(info.getProp(), updateResult); updateRL.add(updateRM); result = JSONUtils.toJsonString(updateRL); break; } } return result; } /** * result process * * @param resultSet resultSet * @throws Exception Exception */ private String resultProcess(ResultSet resultSet) throws Exception { ArrayNode resultJSONArray = JSONUtils.createArrayNode(); if (resultSet != null) { ResultSetMetaData md = resultSet.getMetaData();
closed
apache/dolphinscheduler
https://github.com/apache/dolphinscheduler
6,809
[Bug] [dolphinscheduler-task-sql] NullPointerException happened when send alert.
### Search before asking - [X] I had searched in the [issues](https://github.com/apache/dolphinscheduler/issues?q=is%3Aissue) and found no similar issues. ### What happened NullPointerException happened when run sql task. -[2.0.0-release-prepare] ### What you expected to happen Run sql task with alert successful. ### How to reproduce [ERROR] 2021-11-11 14:31:19.462 org.apache.dolphinscheduler.server.worker.runner.TaskExecuteThread:[210] - task scheduler failure java.lang.NullPointerException: null at org.apache.dolphinscheduler.server.worker.runner.TaskExecuteThread.sendAlert(TaskExecuteThread.java:225) at org.apache.dolphinscheduler.server.worker.runner.TaskExecuteThread.run(TaskExecuteThread.java:196) at java.util.concurrent.Executors$RunnableAdapter.call(Executors.java:511) at java.util.concurrent.FutureTask.run(FutureTask.java:266) 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) at org.apache.dolphinscheduler.plugin.task.sql.SqlTask.sendAttachment(SqlTask:280); `private void sendAttachment(int groupId, String title, String content) {` ` setNeedAlert(Boolean.TRUE);` ` TaskAlertInfo taskAlertInfo = new TaskAlertInfo();` ` taskAlertInfo.setAlertGroupId(groupId);` ` taskAlertInfo.setContent(content);` ` taskAlertInfo.setTitle(title);` `}` Forget to setTaskAlertInfo? `private void sendAttachment(int groupId, String title, String content) {` ` setNeedAlert(Boolean.TRUE);` ` TaskAlertInfo taskAlertInfo = new TaskAlertInfo();` ` taskAlertInfo.setAlertGroupId(groupId);` ` taskAlertInfo.setContent(content);` ` taskAlertInfo.setTitle(title);` ` setTaskAlertInfo(taskAlertInfo);` `}` ### Anything else _No response_ ### Are you willing to submit PR? - [X] Yes I am willing to submit a PR! ### Code of Conduct - [X] I agree to follow this project's [Code of Conduct](https://www.apache.org/foundation/policies/conduct)
https://github.com/apache/dolphinscheduler/issues/6809
https://github.com/apache/dolphinscheduler/pull/7089
2ed3c0c3a76dd6ff631b0e63f6328d32fc1c81b3
463fc76bb7bf83d2826c680cc7531b102a7abe65
"2021-11-11T11:52:11Z"
java
"2021-12-01T06:08:40Z"
dolphinscheduler-task-plugin/dolphinscheduler-task-sql/src/main/java/org/apache/dolphinscheduler/plugin/task/sql/SqlTask.java
int num = md.getColumnCount(); int rowCount = 0; int limit = sqlParameters.getLimit() == 0 ? QUERY_LIMIT : sqlParameters.getLimit(); while (rowCount < limit && resultSet.next()) { ObjectNode mapOfColValues = JSONUtils.createObjectNode(); for (int i = 1; i <= num; i++) { mapOfColValues.set(md.getColumnLabel(i), JSONUtils.toJsonNode(resultSet.getObject(i))); } resultJSONArray.add(mapOfColValues); rowCount++; } int displayRows = sqlParameters.getDisplayRows() > 0 ? sqlParameters.getDisplayRows() : TaskConstants.DEFAULT_DISPLAY_ROWS; displayRows = Math.min(displayRows, resultJSONArray.size()); logger.info("display sql result {} rows as follows:", displayRows); for (int i = 0; i < displayRows; i++) { String row = JSONUtils.toJsonString(resultJSONArray.get(i)); logger.info("row {} : {}", i + 1, row); } if (resultSet.next()) { logger.info("sql result limit : {} exceeding results are filtered", limit); String log = String.format("sql result limit : %d exceeding results are filtered", limit); resultJSONArray.add(JSONUtils.toJsonNode(log)); } } String result = JSONUtils.toJsonString(resultJSONArray); if (sqlParameters.getSendEmail() == null || sqlParameters.getSendEmail()) { sendAttachment(sqlParameters.getGroupId(), StringUtils.isNotEmpty(sqlParameters.getTitle()) ? sqlParameters.getTitle() : taskExecutionContext.getTaskName() + " query result sets", result); }
closed
apache/dolphinscheduler
https://github.com/apache/dolphinscheduler
6,809
[Bug] [dolphinscheduler-task-sql] NullPointerException happened when send alert.
### Search before asking - [X] I had searched in the [issues](https://github.com/apache/dolphinscheduler/issues?q=is%3Aissue) and found no similar issues. ### What happened NullPointerException happened when run sql task. -[2.0.0-release-prepare] ### What you expected to happen Run sql task with alert successful. ### How to reproduce [ERROR] 2021-11-11 14:31:19.462 org.apache.dolphinscheduler.server.worker.runner.TaskExecuteThread:[210] - task scheduler failure java.lang.NullPointerException: null at org.apache.dolphinscheduler.server.worker.runner.TaskExecuteThread.sendAlert(TaskExecuteThread.java:225) at org.apache.dolphinscheduler.server.worker.runner.TaskExecuteThread.run(TaskExecuteThread.java:196) at java.util.concurrent.Executors$RunnableAdapter.call(Executors.java:511) at java.util.concurrent.FutureTask.run(FutureTask.java:266) 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) at org.apache.dolphinscheduler.plugin.task.sql.SqlTask.sendAttachment(SqlTask:280); `private void sendAttachment(int groupId, String title, String content) {` ` setNeedAlert(Boolean.TRUE);` ` TaskAlertInfo taskAlertInfo = new TaskAlertInfo();` ` taskAlertInfo.setAlertGroupId(groupId);` ` taskAlertInfo.setContent(content);` ` taskAlertInfo.setTitle(title);` `}` Forget to setTaskAlertInfo? `private void sendAttachment(int groupId, String title, String content) {` ` setNeedAlert(Boolean.TRUE);` ` TaskAlertInfo taskAlertInfo = new TaskAlertInfo();` ` taskAlertInfo.setAlertGroupId(groupId);` ` taskAlertInfo.setContent(content);` ` taskAlertInfo.setTitle(title);` ` setTaskAlertInfo(taskAlertInfo);` `}` ### Anything else _No response_ ### Are you willing to submit PR? - [X] Yes I am willing to submit a PR! ### Code of Conduct - [X] I agree to follow this project's [Code of Conduct](https://www.apache.org/foundation/policies/conduct)
https://github.com/apache/dolphinscheduler/issues/6809
https://github.com/apache/dolphinscheduler/pull/7089
2ed3c0c3a76dd6ff631b0e63f6328d32fc1c81b3
463fc76bb7bf83d2826c680cc7531b102a7abe65
"2021-11-11T11:52:11Z"
java
"2021-12-01T06:08:40Z"
dolphinscheduler-task-plugin/dolphinscheduler-task-sql/src/main/java/org/apache/dolphinscheduler/plugin/task/sql/SqlTask.java
logger.debug("execute sql result : {}", result); return result; } /** * send alert as an attachment * * @param title title * @param content content */ private void sendAttachment(int groupId, String title, String content) { setNeedAlert(Boolean.TRUE); TaskAlertInfo taskAlertInfo = new TaskAlertInfo(); taskAlertInfo.setAlertGroupId(groupId); taskAlertInfo.setContent(content); taskAlertInfo.setTitle(title); } /** * pre sql * * @param connection connection * @param preStatementsBinds preStatementsBinds */ private void preSql(Connection connection, List<SqlBinds> preStatementsBinds) throws Exception { for (SqlBinds sqlBind : preStatementsBinds) { try (PreparedStatement pstmt = prepareStatementAndBind(connection, sqlBind)) { int result = pstmt.executeUpdate(); logger.info("pre statement execute result: {}, for sql: {}", result, sqlBind.getSql()); } }
closed
apache/dolphinscheduler
https://github.com/apache/dolphinscheduler
6,809
[Bug] [dolphinscheduler-task-sql] NullPointerException happened when send alert.
### Search before asking - [X] I had searched in the [issues](https://github.com/apache/dolphinscheduler/issues?q=is%3Aissue) and found no similar issues. ### What happened NullPointerException happened when run sql task. -[2.0.0-release-prepare] ### What you expected to happen Run sql task with alert successful. ### How to reproduce [ERROR] 2021-11-11 14:31:19.462 org.apache.dolphinscheduler.server.worker.runner.TaskExecuteThread:[210] - task scheduler failure java.lang.NullPointerException: null at org.apache.dolphinscheduler.server.worker.runner.TaskExecuteThread.sendAlert(TaskExecuteThread.java:225) at org.apache.dolphinscheduler.server.worker.runner.TaskExecuteThread.run(TaskExecuteThread.java:196) at java.util.concurrent.Executors$RunnableAdapter.call(Executors.java:511) at java.util.concurrent.FutureTask.run(FutureTask.java:266) 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) at org.apache.dolphinscheduler.plugin.task.sql.SqlTask.sendAttachment(SqlTask:280); `private void sendAttachment(int groupId, String title, String content) {` ` setNeedAlert(Boolean.TRUE);` ` TaskAlertInfo taskAlertInfo = new TaskAlertInfo();` ` taskAlertInfo.setAlertGroupId(groupId);` ` taskAlertInfo.setContent(content);` ` taskAlertInfo.setTitle(title);` `}` Forget to setTaskAlertInfo? `private void sendAttachment(int groupId, String title, String content) {` ` setNeedAlert(Boolean.TRUE);` ` TaskAlertInfo taskAlertInfo = new TaskAlertInfo();` ` taskAlertInfo.setAlertGroupId(groupId);` ` taskAlertInfo.setContent(content);` ` taskAlertInfo.setTitle(title);` ` setTaskAlertInfo(taskAlertInfo);` `}` ### Anything else _No response_ ### Are you willing to submit PR? - [X] Yes I am willing to submit a PR! ### Code of Conduct - [X] I agree to follow this project's [Code of Conduct](https://www.apache.org/foundation/policies/conduct)
https://github.com/apache/dolphinscheduler/issues/6809
https://github.com/apache/dolphinscheduler/pull/7089
2ed3c0c3a76dd6ff631b0e63f6328d32fc1c81b3
463fc76bb7bf83d2826c680cc7531b102a7abe65
"2021-11-11T11:52:11Z"
java
"2021-12-01T06:08:40Z"
dolphinscheduler-task-plugin/dolphinscheduler-task-sql/src/main/java/org/apache/dolphinscheduler/plugin/task/sql/SqlTask.java
} /** * post sql * * @param connection connection * @param postStatementsBinds postStatementsBinds */ private void postSql(Connection connection, List<SqlBinds> postStatementsBinds) throws Exception { for (SqlBinds sqlBind : postStatementsBinds) { try (PreparedStatement pstmt = prepareStatementAndBind(connection, sqlBind)) { int result = pstmt.executeUpdate(); logger.info("post statement execute result: {},for sql: {}", result, sqlBind.getSql()); } } } /** * create temp function * * @param connection connection * @param createFuncs createFuncs */ private void createTempFunction(Connection connection, List<String> createFuncs) throws Exception { try (Statement funcStmt = connection.createStatement()) { for (String createFunc : createFuncs) { logger.info("hive create function sql: {}", createFunc); funcStmt.execute(createFunc); } }
closed
apache/dolphinscheduler
https://github.com/apache/dolphinscheduler
6,809
[Bug] [dolphinscheduler-task-sql] NullPointerException happened when send alert.
### Search before asking - [X] I had searched in the [issues](https://github.com/apache/dolphinscheduler/issues?q=is%3Aissue) and found no similar issues. ### What happened NullPointerException happened when run sql task. -[2.0.0-release-prepare] ### What you expected to happen Run sql task with alert successful. ### How to reproduce [ERROR] 2021-11-11 14:31:19.462 org.apache.dolphinscheduler.server.worker.runner.TaskExecuteThread:[210] - task scheduler failure java.lang.NullPointerException: null at org.apache.dolphinscheduler.server.worker.runner.TaskExecuteThread.sendAlert(TaskExecuteThread.java:225) at org.apache.dolphinscheduler.server.worker.runner.TaskExecuteThread.run(TaskExecuteThread.java:196) at java.util.concurrent.Executors$RunnableAdapter.call(Executors.java:511) at java.util.concurrent.FutureTask.run(FutureTask.java:266) 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) at org.apache.dolphinscheduler.plugin.task.sql.SqlTask.sendAttachment(SqlTask:280); `private void sendAttachment(int groupId, String title, String content) {` ` setNeedAlert(Boolean.TRUE);` ` TaskAlertInfo taskAlertInfo = new TaskAlertInfo();` ` taskAlertInfo.setAlertGroupId(groupId);` ` taskAlertInfo.setContent(content);` ` taskAlertInfo.setTitle(title);` `}` Forget to setTaskAlertInfo? `private void sendAttachment(int groupId, String title, String content) {` ` setNeedAlert(Boolean.TRUE);` ` TaskAlertInfo taskAlertInfo = new TaskAlertInfo();` ` taskAlertInfo.setAlertGroupId(groupId);` ` taskAlertInfo.setContent(content);` ` taskAlertInfo.setTitle(title);` ` setTaskAlertInfo(taskAlertInfo);` `}` ### Anything else _No response_ ### Are you willing to submit PR? - [X] Yes I am willing to submit a PR! ### Code of Conduct - [X] I agree to follow this project's [Code of Conduct](https://www.apache.org/foundation/policies/conduct)
https://github.com/apache/dolphinscheduler/issues/6809
https://github.com/apache/dolphinscheduler/pull/7089
2ed3c0c3a76dd6ff631b0e63f6328d32fc1c81b3
463fc76bb7bf83d2826c680cc7531b102a7abe65
"2021-11-11T11:52:11Z"
java
"2021-12-01T06:08:40Z"
dolphinscheduler-task-plugin/dolphinscheduler-task-sql/src/main/java/org/apache/dolphinscheduler/plugin/task/sql/SqlTask.java
} /** * close jdbc resource * * @param resultSet resultSet * @param pstmt pstmt * @param connection connection */ private void close(ResultSet resultSet, PreparedStatement pstmt, Connection connection) { if (resultSet != null) { try { resultSet.close(); } catch (SQLException e) { logger.error("close result set error : {}", e.getMessage(), e); } } if (pstmt != null) { try { pstmt.close(); } catch (SQLException e) { logger.error("close prepared statement error : {}", e.getMessage(), e); } } if (connection != null) { try { connection.close(); } catch (SQLException e) { logger.error("close connection error : {}", e.getMessage(), e);
closed
apache/dolphinscheduler
https://github.com/apache/dolphinscheduler
6,809
[Bug] [dolphinscheduler-task-sql] NullPointerException happened when send alert.
### Search before asking - [X] I had searched in the [issues](https://github.com/apache/dolphinscheduler/issues?q=is%3Aissue) and found no similar issues. ### What happened NullPointerException happened when run sql task. -[2.0.0-release-prepare] ### What you expected to happen Run sql task with alert successful. ### How to reproduce [ERROR] 2021-11-11 14:31:19.462 org.apache.dolphinscheduler.server.worker.runner.TaskExecuteThread:[210] - task scheduler failure java.lang.NullPointerException: null at org.apache.dolphinscheduler.server.worker.runner.TaskExecuteThread.sendAlert(TaskExecuteThread.java:225) at org.apache.dolphinscheduler.server.worker.runner.TaskExecuteThread.run(TaskExecuteThread.java:196) at java.util.concurrent.Executors$RunnableAdapter.call(Executors.java:511) at java.util.concurrent.FutureTask.run(FutureTask.java:266) 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) at org.apache.dolphinscheduler.plugin.task.sql.SqlTask.sendAttachment(SqlTask:280); `private void sendAttachment(int groupId, String title, String content) {` ` setNeedAlert(Boolean.TRUE);` ` TaskAlertInfo taskAlertInfo = new TaskAlertInfo();` ` taskAlertInfo.setAlertGroupId(groupId);` ` taskAlertInfo.setContent(content);` ` taskAlertInfo.setTitle(title);` `}` Forget to setTaskAlertInfo? `private void sendAttachment(int groupId, String title, String content) {` ` setNeedAlert(Boolean.TRUE);` ` TaskAlertInfo taskAlertInfo = new TaskAlertInfo();` ` taskAlertInfo.setAlertGroupId(groupId);` ` taskAlertInfo.setContent(content);` ` taskAlertInfo.setTitle(title);` ` setTaskAlertInfo(taskAlertInfo);` `}` ### Anything else _No response_ ### Are you willing to submit PR? - [X] Yes I am willing to submit a PR! ### Code of Conduct - [X] I agree to follow this project's [Code of Conduct](https://www.apache.org/foundation/policies/conduct)
https://github.com/apache/dolphinscheduler/issues/6809
https://github.com/apache/dolphinscheduler/pull/7089
2ed3c0c3a76dd6ff631b0e63f6328d32fc1c81b3
463fc76bb7bf83d2826c680cc7531b102a7abe65
"2021-11-11T11:52:11Z"
java
"2021-12-01T06:08:40Z"
dolphinscheduler-task-plugin/dolphinscheduler-task-sql/src/main/java/org/apache/dolphinscheduler/plugin/task/sql/SqlTask.java
} } } /** * preparedStatement bind * * @param connection connection * @param sqlBinds sqlBinds * @return PreparedStatement * @throws Exception Exception */ private PreparedStatement prepareStatementAndBind(Connection connection, SqlBinds sqlBinds) { boolean timeoutFlag = taskExecutionContext.getTaskTimeoutStrategy() == TaskTimeoutStrategy.FAILED || taskExecutionContext.getTaskTimeoutStrategy() == TaskTimeoutStrategy.WARNFAILED; try { PreparedStatement stmt = connection.prepareStatement(sqlBinds.getSql()); if (timeoutFlag) { stmt.setQueryTimeout(taskExecutionContext.getTaskTimeout()); } Map<Integer, Property> params = sqlBinds.getParamsMap(); if (params != null) { for (Map.Entry<Integer, Property> entry : params.entrySet()) { Property prop = entry.getValue(); ParameterUtils.setInParameter(entry.getKey(), stmt, prop.getType(), prop.getValue()); } } logger.info("prepare statement replace sql : {} ", stmt); return stmt; } catch (Exception exception) {
closed
apache/dolphinscheduler
https://github.com/apache/dolphinscheduler
6,809
[Bug] [dolphinscheduler-task-sql] NullPointerException happened when send alert.
### Search before asking - [X] I had searched in the [issues](https://github.com/apache/dolphinscheduler/issues?q=is%3Aissue) and found no similar issues. ### What happened NullPointerException happened when run sql task. -[2.0.0-release-prepare] ### What you expected to happen Run sql task with alert successful. ### How to reproduce [ERROR] 2021-11-11 14:31:19.462 org.apache.dolphinscheduler.server.worker.runner.TaskExecuteThread:[210] - task scheduler failure java.lang.NullPointerException: null at org.apache.dolphinscheduler.server.worker.runner.TaskExecuteThread.sendAlert(TaskExecuteThread.java:225) at org.apache.dolphinscheduler.server.worker.runner.TaskExecuteThread.run(TaskExecuteThread.java:196) at java.util.concurrent.Executors$RunnableAdapter.call(Executors.java:511) at java.util.concurrent.FutureTask.run(FutureTask.java:266) 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) at org.apache.dolphinscheduler.plugin.task.sql.SqlTask.sendAttachment(SqlTask:280); `private void sendAttachment(int groupId, String title, String content) {` ` setNeedAlert(Boolean.TRUE);` ` TaskAlertInfo taskAlertInfo = new TaskAlertInfo();` ` taskAlertInfo.setAlertGroupId(groupId);` ` taskAlertInfo.setContent(content);` ` taskAlertInfo.setTitle(title);` `}` Forget to setTaskAlertInfo? `private void sendAttachment(int groupId, String title, String content) {` ` setNeedAlert(Boolean.TRUE);` ` TaskAlertInfo taskAlertInfo = new TaskAlertInfo();` ` taskAlertInfo.setAlertGroupId(groupId);` ` taskAlertInfo.setContent(content);` ` taskAlertInfo.setTitle(title);` ` setTaskAlertInfo(taskAlertInfo);` `}` ### Anything else _No response_ ### Are you willing to submit PR? - [X] Yes I am willing to submit a PR! ### Code of Conduct - [X] I agree to follow this project's [Code of Conduct](https://www.apache.org/foundation/policies/conduct)
https://github.com/apache/dolphinscheduler/issues/6809
https://github.com/apache/dolphinscheduler/pull/7089
2ed3c0c3a76dd6ff631b0e63f6328d32fc1c81b3
463fc76bb7bf83d2826c680cc7531b102a7abe65
"2021-11-11T11:52:11Z"
java
"2021-12-01T06:08:40Z"
dolphinscheduler-task-plugin/dolphinscheduler-task-sql/src/main/java/org/apache/dolphinscheduler/plugin/task/sql/SqlTask.java
throw new TaskException("SQL task prepareStatementAndBind error", exception); } } /** * regular expressions match the contents between two specified strings * * @param content content * @param rgex rgex * @param sqlParamsMap sql params map * @param paramsPropsMap params props map */ public void setSqlParamsMap(String content, String rgex, Map<Integer, Property> sqlParamsMap, Map<String, Property> paramsPropsMap) { Pattern pattern = Pattern.compile(rgex); Matcher m = pattern.matcher(content); int index = 1; while (m.find()) { String paramName = m.group(1); Property prop = paramsPropsMap.get(paramName); if (prop == null) { logger.error("setSqlParamsMap: No Property with paramName: {} is found in paramsPropsMap of task instance" + " with id: {}. So couldn't put Property in sqlParamsMap.", paramName, taskExecutionContext.getTaskInstanceId()); } else { sqlParamsMap.put(index, prop); index++; logger.info("setSqlParamsMap: Property with paramName: {} put in sqlParamsMap of content {} successfully.", paramName, content); } } } /** * print replace sql
closed
apache/dolphinscheduler
https://github.com/apache/dolphinscheduler
6,809
[Bug] [dolphinscheduler-task-sql] NullPointerException happened when send alert.
### Search before asking - [X] I had searched in the [issues](https://github.com/apache/dolphinscheduler/issues?q=is%3Aissue) and found no similar issues. ### What happened NullPointerException happened when run sql task. -[2.0.0-release-prepare] ### What you expected to happen Run sql task with alert successful. ### How to reproduce [ERROR] 2021-11-11 14:31:19.462 org.apache.dolphinscheduler.server.worker.runner.TaskExecuteThread:[210] - task scheduler failure java.lang.NullPointerException: null at org.apache.dolphinscheduler.server.worker.runner.TaskExecuteThread.sendAlert(TaskExecuteThread.java:225) at org.apache.dolphinscheduler.server.worker.runner.TaskExecuteThread.run(TaskExecuteThread.java:196) at java.util.concurrent.Executors$RunnableAdapter.call(Executors.java:511) at java.util.concurrent.FutureTask.run(FutureTask.java:266) 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) at org.apache.dolphinscheduler.plugin.task.sql.SqlTask.sendAttachment(SqlTask:280); `private void sendAttachment(int groupId, String title, String content) {` ` setNeedAlert(Boolean.TRUE);` ` TaskAlertInfo taskAlertInfo = new TaskAlertInfo();` ` taskAlertInfo.setAlertGroupId(groupId);` ` taskAlertInfo.setContent(content);` ` taskAlertInfo.setTitle(title);` `}` Forget to setTaskAlertInfo? `private void sendAttachment(int groupId, String title, String content) {` ` setNeedAlert(Boolean.TRUE);` ` TaskAlertInfo taskAlertInfo = new TaskAlertInfo();` ` taskAlertInfo.setAlertGroupId(groupId);` ` taskAlertInfo.setContent(content);` ` taskAlertInfo.setTitle(title);` ` setTaskAlertInfo(taskAlertInfo);` `}` ### Anything else _No response_ ### Are you willing to submit PR? - [X] Yes I am willing to submit a PR! ### Code of Conduct - [X] I agree to follow this project's [Code of Conduct](https://www.apache.org/foundation/policies/conduct)
https://github.com/apache/dolphinscheduler/issues/6809
https://github.com/apache/dolphinscheduler/pull/7089
2ed3c0c3a76dd6ff631b0e63f6328d32fc1c81b3
463fc76bb7bf83d2826c680cc7531b102a7abe65
"2021-11-11T11:52:11Z"
java
"2021-12-01T06:08:40Z"
dolphinscheduler-task-plugin/dolphinscheduler-task-sql/src/main/java/org/apache/dolphinscheduler/plugin/task/sql/SqlTask.java
* * @param content content * @param formatSql format sql * @param rgex rgex * @param sqlParamsMap sql params map */ private void printReplacedSql(String content, String formatSql, String rgex, Map<Integer, Property> sqlParamsMap) { logger.info("after replace sql , preparing : {}", formatSql); StringBuilder logPrint = new StringBuilder("replaced sql , parameters:"); if (sqlParamsMap == null) { logger.info("printReplacedSql: sqlParamsMap is null."); } else { for (int i = 1; i <= sqlParamsMap.size(); i++) { logPrint.append(sqlParamsMap.get(i).getValue()).append("(").append(sqlParamsMap.get(i).getType()).append(")"); } } logger.info("Sql Params are {}", logPrint); } /** * ready to execute SQL and parameter entity Map * * @return SqlBinds */ private SqlBinds getSqlAndSqlParamsMap(String sql) { Map<Integer, Property> sqlParamsMap = new HashMap<>(); StringBuilder sqlBuilder = new StringBuilder(); Map<String, Property> paramsMap = ParamUtils.convert(taskExecutionContext, getParameters());
closed
apache/dolphinscheduler
https://github.com/apache/dolphinscheduler
6,809
[Bug] [dolphinscheduler-task-sql] NullPointerException happened when send alert.
### Search before asking - [X] I had searched in the [issues](https://github.com/apache/dolphinscheduler/issues?q=is%3Aissue) and found no similar issues. ### What happened NullPointerException happened when run sql task. -[2.0.0-release-prepare] ### What you expected to happen Run sql task with alert successful. ### How to reproduce [ERROR] 2021-11-11 14:31:19.462 org.apache.dolphinscheduler.server.worker.runner.TaskExecuteThread:[210] - task scheduler failure java.lang.NullPointerException: null at org.apache.dolphinscheduler.server.worker.runner.TaskExecuteThread.sendAlert(TaskExecuteThread.java:225) at org.apache.dolphinscheduler.server.worker.runner.TaskExecuteThread.run(TaskExecuteThread.java:196) at java.util.concurrent.Executors$RunnableAdapter.call(Executors.java:511) at java.util.concurrent.FutureTask.run(FutureTask.java:266) 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) at org.apache.dolphinscheduler.plugin.task.sql.SqlTask.sendAttachment(SqlTask:280); `private void sendAttachment(int groupId, String title, String content) {` ` setNeedAlert(Boolean.TRUE);` ` TaskAlertInfo taskAlertInfo = new TaskAlertInfo();` ` taskAlertInfo.setAlertGroupId(groupId);` ` taskAlertInfo.setContent(content);` ` taskAlertInfo.setTitle(title);` `}` Forget to setTaskAlertInfo? `private void sendAttachment(int groupId, String title, String content) {` ` setNeedAlert(Boolean.TRUE);` ` TaskAlertInfo taskAlertInfo = new TaskAlertInfo();` ` taskAlertInfo.setAlertGroupId(groupId);` ` taskAlertInfo.setContent(content);` ` taskAlertInfo.setTitle(title);` ` setTaskAlertInfo(taskAlertInfo);` `}` ### Anything else _No response_ ### Are you willing to submit PR? - [X] Yes I am willing to submit a PR! ### Code of Conduct - [X] I agree to follow this project's [Code of Conduct](https://www.apache.org/foundation/policies/conduct)
https://github.com/apache/dolphinscheduler/issues/6809
https://github.com/apache/dolphinscheduler/pull/7089
2ed3c0c3a76dd6ff631b0e63f6328d32fc1c81b3
463fc76bb7bf83d2826c680cc7531b102a7abe65
"2021-11-11T11:52:11Z"
java
"2021-12-01T06:08:40Z"
dolphinscheduler-task-plugin/dolphinscheduler-task-sql/src/main/java/org/apache/dolphinscheduler/plugin/task/sql/SqlTask.java
if (paramsMap == null) { sqlBuilder.append(sql); return new SqlBinds(sqlBuilder.toString(), sqlParamsMap); } if (StringUtils.isNotEmpty(sqlParameters.getTitle())) { String title = ParameterUtils.convertParameterPlaceholders(sqlParameters.getTitle(), ParamUtils.convert(paramsMap)); logger.info("SQL title : {}", title); sqlParameters.setTitle(title); } sql = ParameterUtils.replaceScheduleTime(sql, taskExecutionContext.getScheduleTime()); String rgex = "['\"]*\\$\\{(.*?)\\}['\"]*"; setSqlParamsMap(sql, rgex, sqlParamsMap, paramsMap); String rgexo = "['\"]*\\!\\{(.*?)\\}['\"]*"; sql = replaceOriginalValue(sql, rgexo, paramsMap); // r String formatSql = sql.replaceAll(rgex, "?"); sqlBuilder.append(formatSql); // p printReplacedSql(sql, formatSql, rgex, sqlParamsMap); return new SqlBinds(sqlBuilder.toString(), sqlParamsMap); } private String replaceOriginalValue(String content, String rgex, Map<String, Property> sqlParamsMap) { Pattern pattern = Pattern.compile(rgex); while (true) { Matcher m = pattern.matcher(content);
closed
apache/dolphinscheduler
https://github.com/apache/dolphinscheduler
6,809
[Bug] [dolphinscheduler-task-sql] NullPointerException happened when send alert.
### Search before asking - [X] I had searched in the [issues](https://github.com/apache/dolphinscheduler/issues?q=is%3Aissue) and found no similar issues. ### What happened NullPointerException happened when run sql task. -[2.0.0-release-prepare] ### What you expected to happen Run sql task with alert successful. ### How to reproduce [ERROR] 2021-11-11 14:31:19.462 org.apache.dolphinscheduler.server.worker.runner.TaskExecuteThread:[210] - task scheduler failure java.lang.NullPointerException: null at org.apache.dolphinscheduler.server.worker.runner.TaskExecuteThread.sendAlert(TaskExecuteThread.java:225) at org.apache.dolphinscheduler.server.worker.runner.TaskExecuteThread.run(TaskExecuteThread.java:196) at java.util.concurrent.Executors$RunnableAdapter.call(Executors.java:511) at java.util.concurrent.FutureTask.run(FutureTask.java:266) 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) at org.apache.dolphinscheduler.plugin.task.sql.SqlTask.sendAttachment(SqlTask:280); `private void sendAttachment(int groupId, String title, String content) {` ` setNeedAlert(Boolean.TRUE);` ` TaskAlertInfo taskAlertInfo = new TaskAlertInfo();` ` taskAlertInfo.setAlertGroupId(groupId);` ` taskAlertInfo.setContent(content);` ` taskAlertInfo.setTitle(title);` `}` Forget to setTaskAlertInfo? `private void sendAttachment(int groupId, String title, String content) {` ` setNeedAlert(Boolean.TRUE);` ` TaskAlertInfo taskAlertInfo = new TaskAlertInfo();` ` taskAlertInfo.setAlertGroupId(groupId);` ` taskAlertInfo.setContent(content);` ` taskAlertInfo.setTitle(title);` ` setTaskAlertInfo(taskAlertInfo);` `}` ### Anything else _No response_ ### Are you willing to submit PR? - [X] Yes I am willing to submit a PR! ### Code of Conduct - [X] I agree to follow this project's [Code of Conduct](https://www.apache.org/foundation/policies/conduct)
https://github.com/apache/dolphinscheduler/issues/6809
https://github.com/apache/dolphinscheduler/pull/7089
2ed3c0c3a76dd6ff631b0e63f6328d32fc1c81b3
463fc76bb7bf83d2826c680cc7531b102a7abe65
"2021-11-11T11:52:11Z"
java
"2021-12-01T06:08:40Z"
dolphinscheduler-task-plugin/dolphinscheduler-task-sql/src/main/java/org/apache/dolphinscheduler/plugin/task/sql/SqlTask.java
if (!m.find()) { break; } String paramName = m.group(1); String paramValue = sqlParamsMap.get(paramName).getValue(); content = m.replaceFirst(paramValue); } return content; } /** * create function list * * @param udfFuncTenantCodeMap key is udf function,value is tenant code * @param logger logger * @return create function list */ public static List<String> createFuncs(Map<UdfFuncRequest, String> udfFuncTenantCodeMap, String defaultFS, Logger logger) { if (MapUtils.isEmpty(udfFuncTenantCodeMap)) { logger.info("can't find udf function resource"); return null; } List<String> funcList = new ArrayList<>(); // b buildJarSql(funcList, udfFuncTenantCodeMap, defaultFS); // b buildTempFuncSql(funcList, new ArrayList<>(udfFuncTenantCodeMap.keySet())); return funcList; } /** * b
closed
apache/dolphinscheduler
https://github.com/apache/dolphinscheduler
6,809
[Bug] [dolphinscheduler-task-sql] NullPointerException happened when send alert.
### Search before asking - [X] I had searched in the [issues](https://github.com/apache/dolphinscheduler/issues?q=is%3Aissue) and found no similar issues. ### What happened NullPointerException happened when run sql task. -[2.0.0-release-prepare] ### What you expected to happen Run sql task with alert successful. ### How to reproduce [ERROR] 2021-11-11 14:31:19.462 org.apache.dolphinscheduler.server.worker.runner.TaskExecuteThread:[210] - task scheduler failure java.lang.NullPointerException: null at org.apache.dolphinscheduler.server.worker.runner.TaskExecuteThread.sendAlert(TaskExecuteThread.java:225) at org.apache.dolphinscheduler.server.worker.runner.TaskExecuteThread.run(TaskExecuteThread.java:196) at java.util.concurrent.Executors$RunnableAdapter.call(Executors.java:511) at java.util.concurrent.FutureTask.run(FutureTask.java:266) 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) at org.apache.dolphinscheduler.plugin.task.sql.SqlTask.sendAttachment(SqlTask:280); `private void sendAttachment(int groupId, String title, String content) {` ` setNeedAlert(Boolean.TRUE);` ` TaskAlertInfo taskAlertInfo = new TaskAlertInfo();` ` taskAlertInfo.setAlertGroupId(groupId);` ` taskAlertInfo.setContent(content);` ` taskAlertInfo.setTitle(title);` `}` Forget to setTaskAlertInfo? `private void sendAttachment(int groupId, String title, String content) {` ` setNeedAlert(Boolean.TRUE);` ` TaskAlertInfo taskAlertInfo = new TaskAlertInfo();` ` taskAlertInfo.setAlertGroupId(groupId);` ` taskAlertInfo.setContent(content);` ` taskAlertInfo.setTitle(title);` ` setTaskAlertInfo(taskAlertInfo);` `}` ### Anything else _No response_ ### Are you willing to submit PR? - [X] Yes I am willing to submit a PR! ### Code of Conduct - [X] I agree to follow this project's [Code of Conduct](https://www.apache.org/foundation/policies/conduct)
https://github.com/apache/dolphinscheduler/issues/6809
https://github.com/apache/dolphinscheduler/pull/7089
2ed3c0c3a76dd6ff631b0e63f6328d32fc1c81b3
463fc76bb7bf83d2826c680cc7531b102a7abe65
"2021-11-11T11:52:11Z"
java
"2021-12-01T06:08:40Z"
dolphinscheduler-task-plugin/dolphinscheduler-task-sql/src/main/java/org/apache/dolphinscheduler/plugin/task/sql/SqlTask.java
* * @param sqls sql list * @param udfFuncRequests udf function list */ private static void buildTempFuncSql(List<String> sqls, List<UdfFuncRequest> udfFuncRequests) { if (CollectionUtils.isNotEmpty(udfFuncRequests)) { for (UdfFuncRequest udfFuncRequest : udfFuncRequests) { sqls.add(MessageFormat .format(CREATE_FUNCTION_FORMAT, udfFuncRequest.getFuncName(), udfFuncRequest.getClassName())); } } } /** * b * @param sqls sql list * @param udfFuncTenantCodeMap key is udf function,value is tenant code */ private static void buildJarSql(List<String> sqls, Map<UdfFuncRequest,String> udfFuncTenantCodeMap, String defaultFS) { String resourceFullName; Set<Entry<UdfFuncRequest, String>> entries = udfFuncTenantCodeMap.entrySet(); for (Map.Entry<UdfFuncRequest, String> entry : entries) { String prefixPath = defaultFS.startsWith("file://") ? "file://" : defaultFS; String uploadPath = CommonUtils.getHdfsUdfDir(entry.getValue()); resourceFullName = entry.getKey().getResourceName(); resourceFullName = resourceFullName.startsWith("/") ? resourceFullName : String.format("/%s", resourceFullName); sqls.add(String.format("add jar %s%s%s", prefixPath, uploadPath, resourceFullName)); } } }
closed
apache/dolphinscheduler
https://github.com/apache/dolphinscheduler
7,070
[Bug] [dolphinscheduler-api] Create or edit a workflow definition, check the timeoutNotifyStrategy, the timeoutNotifyStrategy is null in the database
### Search before asking - [X] I had searched in the [issues](https://github.com/apache/dolphinscheduler/issues?q=is%3Aissue) and found no similar issues. ### What happened Create or edit a workflow definition, check the timeoutNotifyStrategy, the timeoutNotifyStrategy is null in the database ![image](https://user-images.githubusercontent.com/95271106/144008124-e24a57e3-59d6-40e6-b019-f9beeac8b2ed.png) ![image](https://user-images.githubusercontent.com/95271106/144007568-57b371e1-24cf-4694-8378-9529fb6351d8.png) ![image](https://user-images.githubusercontent.com/95271106/144007567-6fd24e2e-bb34-4e69-a71a-240c789d2294.png) ### What you expected to happen The timeoutNotifyStrategywas not written to the database when saving the workflow definition ### How to reproduce When saving the workflow definition, write the timeoutNotifyStrategywas to the database ### Anything else _No response_ ### Version 2.0.0 ### Are you willing to submit PR? - [ ] Yes I am willing to submit a PR! ### Code of Conduct - [X] I agree to follow this project's [Code of Conduct](https://www.apache.org/foundation/policies/conduct)
https://github.com/apache/dolphinscheduler/issues/7070
https://github.com/apache/dolphinscheduler/pull/7107
173a3856185abc0fa9be16715d2567ebbe054a6f
d7eb7453e555309bf060809e6f6c61232be469cd
"2021-11-30T07:58:35Z"
java
"2021-12-01T13:03:49Z"
dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/entity/TaskDefinition.java
/* * Licensed to the Apache Software Foundation (ASF) under one or more * contributor license agreements. See the NOTICE file distributed with * this work for additional information regarding copyright ownership. * The ASF licenses this file to You under the Apache License, Version 2.0 * (the "License"); you may not use this file except in compliance with * the License. You may obtain a copy of the License at * * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS,
closed
apache/dolphinscheduler
https://github.com/apache/dolphinscheduler
7,070
[Bug] [dolphinscheduler-api] Create or edit a workflow definition, check the timeoutNotifyStrategy, the timeoutNotifyStrategy is null in the database
### Search before asking - [X] I had searched in the [issues](https://github.com/apache/dolphinscheduler/issues?q=is%3Aissue) and found no similar issues. ### What happened Create or edit a workflow definition, check the timeoutNotifyStrategy, the timeoutNotifyStrategy is null in the database ![image](https://user-images.githubusercontent.com/95271106/144008124-e24a57e3-59d6-40e6-b019-f9beeac8b2ed.png) ![image](https://user-images.githubusercontent.com/95271106/144007568-57b371e1-24cf-4694-8378-9529fb6351d8.png) ![image](https://user-images.githubusercontent.com/95271106/144007567-6fd24e2e-bb34-4e69-a71a-240c789d2294.png) ### What you expected to happen The timeoutNotifyStrategywas not written to the database when saving the workflow definition ### How to reproduce When saving the workflow definition, write the timeoutNotifyStrategywas to the database ### Anything else _No response_ ### Version 2.0.0 ### Are you willing to submit PR? - [ ] Yes I am willing to submit a PR! ### Code of Conduct - [X] I agree to follow this project's [Code of Conduct](https://www.apache.org/foundation/policies/conduct)
https://github.com/apache/dolphinscheduler/issues/7070
https://github.com/apache/dolphinscheduler/pull/7107
173a3856185abc0fa9be16715d2567ebbe054a6f
d7eb7453e555309bf060809e6f6c61232be469cd
"2021-11-30T07:58:35Z"
java
"2021-12-01T13:03:49Z"
dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/entity/TaskDefinition.java
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. * See the License for the specific language governing permissions and * limitations under the License. */ package org.apache.dolphinscheduler.dao.entity; import org.apache.dolphinscheduler.common.Constants; import org.apache.dolphinscheduler.common.enums.Flag; import org.apache.dolphinscheduler.common.enums.Priority; import org.apache.dolphinscheduler.common.enums.TaskTimeoutStrategy; import org.apache.dolphinscheduler.common.enums.TimeoutFlag; import org.apache.dolphinscheduler.common.process.Property; import org.apache.dolphinscheduler.common.utils.JSONUtils; import org.apache.commons.lang.StringUtils; import java.util.Date; import java.util.List; import java.util.Map; import java.util.Objects; import java.util.stream.Collectors; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import com.fasterxml.jackson.annotation.JsonFormat; import com.fasterxml.jackson.databind.JsonNode; import com.fasterxml.jackson.databind.annotation.JsonDeserialize; import com.fasterxml.jackson.databind.annotation.JsonSerialize; /** * task definition */ @TableName("t_ds_task_definition")
closed
apache/dolphinscheduler
https://github.com/apache/dolphinscheduler
7,070
[Bug] [dolphinscheduler-api] Create or edit a workflow definition, check the timeoutNotifyStrategy, the timeoutNotifyStrategy is null in the database
### Search before asking - [X] I had searched in the [issues](https://github.com/apache/dolphinscheduler/issues?q=is%3Aissue) and found no similar issues. ### What happened Create or edit a workflow definition, check the timeoutNotifyStrategy, the timeoutNotifyStrategy is null in the database ![image](https://user-images.githubusercontent.com/95271106/144008124-e24a57e3-59d6-40e6-b019-f9beeac8b2ed.png) ![image](https://user-images.githubusercontent.com/95271106/144007568-57b371e1-24cf-4694-8378-9529fb6351d8.png) ![image](https://user-images.githubusercontent.com/95271106/144007567-6fd24e2e-bb34-4e69-a71a-240c789d2294.png) ### What you expected to happen The timeoutNotifyStrategywas not written to the database when saving the workflow definition ### How to reproduce When saving the workflow definition, write the timeoutNotifyStrategywas to the database ### Anything else _No response_ ### Version 2.0.0 ### Are you willing to submit PR? - [ ] Yes I am willing to submit a PR! ### Code of Conduct - [X] I agree to follow this project's [Code of Conduct](https://www.apache.org/foundation/policies/conduct)
https://github.com/apache/dolphinscheduler/issues/7070
https://github.com/apache/dolphinscheduler/pull/7107
173a3856185abc0fa9be16715d2567ebbe054a6f
d7eb7453e555309bf060809e6f6c61232be469cd
"2021-11-30T07:58:35Z"
java
"2021-12-01T13:03:49Z"
dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/entity/TaskDefinition.java
public class TaskDefinition { /** * id */ @TableId(value = "id", type = IdType.AUTO) private int id; /** * code */ private long code; /** * name */ private String name; /** * version */ private int version; /** * description */ private String description; /** * project code */ private long projectCode;
closed
apache/dolphinscheduler
https://github.com/apache/dolphinscheduler
7,070
[Bug] [dolphinscheduler-api] Create or edit a workflow definition, check the timeoutNotifyStrategy, the timeoutNotifyStrategy is null in the database
### Search before asking - [X] I had searched in the [issues](https://github.com/apache/dolphinscheduler/issues?q=is%3Aissue) and found no similar issues. ### What happened Create or edit a workflow definition, check the timeoutNotifyStrategy, the timeoutNotifyStrategy is null in the database ![image](https://user-images.githubusercontent.com/95271106/144008124-e24a57e3-59d6-40e6-b019-f9beeac8b2ed.png) ![image](https://user-images.githubusercontent.com/95271106/144007568-57b371e1-24cf-4694-8378-9529fb6351d8.png) ![image](https://user-images.githubusercontent.com/95271106/144007567-6fd24e2e-bb34-4e69-a71a-240c789d2294.png) ### What you expected to happen The timeoutNotifyStrategywas not written to the database when saving the workflow definition ### How to reproduce When saving the workflow definition, write the timeoutNotifyStrategywas to the database ### Anything else _No response_ ### Version 2.0.0 ### Are you willing to submit PR? - [ ] Yes I am willing to submit a PR! ### Code of Conduct - [X] I agree to follow this project's [Code of Conduct](https://www.apache.org/foundation/policies/conduct)
https://github.com/apache/dolphinscheduler/issues/7070
https://github.com/apache/dolphinscheduler/pull/7107
173a3856185abc0fa9be16715d2567ebbe054a6f
d7eb7453e555309bf060809e6f6c61232be469cd
"2021-11-30T07:58:35Z"
java
"2021-12-01T13:03:49Z"
dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/entity/TaskDefinition.java
/** * task user id */ private int userId; /** * task type */ private String taskType; /** * user defined parameters */ @JsonDeserialize(using = JSONUtils.JsonDataDeserializer.class) @JsonSerialize(using = JSONUtils.JsonDataSerializer.class) private String taskParams; /** * user defined parameter list */ @TableField(exist = false) private List<Property> taskParamList; /** * user define parameter map */ @TableField(exist = false) private Map<String, String> taskParamMap; /** * task is valid: yes/no */ private Flag flag; /** * task priority
closed
apache/dolphinscheduler
https://github.com/apache/dolphinscheduler
7,070
[Bug] [dolphinscheduler-api] Create or edit a workflow definition, check the timeoutNotifyStrategy, the timeoutNotifyStrategy is null in the database
### Search before asking - [X] I had searched in the [issues](https://github.com/apache/dolphinscheduler/issues?q=is%3Aissue) and found no similar issues. ### What happened Create or edit a workflow definition, check the timeoutNotifyStrategy, the timeoutNotifyStrategy is null in the database ![image](https://user-images.githubusercontent.com/95271106/144008124-e24a57e3-59d6-40e6-b019-f9beeac8b2ed.png) ![image](https://user-images.githubusercontent.com/95271106/144007568-57b371e1-24cf-4694-8378-9529fb6351d8.png) ![image](https://user-images.githubusercontent.com/95271106/144007567-6fd24e2e-bb34-4e69-a71a-240c789d2294.png) ### What you expected to happen The timeoutNotifyStrategywas not written to the database when saving the workflow definition ### How to reproduce When saving the workflow definition, write the timeoutNotifyStrategywas to the database ### Anything else _No response_ ### Version 2.0.0 ### Are you willing to submit PR? - [ ] Yes I am willing to submit a PR! ### Code of Conduct - [X] I agree to follow this project's [Code of Conduct](https://www.apache.org/foundation/policies/conduct)
https://github.com/apache/dolphinscheduler/issues/7070
https://github.com/apache/dolphinscheduler/pull/7107
173a3856185abc0fa9be16715d2567ebbe054a6f
d7eb7453e555309bf060809e6f6c61232be469cd
"2021-11-30T07:58:35Z"
java
"2021-12-01T13:03:49Z"
dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/entity/TaskDefinition.java
*/ private Priority taskPriority; /** * user name */ @TableField(exist = false) private String userName; /** * project name */ @TableField(exist = false) private String projectName; /** * worker group */ private String workerGroup; /** * environment code */ private long environmentCode; /** * fail retry times */ private int failRetryTimes; /** * fail retry interval */ private int failRetryInterval; /** * timeout flag
closed
apache/dolphinscheduler
https://github.com/apache/dolphinscheduler
7,070
[Bug] [dolphinscheduler-api] Create or edit a workflow definition, check the timeoutNotifyStrategy, the timeoutNotifyStrategy is null in the database
### Search before asking - [X] I had searched in the [issues](https://github.com/apache/dolphinscheduler/issues?q=is%3Aissue) and found no similar issues. ### What happened Create or edit a workflow definition, check the timeoutNotifyStrategy, the timeoutNotifyStrategy is null in the database ![image](https://user-images.githubusercontent.com/95271106/144008124-e24a57e3-59d6-40e6-b019-f9beeac8b2ed.png) ![image](https://user-images.githubusercontent.com/95271106/144007568-57b371e1-24cf-4694-8378-9529fb6351d8.png) ![image](https://user-images.githubusercontent.com/95271106/144007567-6fd24e2e-bb34-4e69-a71a-240c789d2294.png) ### What you expected to happen The timeoutNotifyStrategywas not written to the database when saving the workflow definition ### How to reproduce When saving the workflow definition, write the timeoutNotifyStrategywas to the database ### Anything else _No response_ ### Version 2.0.0 ### Are you willing to submit PR? - [ ] Yes I am willing to submit a PR! ### Code of Conduct - [X] I agree to follow this project's [Code of Conduct](https://www.apache.org/foundation/policies/conduct)
https://github.com/apache/dolphinscheduler/issues/7070
https://github.com/apache/dolphinscheduler/pull/7107
173a3856185abc0fa9be16715d2567ebbe054a6f
d7eb7453e555309bf060809e6f6c61232be469cd
"2021-11-30T07:58:35Z"
java
"2021-12-01T13:03:49Z"
dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/entity/TaskDefinition.java
*/ private TimeoutFlag timeoutFlag; /** * timeout notify strategy */ private TaskTimeoutStrategy timeoutNotifyStrategy; /** * task warning time out. unit: minute */ private int timeout; /** * delay execution time. */ private int delayTime; /** * resource ids */ private String resourceIds; /** * create time */ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") private Date createTime; /** * update time */ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") private Date updateTime; /** * modify user name
closed
apache/dolphinscheduler
https://github.com/apache/dolphinscheduler
7,070
[Bug] [dolphinscheduler-api] Create or edit a workflow definition, check the timeoutNotifyStrategy, the timeoutNotifyStrategy is null in the database
### Search before asking - [X] I had searched in the [issues](https://github.com/apache/dolphinscheduler/issues?q=is%3Aissue) and found no similar issues. ### What happened Create or edit a workflow definition, check the timeoutNotifyStrategy, the timeoutNotifyStrategy is null in the database ![image](https://user-images.githubusercontent.com/95271106/144008124-e24a57e3-59d6-40e6-b019-f9beeac8b2ed.png) ![image](https://user-images.githubusercontent.com/95271106/144007568-57b371e1-24cf-4694-8378-9529fb6351d8.png) ![image](https://user-images.githubusercontent.com/95271106/144007567-6fd24e2e-bb34-4e69-a71a-240c789d2294.png) ### What you expected to happen The timeoutNotifyStrategywas not written to the database when saving the workflow definition ### How to reproduce When saving the workflow definition, write the timeoutNotifyStrategywas to the database ### Anything else _No response_ ### Version 2.0.0 ### Are you willing to submit PR? - [ ] Yes I am willing to submit a PR! ### Code of Conduct - [X] I agree to follow this project's [Code of Conduct](https://www.apache.org/foundation/policies/conduct)
https://github.com/apache/dolphinscheduler/issues/7070
https://github.com/apache/dolphinscheduler/pull/7107
173a3856185abc0fa9be16715d2567ebbe054a6f
d7eb7453e555309bf060809e6f6c61232be469cd
"2021-11-30T07:58:35Z"
java
"2021-12-01T13:03:49Z"
dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/entity/TaskDefinition.java
*/ @TableField(exist = false) private String modifyBy; public TaskDefinition() { } public TaskDefinition(long code, int version) { this.code = code; this.version = version; } public String getName() { return name; } public void setName(String name) { this.name = name; } public int getId() { return id; } public void setId(int id) { this.id = id; } public Date getCreateTime() { return createTime; } public void setCreateTime(Date createTime) { this.createTime = createTime; } public Date getUpdateTime() { return updateTime; }
closed
apache/dolphinscheduler
https://github.com/apache/dolphinscheduler
7,070
[Bug] [dolphinscheduler-api] Create or edit a workflow definition, check the timeoutNotifyStrategy, the timeoutNotifyStrategy is null in the database
### Search before asking - [X] I had searched in the [issues](https://github.com/apache/dolphinscheduler/issues?q=is%3Aissue) and found no similar issues. ### What happened Create or edit a workflow definition, check the timeoutNotifyStrategy, the timeoutNotifyStrategy is null in the database ![image](https://user-images.githubusercontent.com/95271106/144008124-e24a57e3-59d6-40e6-b019-f9beeac8b2ed.png) ![image](https://user-images.githubusercontent.com/95271106/144007568-57b371e1-24cf-4694-8378-9529fb6351d8.png) ![image](https://user-images.githubusercontent.com/95271106/144007567-6fd24e2e-bb34-4e69-a71a-240c789d2294.png) ### What you expected to happen The timeoutNotifyStrategywas not written to the database when saving the workflow definition ### How to reproduce When saving the workflow definition, write the timeoutNotifyStrategywas to the database ### Anything else _No response_ ### Version 2.0.0 ### Are you willing to submit PR? - [ ] Yes I am willing to submit a PR! ### Code of Conduct - [X] I agree to follow this project's [Code of Conduct](https://www.apache.org/foundation/policies/conduct)
https://github.com/apache/dolphinscheduler/issues/7070
https://github.com/apache/dolphinscheduler/pull/7107
173a3856185abc0fa9be16715d2567ebbe054a6f
d7eb7453e555309bf060809e6f6c61232be469cd
"2021-11-30T07:58:35Z"
java
"2021-12-01T13:03:49Z"
dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/entity/TaskDefinition.java
public void setUpdateTime(Date updateTime) { this.updateTime = updateTime; } public Flag getFlag() { return flag; } public void setFlag(Flag flag) { this.flag = flag; } public int getUserId() { return userId; } public void setUserId(int userId) { this.userId = userId; } public String getUserName() { return userName; } public void setUserName(String userName) { this.userName = userName; } public String getProjectName() { return projectName; } public void setProjectName(String projectName) { this.projectName = projectName; } public String getTaskParams() { return taskParams; }
closed
apache/dolphinscheduler
https://github.com/apache/dolphinscheduler
7,070
[Bug] [dolphinscheduler-api] Create or edit a workflow definition, check the timeoutNotifyStrategy, the timeoutNotifyStrategy is null in the database
### Search before asking - [X] I had searched in the [issues](https://github.com/apache/dolphinscheduler/issues?q=is%3Aissue) and found no similar issues. ### What happened Create or edit a workflow definition, check the timeoutNotifyStrategy, the timeoutNotifyStrategy is null in the database ![image](https://user-images.githubusercontent.com/95271106/144008124-e24a57e3-59d6-40e6-b019-f9beeac8b2ed.png) ![image](https://user-images.githubusercontent.com/95271106/144007568-57b371e1-24cf-4694-8378-9529fb6351d8.png) ![image](https://user-images.githubusercontent.com/95271106/144007567-6fd24e2e-bb34-4e69-a71a-240c789d2294.png) ### What you expected to happen The timeoutNotifyStrategywas not written to the database when saving the workflow definition ### How to reproduce When saving the workflow definition, write the timeoutNotifyStrategywas to the database ### Anything else _No response_ ### Version 2.0.0 ### Are you willing to submit PR? - [ ] Yes I am willing to submit a PR! ### Code of Conduct - [X] I agree to follow this project's [Code of Conduct](https://www.apache.org/foundation/policies/conduct)
https://github.com/apache/dolphinscheduler/issues/7070
https://github.com/apache/dolphinscheduler/pull/7107
173a3856185abc0fa9be16715d2567ebbe054a6f
d7eb7453e555309bf060809e6f6c61232be469cd
"2021-11-30T07:58:35Z"
java
"2021-12-01T13:03:49Z"
dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/entity/TaskDefinition.java
public void setTaskParams(String taskParams) { this.taskParams = taskParams; } public List<Property> getTaskParamList() { JsonNode localParams = JSONUtils.parseObject(taskParams).findValue("localParams"); if (localParams != null) { taskParamList = JSONUtils.toList(localParams.toString(), Property.class); } return taskParamList; } public void setTaskParamList(List<Property> taskParamList) { this.taskParamList = taskParamList; } public void setTaskParamMap(Map<String, String> taskParamMap) { this.taskParamMap = taskParamMap; } public Map<String, String> getTaskParamMap() { if (taskParamMap == null && StringUtils.isNotEmpty(taskParams)) { JsonNode localParams = JSONUtils.parseObject(taskParams).findValue("localParams"); if (localParams != null) { List<Property> propList = JSONUtils.toList(localParams.toString(), Property.class); taskParamMap = propList.stream().collect(Collectors.toMap(Property::getProp, Property::getValue)); } } return taskParamMap; } public int getTimeout() { return timeout; } public void setTimeout(int timeout) {
closed
apache/dolphinscheduler
https://github.com/apache/dolphinscheduler
7,070
[Bug] [dolphinscheduler-api] Create or edit a workflow definition, check the timeoutNotifyStrategy, the timeoutNotifyStrategy is null in the database
### Search before asking - [X] I had searched in the [issues](https://github.com/apache/dolphinscheduler/issues?q=is%3Aissue) and found no similar issues. ### What happened Create or edit a workflow definition, check the timeoutNotifyStrategy, the timeoutNotifyStrategy is null in the database ![image](https://user-images.githubusercontent.com/95271106/144008124-e24a57e3-59d6-40e6-b019-f9beeac8b2ed.png) ![image](https://user-images.githubusercontent.com/95271106/144007568-57b371e1-24cf-4694-8378-9529fb6351d8.png) ![image](https://user-images.githubusercontent.com/95271106/144007567-6fd24e2e-bb34-4e69-a71a-240c789d2294.png) ### What you expected to happen The timeoutNotifyStrategywas not written to the database when saving the workflow definition ### How to reproduce When saving the workflow definition, write the timeoutNotifyStrategywas to the database ### Anything else _No response_ ### Version 2.0.0 ### Are you willing to submit PR? - [ ] Yes I am willing to submit a PR! ### Code of Conduct - [X] I agree to follow this project's [Code of Conduct](https://www.apache.org/foundation/policies/conduct)
https://github.com/apache/dolphinscheduler/issues/7070
https://github.com/apache/dolphinscheduler/pull/7107
173a3856185abc0fa9be16715d2567ebbe054a6f
d7eb7453e555309bf060809e6f6c61232be469cd
"2021-11-30T07:58:35Z"
java
"2021-12-01T13:03:49Z"
dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/entity/TaskDefinition.java
this.timeout = timeout; } public String getDescription() { return description; } public void setDescription(String description) { this.description = description; } public long getCode() { return code; } public void setCode(long code) { this.code = code; } public int getVersion() { return version; } public void setVersion(int version) { this.version = version; } public long getProjectCode() { return projectCode; } public void setProjectCode(long projectCode) { this.projectCode = projectCode; } public String getTaskType() { return taskType; } public void setTaskType(String taskType) {
closed
apache/dolphinscheduler
https://github.com/apache/dolphinscheduler
7,070
[Bug] [dolphinscheduler-api] Create or edit a workflow definition, check the timeoutNotifyStrategy, the timeoutNotifyStrategy is null in the database
### Search before asking - [X] I had searched in the [issues](https://github.com/apache/dolphinscheduler/issues?q=is%3Aissue) and found no similar issues. ### What happened Create or edit a workflow definition, check the timeoutNotifyStrategy, the timeoutNotifyStrategy is null in the database ![image](https://user-images.githubusercontent.com/95271106/144008124-e24a57e3-59d6-40e6-b019-f9beeac8b2ed.png) ![image](https://user-images.githubusercontent.com/95271106/144007568-57b371e1-24cf-4694-8378-9529fb6351d8.png) ![image](https://user-images.githubusercontent.com/95271106/144007567-6fd24e2e-bb34-4e69-a71a-240c789d2294.png) ### What you expected to happen The timeoutNotifyStrategywas not written to the database when saving the workflow definition ### How to reproduce When saving the workflow definition, write the timeoutNotifyStrategywas to the database ### Anything else _No response_ ### Version 2.0.0 ### Are you willing to submit PR? - [ ] Yes I am willing to submit a PR! ### Code of Conduct - [X] I agree to follow this project's [Code of Conduct](https://www.apache.org/foundation/policies/conduct)
https://github.com/apache/dolphinscheduler/issues/7070
https://github.com/apache/dolphinscheduler/pull/7107
173a3856185abc0fa9be16715d2567ebbe054a6f
d7eb7453e555309bf060809e6f6c61232be469cd
"2021-11-30T07:58:35Z"
java
"2021-12-01T13:03:49Z"
dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/entity/TaskDefinition.java
this.taskType = taskType; } public Priority getTaskPriority() { return taskPriority; } public void setTaskPriority(Priority taskPriority) { this.taskPriority = taskPriority; } public String getWorkerGroup() { return workerGroup; } public void setWorkerGroup(String workerGroup) { this.workerGroup = workerGroup; } public int getFailRetryTimes() { return failRetryTimes; } public void setFailRetryTimes(int failRetryTimes) { this.failRetryTimes = failRetryTimes; } public int getFailRetryInterval() { return failRetryInterval; } public void setFailRetryInterval(int failRetryInterval) { this.failRetryInterval = failRetryInterval; } public TaskTimeoutStrategy getTimeoutNotifyStrategy() { return timeoutNotifyStrategy; } public void setTimeoutNotifyStrategy(TaskTimeoutStrategy timeoutNotifyStrategy) {
closed
apache/dolphinscheduler
https://github.com/apache/dolphinscheduler
7,070
[Bug] [dolphinscheduler-api] Create or edit a workflow definition, check the timeoutNotifyStrategy, the timeoutNotifyStrategy is null in the database
### Search before asking - [X] I had searched in the [issues](https://github.com/apache/dolphinscheduler/issues?q=is%3Aissue) and found no similar issues. ### What happened Create or edit a workflow definition, check the timeoutNotifyStrategy, the timeoutNotifyStrategy is null in the database ![image](https://user-images.githubusercontent.com/95271106/144008124-e24a57e3-59d6-40e6-b019-f9beeac8b2ed.png) ![image](https://user-images.githubusercontent.com/95271106/144007568-57b371e1-24cf-4694-8378-9529fb6351d8.png) ![image](https://user-images.githubusercontent.com/95271106/144007567-6fd24e2e-bb34-4e69-a71a-240c789d2294.png) ### What you expected to happen The timeoutNotifyStrategywas not written to the database when saving the workflow definition ### How to reproduce When saving the workflow definition, write the timeoutNotifyStrategywas to the database ### Anything else _No response_ ### Version 2.0.0 ### Are you willing to submit PR? - [ ] Yes I am willing to submit a PR! ### Code of Conduct - [X] I agree to follow this project's [Code of Conduct](https://www.apache.org/foundation/policies/conduct)
https://github.com/apache/dolphinscheduler/issues/7070
https://github.com/apache/dolphinscheduler/pull/7107
173a3856185abc0fa9be16715d2567ebbe054a6f
d7eb7453e555309bf060809e6f6c61232be469cd
"2021-11-30T07:58:35Z"
java
"2021-12-01T13:03:49Z"
dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/entity/TaskDefinition.java
this.timeoutNotifyStrategy = timeoutNotifyStrategy; } public TimeoutFlag getTimeoutFlag() { return timeoutFlag; } public void setTimeoutFlag(TimeoutFlag timeoutFlag) { this.timeoutFlag = timeoutFlag; } public String getResourceIds() { return resourceIds; } public void setResourceIds(String resourceIds) { this.resourceIds = resourceIds; } public int getDelayTime() { return delayTime; } public void setDelayTime(int delayTime) { this.delayTime = delayTime; } public String getDependence() { return JSONUtils.getNodeString(this.taskParams, Constants.DEPENDENCE); } public String getModifyBy() { return modifyBy; } public void setModifyBy(String modifyBy) { this.modifyBy = modifyBy; } public long getEnvironmentCode() {
closed
apache/dolphinscheduler
https://github.com/apache/dolphinscheduler
7,070
[Bug] [dolphinscheduler-api] Create or edit a workflow definition, check the timeoutNotifyStrategy, the timeoutNotifyStrategy is null in the database
### Search before asking - [X] I had searched in the [issues](https://github.com/apache/dolphinscheduler/issues?q=is%3Aissue) and found no similar issues. ### What happened Create or edit a workflow definition, check the timeoutNotifyStrategy, the timeoutNotifyStrategy is null in the database ![image](https://user-images.githubusercontent.com/95271106/144008124-e24a57e3-59d6-40e6-b019-f9beeac8b2ed.png) ![image](https://user-images.githubusercontent.com/95271106/144007568-57b371e1-24cf-4694-8378-9529fb6351d8.png) ![image](https://user-images.githubusercontent.com/95271106/144007567-6fd24e2e-bb34-4e69-a71a-240c789d2294.png) ### What you expected to happen The timeoutNotifyStrategywas not written to the database when saving the workflow definition ### How to reproduce When saving the workflow definition, write the timeoutNotifyStrategywas to the database ### Anything else _No response_ ### Version 2.0.0 ### Are you willing to submit PR? - [ ] Yes I am willing to submit a PR! ### Code of Conduct - [X] I agree to follow this project's [Code of Conduct](https://www.apache.org/foundation/policies/conduct)
https://github.com/apache/dolphinscheduler/issues/7070
https://github.com/apache/dolphinscheduler/pull/7107
173a3856185abc0fa9be16715d2567ebbe054a6f
d7eb7453e555309bf060809e6f6c61232be469cd
"2021-11-30T07:58:35Z"
java
"2021-12-01T13:03:49Z"
dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/entity/TaskDefinition.java
return this.environmentCode; } public void setEnvironmentCode(long environmentCode) { this.environmentCode = environmentCode; } @Override public boolean equals(Object o) { if (o == null) { return false; } TaskDefinition that = (TaskDefinition) o; return failRetryTimes == that.failRetryTimes && failRetryInterval == that.failRetryInterval && timeout == that.timeout && delayTime == that.delayTime && Objects.equals(name, that.name) && Objects.equals(description, that.description) && Objects.equals(taskType, that.taskType) && Objects.equals(taskParams, that.taskParams) && flag == that.flag && taskPriority == that.taskPriority && Objects.equals(workerGroup, that.workerGroup) && timeoutFlag == that.timeoutFlag && timeoutNotifyStrategy == that.timeoutNotifyStrategy && Objects.equals(resourceIds, that.resourceIds) && environmentCode == that.environmentCode; } @Override public String toString() { return "TaskDefinition{"
closed
apache/dolphinscheduler
https://github.com/apache/dolphinscheduler
7,070
[Bug] [dolphinscheduler-api] Create or edit a workflow definition, check the timeoutNotifyStrategy, the timeoutNotifyStrategy is null in the database
### Search before asking - [X] I had searched in the [issues](https://github.com/apache/dolphinscheduler/issues?q=is%3Aissue) and found no similar issues. ### What happened Create or edit a workflow definition, check the timeoutNotifyStrategy, the timeoutNotifyStrategy is null in the database ![image](https://user-images.githubusercontent.com/95271106/144008124-e24a57e3-59d6-40e6-b019-f9beeac8b2ed.png) ![image](https://user-images.githubusercontent.com/95271106/144007568-57b371e1-24cf-4694-8378-9529fb6351d8.png) ![image](https://user-images.githubusercontent.com/95271106/144007567-6fd24e2e-bb34-4e69-a71a-240c789d2294.png) ### What you expected to happen The timeoutNotifyStrategywas not written to the database when saving the workflow definition ### How to reproduce When saving the workflow definition, write the timeoutNotifyStrategywas to the database ### Anything else _No response_ ### Version 2.0.0 ### Are you willing to submit PR? - [ ] Yes I am willing to submit a PR! ### Code of Conduct - [X] I agree to follow this project's [Code of Conduct](https://www.apache.org/foundation/policies/conduct)
https://github.com/apache/dolphinscheduler/issues/7070
https://github.com/apache/dolphinscheduler/pull/7107
173a3856185abc0fa9be16715d2567ebbe054a6f
d7eb7453e555309bf060809e6f6c61232be469cd
"2021-11-30T07:58:35Z"
java
"2021-12-01T13:03:49Z"
dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/entity/TaskDefinition.java
+ "id=" + id + ", code=" + code + ", name='" + name + '\'' + ", version=" + version + ", description='" + description + '\'' + ", projectCode=" + projectCode + ", userId=" + userId + ", taskType=" + taskType + ", taskParams='" + taskParams + '\'' + ", taskParamList=" + taskParamList + ", taskParamMap=" + taskParamMap + ", flag=" + flag + ", taskPriority=" + taskPriority + ", userName='" + userName + '\'' + ", projectName='" + projectName + '\'' + ", workerGroup='" + workerGroup + '\'' + ", failRetryTimes=" + failRetryTimes + ", environmentCode='" + environmentCode + '\'' + ", failRetryInterval=" + failRetryInterval + ", timeoutFlag=" + timeoutFlag + ", timeoutNotifyStrategy=" + timeoutNotifyStrategy + ", timeout=" + timeout + ", delayTime=" + delayTime + ", resourceIds='" + resourceIds + '\'' + ", createTime=" + createTime + ", updateTime=" + updateTime + '}'; } }
closed
apache/dolphinscheduler
https://github.com/apache/dolphinscheduler
6,930
[Feature][Python] Add workflow as code task type sub_process
### Search before asking - [X] I had searched in the [issues](https://github.com/apache/dolphinscheduler/issues?q=is%3Aissue) and found no similar feature requirement. ### Description Add python api task type sub_process. sub task in #6407. we should cover all parameter from UI side and make it suitable for python. ### Use case _No response_ ### Related issues _No response_ ### Are you willing to submit a 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/6930
https://github.com/apache/dolphinscheduler/pull/7022
3304edee47947e0b5a2a9445fe602133efc3d5d7
f480b8adf8f86b7bf1d6727385c8fad8307a452b
"2021-11-19T07:09:05Z"
java
"2021-12-03T02:26:45Z"
dolphinscheduler-python/src/main/java/org/apache/dolphinscheduler/server/PythonGatewayServer.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