You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@dolphinscheduler.apache.org by GitBox <gi...@apache.org> on 2022/10/20 18:32:46 UTC
[GitHub] [dolphinscheduler] github-code-scanning[bot] commented on a diff in pull request #12474: [Refactor] Migrate all command-related interface functions from ProcessServiceImpl
github-code-scanning[bot] commented on code in PR #12474:
URL: https://github.com/apache/dolphinscheduler/pull/12474#discussion_r1000987970
##########
dolphinscheduler-service/src/test/java/org/apache/dolphinscheduler/service/utils/ParamUtilsTest.java:
##########
@@ -0,0 +1,22 @@
+package org.apache.dolphinscheduler.service.utils;
+
+import static org.junit.jupiter.api.Assertions.*;
+
+import java.util.Map;
+
+import org.junit.jupiter.api.Assertions;
+import org.junit.jupiter.api.Test;
+
+class ParamUtilsTest {
Review Comment:
## Unused classes and interfaces
Unused class: ParamUtilsTest is not referenced within this codebase. If not used as an external API it should be removed.
[Show more details](https://github.com/apache/dolphinscheduler/security/code-scanning/1998)
##########
dolphinscheduler-service/src/main/java/org/apache/dolphinscheduler/service/command/CommandServiceImpl.java:
##########
@@ -0,0 +1,267 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.dolphinscheduler.service.command;
+
+import static org.apache.dolphinscheduler.common.Constants.CMD_PARAM_RECOVER_PROCESS_ID_STRING;
+
+import org.apache.dolphinscheduler.common.Constants;
+import org.apache.dolphinscheduler.common.enums.CommandType;
+import org.apache.dolphinscheduler.common.enums.Flag;
+import org.apache.dolphinscheduler.common.enums.TaskDependType;
+import org.apache.dolphinscheduler.common.utils.JSONUtils;
+import org.apache.dolphinscheduler.dao.entity.Command;
+import org.apache.dolphinscheduler.dao.entity.ErrorCommand;
+import org.apache.dolphinscheduler.dao.entity.ProcessDefinition;
+import org.apache.dolphinscheduler.dao.entity.ProcessInstance;
+import org.apache.dolphinscheduler.dao.entity.ProcessInstanceMap;
+import org.apache.dolphinscheduler.dao.entity.Schedule;
+import org.apache.dolphinscheduler.dao.entity.TaskInstance;
+import org.apache.dolphinscheduler.dao.mapper.CommandMapper;
+import org.apache.dolphinscheduler.dao.mapper.ErrorCommandMapper;
+import org.apache.dolphinscheduler.dao.mapper.ProcessDefinitionMapper;
+import org.apache.dolphinscheduler.dao.mapper.ScheduleMapper;
+import org.apache.dolphinscheduler.plugin.task.api.enums.Direct;
+import org.apache.dolphinscheduler.plugin.task.api.model.Property;
+import org.apache.dolphinscheduler.service.utils.ParamUtils;
+
+import org.apache.commons.collections.CollectionUtils;
+import org.apache.commons.lang3.StringUtils;
+
+import java.util.Date;
+import java.util.EnumMap;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+
+import com.fasterxml.jackson.databind.node.ObjectNode;
+import com.google.common.collect.Lists;
+import io.micrometer.core.annotation.Counted;
+
+/**
+ * Command Service implementation
+ */
+@Component
+public class CommandServiceImpl implements CommandService {
+
+ @Autowired
+ private ErrorCommandMapper errorCommandMapper;
+
+ @Autowired
+ private CommandMapper commandMapper;
+
+ @Autowired
+ private ScheduleMapper scheduleMapper;
+
+ @Autowired
+ private ProcessDefinitionMapper processDefineMapper;
+
+ @Override
+ public void moveToErrorCommand(Command command, String message) {
+ ErrorCommand errorCommand = new ErrorCommand(command, message);
+ this.errorCommandMapper.insert(errorCommand);
+ this.commandMapper.deleteById(command.getId());
+ }
+
+ @Override
+ @Counted("ds.workflow.create.command.count")
+ public int createCommand(Command command) {
+ int result = 0;
+ if (command == null) {
+ return result;
+ }
+ // add command timezone
+ Schedule schedule = scheduleMapper.queryByProcessDefinitionCode(command.getProcessDefinitionCode());
+ if (schedule != null) {
+ Map<String, String> commandParams =
+ StringUtils.isNotBlank(command.getCommandParam()) ? JSONUtils.toMap(command.getCommandParam())
+ : new HashMap<>();
+ commandParams.put(Constants.SCHEDULE_TIMEZONE, schedule.getTimezoneId());
+ command.setCommandParam(JSONUtils.toJsonString(commandParams));
+ }
+ command.setId(null);
+ result = commandMapper.insert(command);
+ return result;
+ }
+
+ @Override
+ public List<Command> findCommandPage(int pageSize, int pageNumber) {
+ return commandMapper.queryCommandPage(pageSize, pageNumber * pageSize);
+ }
+
+ @Override
+ public List<Command> findCommandPageBySlot(int pageSize, int pageNumber, int masterCount, int thisMasterSlot) {
+ if (masterCount <= 0) {
+ return Lists.newArrayList();
+ }
+ return commandMapper.queryCommandPageBySlot(pageSize, pageNumber * pageSize, masterCount, thisMasterSlot);
+ }
+
+ @Override
+ 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)) {
+ return true;
+ }
+
+ ObjectNode cmdParamObj = JSONUtils.parseObject(command.getCommandParam());
+ int processInstanceId = cmdParamObj.path(CMD_PARAM_RECOVER_PROCESS_ID_STRING).asInt();
+
+ List<Command> commands = commandMapper.selectList(null);
+ // for all commands
+ for (Command tmpCommand : commands) {
+ if (!cmdTypeMap.containsKey(tmpCommand.getCommandType())) {
+ continue;
+ }
+ ObjectNode tempObj = JSONUtils.parseObject(tmpCommand.getCommandParam());
+ if (tempObj != null
+ && processInstanceId == tempObj.path(CMD_PARAM_RECOVER_PROCESS_ID_STRING).asInt()) {
+ isNeedCreate = false;
+ break;
+ }
+ }
+ return isNeedCreate;
+ }
+
+ @Override
+ public int saveCommand(Command command) {
+ if (command.getId() != null) {
+ return commandMapper.updateById(command);
+ } else {
+ return commandMapper.insert(command);
+ }
+ }
+
+ @Override
+ public void createRecoveryWaitingThreadCommand(Command originCommand, ProcessInstance processInstance) {
+ // sub process doesn't need to create wait command
+ 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()));
+ // process instance quit by "waiting thread" state
+ if (originCommand == null) {
+ Command command = new Command(
+ CommandType.RECOVER_WAITING_THREAD,
+ processInstance.getTaskDependType(),
+ processInstance.getFailureStrategy(),
+ processInstance.getExecutorId(),
+ processInstance.getProcessDefinition().getCode(),
+ JSONUtils.toJsonString(cmdParam),
+ processInstance.getWarningType(),
+ processInstance.getWarningGroupId(),
+ processInstance.getScheduleTime(),
+ processInstance.getWorkerGroup(),
+ processInstance.getEnvironmentCode(),
+ processInstance.getProcessInstancePriority(),
+ processInstance.getDryRun(),
+ processInstance.getId(),
+ processInstance.getProcessDefinitionVersion(),
+ processInstance.getTestFlag());
+ saveCommand(command);
+ return;
+ }
+
+ // update the command time if current command if recover from waiting
+ if (originCommand.getCommandType() == CommandType.RECOVER_WAITING_THREAD) {
+ originCommand.setUpdateTime(new Date());
+ saveCommand(originCommand);
+ } else {
+ // delete old command and create new waiting thread command
+ 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);
+ }
+ }
+
+ @Override
+ public Command createSubProcessCommand(ProcessInstance parentProcessInstance, ProcessInstance childInstance,
+ ProcessInstanceMap instanceMap, TaskInstance task) {
+ CommandType commandType = getSubCommandType(parentProcessInstance, childInstance);
+ Map<String, Object> subProcessParam = JSONUtils.toMap(task.getTaskParams(), String.class, Object.class);
+ long childDefineCode = 0L;
+ if (subProcessParam.containsKey(Constants.CMD_PARAM_SUB_PROCESS_DEFINE_CODE)) {
+ childDefineCode =
+ Long.parseLong(String.valueOf(subProcessParam.get(Constants.CMD_PARAM_SUB_PROCESS_DEFINE_CODE)));
Review Comment:
## Missing catch of NumberFormatException
Potential uncaught 'java.lang.NumberFormatException'.
[Show more details](https://github.com/apache/dolphinscheduler/security/code-scanning/1999)
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: commits-unsubscribe@dolphinscheduler.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org