Browse Source
* fix bug(#3617): after subtask fault tolerance, 2 task instances are generated. * delete unused code * update code smell * refactor sub work command process * add process service ut * add license header * fix some code smell * chang ut java8 to java11 * update sonar to java11 * copy ut config from dev * remove checkstyle * revert to 1.3.3 * change proess service test to executor service * add process service test * add process service test * revert * revert * add comments * change dev to 1.3.3-release * revert Co-authored-by: baoliang <baoliang@analysys.com.cn>1.3.3-release
bao liang
4 years ago
committed by
GitHub
5 changed files with 218 additions and 76 deletions
@ -0,0 +1,107 @@ |
|||||||
|
/* |
||||||
|
* Licensed to the Apache Software Foundation (ASF) under one or more |
||||||
|
* contributor license agreements. See the NOTICE file distributed with |
||||||
|
* this work for additional information regarding copyright ownership. |
||||||
|
* The ASF licenses this file to You under the Apache License, Version 2.0 |
||||||
|
* (the "License"); you may not use this file except in compliance with |
||||||
|
* the License. You may obtain a copy of the License at |
||||||
|
* |
||||||
|
* http://www.apache.org/licenses/LICENSE-2.0
|
||||||
|
* |
||||||
|
* Unless required by applicable law or agreed to in writing, software |
||||||
|
* distributed under the License is distributed on an "AS IS" BASIS, |
||||||
|
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. |
||||||
|
* See the License for the specific language governing permissions and |
||||||
|
* limitations under the License. |
||||||
|
*/ |
||||||
|
package org.apache.dolphinscheduler.service.process; |
||||||
|
|
||||||
|
import org.apache.dolphinscheduler.common.Constants; |
||||||
|
import org.apache.dolphinscheduler.common.enums.CommandType; |
||||||
|
import org.apache.dolphinscheduler.common.enums.WarningType; |
||||||
|
import org.apache.dolphinscheduler.common.utils.JSONUtils; |
||||||
|
import org.apache.dolphinscheduler.dao.entity.Command; |
||||||
|
import org.apache.dolphinscheduler.dao.entity.ProcessInstance; |
||||||
|
import org.apache.dolphinscheduler.dao.entity.ProcessInstanceMap; |
||||||
|
import org.apache.dolphinscheduler.dao.entity.TaskInstance; |
||||||
|
|
||||||
|
import org.junit.Assert; |
||||||
|
import org.junit.Test; |
||||||
|
|
||||||
|
import com.alibaba.fastjson.JSONObject; |
||||||
|
|
||||||
|
/** |
||||||
|
* process service test |
||||||
|
*/ |
||||||
|
public class ProcessServiceTest { |
||||||
|
|
||||||
|
|
||||||
|
@Test |
||||||
|
public void testCreateSubCommand() { |
||||||
|
|
||||||
|
ProcessService processService = new ProcessService(); |
||||||
|
ProcessInstance parentInstance = new ProcessInstance(); |
||||||
|
parentInstance.setProcessDefinitionId(1); |
||||||
|
parentInstance.setWarningType(WarningType.SUCCESS); |
||||||
|
parentInstance.setWarningGroupId(0); |
||||||
|
|
||||||
|
TaskInstance task = new TaskInstance(); |
||||||
|
task.setTaskJson("{params:{processDefinitionId:100}}"); |
||||||
|
task.setId(10); |
||||||
|
|
||||||
|
ProcessInstance childInstance = null; |
||||||
|
ProcessInstanceMap instanceMap = new ProcessInstanceMap(); |
||||||
|
instanceMap.setParentProcessInstanceId(1); |
||||||
|
instanceMap.setParentTaskInstanceId(10); |
||||||
|
Command command = null; |
||||||
|
|
||||||
|
//father history: start; child null == command type: start
|
||||||
|
parentInstance.setHistoryCmd("START_PROCESS"); |
||||||
|
parentInstance.setCommandType(CommandType.START_PROCESS); |
||||||
|
command = processService.createSubProcessCommand( |
||||||
|
parentInstance, childInstance, instanceMap, task |
||||||
|
); |
||||||
|
Assert.assertEquals(CommandType.START_PROCESS, command.getCommandType()); |
||||||
|
|
||||||
|
//father history: start,start failure; child null == command type: start
|
||||||
|
parentInstance.setCommandType(CommandType.START_FAILURE_TASK_PROCESS); |
||||||
|
parentInstance.setHistoryCmd("START_PROCESS,START_FAILURE_TASK_PROCESS"); |
||||||
|
command = processService.createSubProcessCommand( |
||||||
|
parentInstance, childInstance, instanceMap, task |
||||||
|
); |
||||||
|
Assert.assertEquals(CommandType.START_PROCESS, command.getCommandType()); |
||||||
|
|
||||||
|
|
||||||
|
//father history: scheduler,start failure; child null == command type: scheduler
|
||||||
|
parentInstance.setCommandType(CommandType.START_FAILURE_TASK_PROCESS); |
||||||
|
parentInstance.setHistoryCmd("SCHEDULER,START_FAILURE_TASK_PROCESS"); |
||||||
|
command = processService.createSubProcessCommand( |
||||||
|
parentInstance, childInstance, instanceMap, task |
||||||
|
); |
||||||
|
Assert.assertEquals(CommandType.SCHEDULER, command.getCommandType()); |
||||||
|
|
||||||
|
//father history: complement,start failure; child null == command type: complement
|
||||||
|
parentInstance.setCommandType(CommandType.START_FAILURE_TASK_PROCESS); |
||||||
|
parentInstance.setHistoryCmd("COMPLEMENT_DATA,START_FAILURE_TASK_PROCESS"); |
||||||
|
parentInstance.setCommandParam("{complementStartDate:'2020-01-01',complementEndDate:'2020-01-10'}"); |
||||||
|
command = processService.createSubProcessCommand( |
||||||
|
parentInstance, childInstance, instanceMap, task |
||||||
|
); |
||||||
|
Assert.assertEquals(CommandType.COMPLEMENT_DATA, command.getCommandType()); |
||||||
|
|
||||||
|
JSONObject complementDate = JSONUtils.parseObject(command.getCommandParam()); |
||||||
|
Assert.assertEquals("2020-01-01", String.valueOf(complementDate.get(Constants.CMDPARAM_COMPLEMENT_DATA_START_DATE))); |
||||||
|
Assert.assertEquals("2020-01-10", String.valueOf(complementDate.get(Constants.CMDPARAM_COMPLEMENT_DATA_END_DATE))); |
||||||
|
|
||||||
|
//father history: start,failure,start failure; child not null == command type: start failure
|
||||||
|
childInstance = new ProcessInstance(); |
||||||
|
parentInstance.setCommandType(CommandType.START_FAILURE_TASK_PROCESS); |
||||||
|
parentInstance.setHistoryCmd("START_PROCESS,START_FAILURE_TASK_PROCESS"); |
||||||
|
command = processService.createSubProcessCommand( |
||||||
|
parentInstance, childInstance, instanceMap, task |
||||||
|
); |
||||||
|
Assert.assertEquals(CommandType.START_FAILURE_TASK_PROCESS, command.getCommandType()); |
||||||
|
|
||||||
|
|
||||||
|
} |
||||||
|
} |
||||||
Loading…
Reference in new issue