vanilla111
4 years ago
committed by
GitHub
35 changed files with 1383 additions and 297 deletions
File diff suppressed because one or more lines are too long
@ -0,0 +1,32 @@ |
|||||||
|
/* |
||||||
|
* 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.common.enums; |
||||||
|
|
||||||
|
import junit.framework.TestCase; |
||||||
|
|
||||||
|
/** |
||||||
|
* execution status test. |
||||||
|
*/ |
||||||
|
public class ExecutionStatusTest extends TestCase { |
||||||
|
|
||||||
|
public void testTypeIsRunning() { |
||||||
|
assertTrue(ExecutionStatus.RUNNING_EXECUTION.typeIsRunning()); |
||||||
|
assertTrue(ExecutionStatus.WAITTING_DEPEND.typeIsRunning()); |
||||||
|
assertTrue(ExecutionStatus.DELAY_EXECUTION.typeIsRunning()); |
||||||
|
} |
||||||
|
} |
@ -0,0 +1,171 @@ |
|||||||
|
/* |
||||||
|
* 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.server.worker.runner; |
||||||
|
|
||||||
|
import org.apache.dolphinscheduler.common.enums.ExecutionStatus; |
||||||
|
import org.apache.dolphinscheduler.common.model.TaskNode; |
||||||
|
import org.apache.dolphinscheduler.common.task.AbstractParameters; |
||||||
|
import org.apache.dolphinscheduler.common.utils.CommonUtils; |
||||||
|
import org.apache.dolphinscheduler.common.utils.JSONUtils; |
||||||
|
import org.apache.dolphinscheduler.common.utils.LoggerUtils; |
||||||
|
import org.apache.dolphinscheduler.remote.command.Command; |
||||||
|
import org.apache.dolphinscheduler.remote.command.TaskExecuteAckCommand; |
||||||
|
import org.apache.dolphinscheduler.remote.command.TaskExecuteResponseCommand; |
||||||
|
import org.apache.dolphinscheduler.server.entity.TaskExecutionContext; |
||||||
|
import org.apache.dolphinscheduler.server.worker.cache.impl.TaskExecutionContextCacheManagerImpl; |
||||||
|
import org.apache.dolphinscheduler.server.worker.processor.TaskCallbackService; |
||||||
|
import org.apache.dolphinscheduler.server.worker.task.AbstractTask; |
||||||
|
import org.apache.dolphinscheduler.server.worker.task.TaskManager; |
||||||
|
import org.apache.dolphinscheduler.service.bean.SpringApplicationContext; |
||||||
|
|
||||||
|
import java.util.Date; |
||||||
|
|
||||||
|
import org.junit.Assert; |
||||||
|
import org.junit.Before; |
||||||
|
import org.junit.Test; |
||||||
|
import org.junit.runner.RunWith; |
||||||
|
import org.powermock.api.mockito.PowerMockito; |
||||||
|
import org.powermock.core.classloader.annotations.PrepareForTest; |
||||||
|
import org.powermock.modules.junit4.PowerMockRunner; |
||||||
|
import org.slf4j.Logger; |
||||||
|
import org.slf4j.LoggerFactory; |
||||||
|
|
||||||
|
/** |
||||||
|
* test task execute thread. |
||||||
|
*/ |
||||||
|
@RunWith(PowerMockRunner.class) |
||||||
|
@PrepareForTest({TaskManager.class, JSONUtils.class, CommonUtils.class, SpringApplicationContext.class}) |
||||||
|
public class TaskExecuteThreadTest { |
||||||
|
|
||||||
|
private TaskExecutionContext taskExecutionContext; |
||||||
|
|
||||||
|
private TaskCallbackService taskCallbackService; |
||||||
|
|
||||||
|
private Command ackCommand; |
||||||
|
|
||||||
|
private Command responseCommand; |
||||||
|
|
||||||
|
private Logger taskLogger; |
||||||
|
|
||||||
|
private TaskExecutionContextCacheManagerImpl taskExecutionContextCacheManager; |
||||||
|
|
||||||
|
@Before |
||||||
|
public void before() { |
||||||
|
// init task execution context, logger
|
||||||
|
taskExecutionContext = new TaskExecutionContext(); |
||||||
|
taskExecutionContext.setProcessId(12345); |
||||||
|
taskExecutionContext.setProcessDefineId(1); |
||||||
|
taskExecutionContext.setProcessInstanceId(1); |
||||||
|
taskExecutionContext.setTaskInstanceId(1); |
||||||
|
taskExecutionContext.setTaskType(""); |
||||||
|
taskExecutionContext.setFirstSubmitTime(new Date()); |
||||||
|
taskExecutionContext.setDelayTime(0); |
||||||
|
taskExecutionContext.setLogPath("/tmp/test.log"); |
||||||
|
taskExecutionContext.setHost("localhost"); |
||||||
|
taskExecutionContext.setExecutePath("/tmp/dolphinscheduler/exec/process/1/2/3/4"); |
||||||
|
|
||||||
|
ackCommand = new TaskExecuteAckCommand().convert2Command(); |
||||||
|
responseCommand = new TaskExecuteResponseCommand(taskExecutionContext.getTaskInstanceId()).convert2Command(); |
||||||
|
|
||||||
|
taskLogger = LoggerFactory.getLogger(LoggerUtils.buildTaskId( |
||||||
|
LoggerUtils.TASK_LOGGER_INFO_PREFIX, |
||||||
|
taskExecutionContext.getProcessDefineId(), |
||||||
|
taskExecutionContext.getProcessInstanceId(), |
||||||
|
taskExecutionContext.getTaskInstanceId() |
||||||
|
)); |
||||||
|
|
||||||
|
taskExecutionContextCacheManager = new TaskExecutionContextCacheManagerImpl(); |
||||||
|
taskExecutionContextCacheManager.cacheTaskExecutionContext(taskExecutionContext); |
||||||
|
|
||||||
|
taskCallbackService = PowerMockito.mock(TaskCallbackService.class); |
||||||
|
PowerMockito.doNothing().when(taskCallbackService).sendAck(taskExecutionContext.getTaskInstanceId(), ackCommand); |
||||||
|
PowerMockito.doNothing().when(taskCallbackService).sendResult(taskExecutionContext.getTaskInstanceId(), responseCommand); |
||||||
|
|
||||||
|
PowerMockito.mockStatic(SpringApplicationContext.class); |
||||||
|
PowerMockito.when(SpringApplicationContext.getBean(TaskExecutionContextCacheManagerImpl.class)) |
||||||
|
.thenReturn(taskExecutionContextCacheManager); |
||||||
|
|
||||||
|
PowerMockito.mockStatic(TaskManager.class); |
||||||
|
PowerMockito.when(TaskManager.newTask(taskExecutionContext, taskLogger)) |
||||||
|
.thenReturn(new SimpleTask(taskExecutionContext, taskLogger)); |
||||||
|
|
||||||
|
PowerMockito.mockStatic(JSONUtils.class); |
||||||
|
PowerMockito.when(JSONUtils.parseObject(taskExecutionContext.getTaskJson(), TaskNode.class)) |
||||||
|
.thenReturn(new TaskNode()); |
||||||
|
|
||||||
|
PowerMockito.mockStatic(CommonUtils.class); |
||||||
|
PowerMockito.when(CommonUtils.getSystemEnvPath()).thenReturn("/user_home/.bash_profile"); |
||||||
|
} |
||||||
|
|
||||||
|
@Test |
||||||
|
public void testNormalExecution() { |
||||||
|
taskExecutionContext.setTaskType("SQL"); |
||||||
|
taskExecutionContext.setStartTime(new Date()); |
||||||
|
taskExecutionContext.setCurrentExecutionStatus(ExecutionStatus.RUNNING_EXECUTION); |
||||||
|
TaskExecuteThread taskExecuteThread = new TaskExecuteThread(taskExecutionContext, taskCallbackService, taskLogger); |
||||||
|
taskExecuteThread.run(); |
||||||
|
|
||||||
|
Assert.assertEquals(ExecutionStatus.SUCCESS, taskExecutionContext.getCurrentExecutionStatus()); |
||||||
|
} |
||||||
|
|
||||||
|
@Test |
||||||
|
public void testDelayExecution() { |
||||||
|
taskExecutionContext.setTaskType("PYTHON"); |
||||||
|
taskExecutionContext.setStartTime(null); |
||||||
|
taskExecutionContext.setDelayTime(1); |
||||||
|
taskExecutionContext.setCurrentExecutionStatus(ExecutionStatus.DELAY_EXECUTION); |
||||||
|
TaskExecuteThread taskExecuteThread = new TaskExecuteThread(taskExecutionContext, taskCallbackService, taskLogger); |
||||||
|
taskExecuteThread.run(); |
||||||
|
|
||||||
|
Assert.assertEquals(ExecutionStatus.SUCCESS, taskExecutionContext.getCurrentExecutionStatus()); |
||||||
|
} |
||||||
|
|
||||||
|
private class SimpleTask extends AbstractTask { |
||||||
|
|
||||||
|
protected SimpleTask(TaskExecutionContext taskExecutionContext, Logger logger) { |
||||||
|
super(taskExecutionContext, logger); |
||||||
|
// pid
|
||||||
|
this.processId = taskExecutionContext.getProcessId(); |
||||||
|
} |
||||||
|
|
||||||
|
@Override |
||||||
|
public AbstractParameters getParameters() { |
||||||
|
return null; |
||||||
|
} |
||||||
|
|
||||||
|
@Override |
||||||
|
public void init() { |
||||||
|
|
||||||
|
} |
||||||
|
|
||||||
|
@Override |
||||||
|
public void handle() throws Exception { |
||||||
|
|
||||||
|
} |
||||||
|
|
||||||
|
@Override |
||||||
|
public void after() { |
||||||
|
|
||||||
|
} |
||||||
|
|
||||||
|
@Override |
||||||
|
public ExecutionStatus getExitStatus() { |
||||||
|
return ExecutionStatus.SUCCESS; |
||||||
|
} |
||||||
|
} |
||||||
|
} |
@ -0,0 +1,58 @@ |
|||||||
|
/* |
||||||
|
* 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. |
||||||
|
*/ |
||||||
|
|
||||||
|
SET sql_mode=(SELECT REPLACE(@@sql_mode,'ONLY_FULL_GROUP_BY','')); |
||||||
|
-- uc_dolphin_T_t_ds_task_instance_A_first_submit_time |
||||||
|
drop PROCEDURE if EXISTS uc_dolphin_T_t_ds_task_instance_A_first_submit_time; |
||||||
|
delimiter d// |
||||||
|
CREATE PROCEDURE uc_dolphin_T_t_ds_task_instance_A_first_submit_time() |
||||||
|
BEGIN |
||||||
|
IF NOT EXISTS (SELECT 1 FROM information_schema.COLUMNS |
||||||
|
WHERE TABLE_NAME='t_ds_task_instance' |
||||||
|
AND TABLE_SCHEMA=(SELECT DATABASE()) |
||||||
|
AND COLUMN_NAME ='first_submit_time') |
||||||
|
THEN |
||||||
|
ALTER TABLE t_ds_task_instance ADD `first_submit_time` datetime DEFAULT NULL COMMENT 'task first submit time'; |
||||||
|
END IF; |
||||||
|
END; |
||||||
|
|
||||||
|
d// |
||||||
|
|
||||||
|
delimiter ; |
||||||
|
CALL uc_dolphin_T_t_ds_task_instance_A_first_submit_time(); |
||||||
|
DROP PROCEDURE uc_dolphin_T_t_ds_task_instance_A_first_submit_time; |
||||||
|
|
||||||
|
-- uc_dolphin_T_t_ds_task_instance_A_delay_time |
||||||
|
drop PROCEDURE if EXISTS uc_dolphin_T_t_ds_task_instance_A_delay_time; |
||||||
|
delimiter d// |
||||||
|
CREATE PROCEDURE uc_dolphin_T_t_ds_task_instance_A_delay_time() |
||||||
|
BEGIN |
||||||
|
IF NOT EXISTS (SELECT 1 FROM information_schema.COLUMNS |
||||||
|
WHERE TABLE_NAME='t_ds_task_instance' |
||||||
|
AND TABLE_SCHEMA=(SELECT DATABASE()) |
||||||
|
AND COLUMN_NAME ='delay_time') |
||||||
|
THEN |
||||||
|
ALTER TABLE t_ds_task_instance ADD `delay_time` int(4) DEFAULT '0' COMMENT 'task delay execution time'; |
||||||
|
END IF; |
||||||
|
END; |
||||||
|
|
||||||
|
d// |
||||||
|
|
||||||
|
delimiter ; |
||||||
|
CALL uc_dolphin_T_t_ds_task_instance_A_delay_time(); |
||||||
|
DROP PROCEDURE uc_dolphin_T_t_ds_task_instance_A_delay_time; |
||||||
|
|
@ -0,0 +1,16 @@ |
|||||||
|
/* |
||||||
|
* 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. |
||||||
|
*/ |
@ -0,0 +1,52 @@ |
|||||||
|
/* |
||||||
|
* 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. |
||||||
|
*/ |
||||||
|
-- uc_dolphin_T_t_ds_task_instance_A_first_submit_time |
||||||
|
delimiter d// |
||||||
|
CREATE OR REPLACE FUNCTION uc_dolphin_T_t_ds_task_instance_A_first_submit_time() RETURNS void AS $$ |
||||||
|
BEGIN |
||||||
|
IF NOT EXISTS (SELECT 1 FROM information_schema.COLUMNS |
||||||
|
WHERE TABLE_NAME='t_ds_task_instance' |
||||||
|
AND COLUMN_NAME ='first_submit_time') |
||||||
|
THEN |
||||||
|
ALTER TABLE t_ds_task_instance ADD COLUMN first_submit_time timestamp DEFAULT NULL; |
||||||
|
END IF; |
||||||
|
END; |
||||||
|
$$ LANGUAGE plpgsql; |
||||||
|
d// |
||||||
|
|
||||||
|
delimiter ; |
||||||
|
SELECT uc_dolphin_T_t_ds_task_instance_A_first_submit_time(); |
||||||
|
DROP FUNCTION IF EXISTS uc_dolphin_T_t_ds_task_instance_A_first_submit_time(); |
||||||
|
|
||||||
|
|
||||||
|
-- uc_dolphin_T_t_ds_task_instance_A_delay_time |
||||||
|
delimiter d// |
||||||
|
CREATE OR REPLACE FUNCTION uc_dolphin_T_t_ds_task_instance_A_delay_time() RETURNS void AS $$ |
||||||
|
BEGIN |
||||||
|
IF NOT EXISTS (SELECT 1 FROM information_schema.COLUMNS |
||||||
|
WHERE TABLE_NAME='t_ds_task_instance' |
||||||
|
AND COLUMN_NAME ='delay_time') |
||||||
|
THEN |
||||||
|
ALTER TABLE t_ds_task_instance ADD COLUMN delay_time int DEFAULT '0'; |
||||||
|
END IF; |
||||||
|
END; |
||||||
|
$$ LANGUAGE plpgsql; |
||||||
|
d// |
||||||
|
|
||||||
|
delimiter ; |
||||||
|
SELECT uc_dolphin_T_t_ds_task_instance_A_delay_time(); |
||||||
|
DROP FUNCTION IF EXISTS uc_dolphin_T_t_ds_task_instance_A_delay_time(); |
@ -0,0 +1,16 @@ |
|||||||
|
/* |
||||||
|
* 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. |
||||||
|
*/ |
Loading…
Reference in new issue