Skip to content

Commit 80f2b46

Browse files
committed
add more tasks
1 parent 1062a61 commit 80f2b46

18 files changed

Lines changed: 161 additions & 46 deletions

File tree

dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/executor/logging/TaskLogType.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ public String getLogPath(TaskInstance taskInstance) {
3232

3333
@Override
3434
public String getLogPath(TaskInstance taskInstance) {
35-
return taskInstance.getTaskOutPutLogPath();
35+
return taskInstance.getTaskOutputLogPath();
3636
}
3737
};
3838

dolphinscheduler-api/src/test/java/org/apache/dolphinscheduler/api/service/LoggerServiceTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -187,7 +187,7 @@ public void testQueryTaskOutputAndGetOutputBytes() {
187187
taskInstance.setId(1);
188188
taskInstance.setExecutorId(loginUser.getId() + 1);
189189
taskInstance.setHost("127.0.0.1:" + nettyServerPort);
190-
taskInstance.setTaskOutPutLogPath("/temp/output.log");
190+
taskInstance.setTaskOutputLogPath("/temp/output.log");
191191
when(taskInstanceDao.queryById(1)).thenReturn(taskInstance);
192192

193193
doNothing().when(projectService).checkProjectAndAuthThrowException(loginUser, taskInstance.getProjectCode(),

dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/entity/TaskInstance.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,8 @@ public class TaskInstance implements Serializable {
8080
private String executePath;
8181

8282
private String logPath;
83-
private String taskOutPutLogPath;
83+
@TableField("task_output_log_path")
84+
private String taskOutputLogPath;
8485

8586
private int retryTimes;
8687

dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/TaskInstanceMapper.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,13 +20,13 @@
2020
<mapper namespace="org.apache.dolphinscheduler.dao.mapper.TaskInstanceMapper">
2121
<sql id="baseSql">
2222
id, name, task_type, workflow_instance_id, workflow_instance_name, project_code, task_code, task_definition_version, state, submit_time,
23-
start_time, end_time, host, execute_path, log_path, alert_flag, retry_times, pid, app_link,
23+
start_time, end_time, host, execute_path, log_path, task_output_log_path, alert_flag, retry_times, pid, app_link,
2424
flag, retry_interval, max_retry_times, task_instance_priority, worker_group,environment_code , executor_id, executor_name,
2525
first_submit_time, delay_time, task_params, var_pool, dry_run, task_group_id, cpu_quota, memory_max, task_execute_type
2626
</sql>
2727
<sql id="baseSqlV2">
2828
${alias}.id, ${alias}.name, ${alias}.task_type, ${alias}.task_code, ${alias}.task_definition_version, ${alias}.workflow_instance_id, ${alias}.state, ${alias}.submit_time,
29-
${alias}.start_time, ${alias}.end_time, ${alias}.host, ${alias}.execute_path, ${alias}.log_path, ${alias}.alert_flag, ${alias}.retry_times, ${alias}.pid, ${alias}.app_link,
29+
${alias}.start_time, ${alias}.end_time, ${alias}.host, ${alias}.execute_path, ${alias}.log_path, ${alias}.task_output_log_path, ${alias}.alert_flag, ${alias}.retry_times, ${alias}.pid, ${alias}.app_link,
3030
${alias}.flag, ${alias}.retry_interval, ${alias}.max_retry_times, ${alias}.task_instance_priority, ${alias}.worker_group,${alias}.environment_code , ${alias}.executor_id,
3131
${alias}.first_submit_time, ${alias}.delay_time, ${alias}.task_params, ${alias}.var_pool, ${alias}.dry_run, ${alias}.task_group_id, ${alias}.task_execute_type
3232
</sql>

dolphinscheduler-dao/src/main/resources/sql/dolphinscheduler_h2.sql

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -915,6 +915,7 @@ CREATE TABLE t_ds_task_instance
915915
host varchar(135) DEFAULT NULL,
916916
execute_path varchar(200) DEFAULT NULL,
917917
log_path longtext DEFAULT NULL,
918+
task_output_log_path longtext DEFAULT NULL,
918919
alert_flag tinyint(4) DEFAULT NULL,
919920
retry_times int(4) DEFAULT '0',
920921
pid int(4) DEFAULT NULL,

dolphinscheduler-dao/src/main/resources/sql/dolphinscheduler_mysql.sql

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -914,6 +914,7 @@ CREATE TABLE `t_ds_task_instance` (
914914
`host` varchar(135) DEFAULT NULL COMMENT 'host of task running on',
915915
`execute_path` varchar(200) DEFAULT NULL COMMENT 'task execute path in the host',
916916
`log_path` longtext DEFAULT NULL COMMENT 'task log path',
917+
`task_output_log_path` longtext DEFAULT NULL COMMENT 'task output log path',
917918
`alert_flag` tinyint(4) DEFAULT NULL COMMENT 'whether alert',
918919
`retry_times` int(4) DEFAULT '0' COMMENT 'task retry times',
919920
`pid` int(4) DEFAULT NULL COMMENT 'pid of task',

dolphinscheduler-dao/src/main/resources/sql/dolphinscheduler_postgresql.sql

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -834,6 +834,7 @@ CREATE TABLE t_ds_task_instance (
834834
host varchar(135) DEFAULT NULL ,
835835
execute_path varchar(200) DEFAULT NULL ,
836836
log_path text DEFAULT NULL ,
837+
task_output_log_path text DEFAULT NULL ,
837838
alert_flag int DEFAULT NULL ,
838839
retry_times int DEFAULT '0' ,
839840
pid int DEFAULT NULL ,

dolphinscheduler-dao/src/main/resources/sql/upgrade/3.4.1_schema/mysql/dolphinscheduler_ddl.sql

Lines changed: 19 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,4 +16,22 @@
1616
*/
1717

1818
ALTER TABLE `t_ds_serial_command`
19-
MODIFY COLUMN `workflow_definition_code` BIGINT(20) NOT NULL COMMENT 'workflow definition code';
19+
MODIFY COLUMN `workflow_definition_code` BIGINT(20) NOT NULL COMMENT 'workflow definition code';
20+
21+
drop PROCEDURE if EXISTS add_task_output_log_path_to_t_ds_task_instance;
22+
delimiter d//
23+
CREATE PROCEDURE add_task_output_log_path_to_t_ds_task_instance()
24+
BEGIN
25+
IF NOT EXISTS (SELECT 1 FROM INFORMATION_SCHEMA.COLUMNS
26+
WHERE TABLE_NAME='t_ds_task_instance'
27+
AND TABLE_SCHEMA=(SELECT DATABASE())
28+
AND COLUMN_NAME='task_output_log_path')
29+
THEN
30+
ALTER TABLE `t_ds_task_instance`
31+
ADD COLUMN `task_output_log_path` longtext DEFAULT NULL COMMENT 'task output log path' AFTER `log_path`;
32+
END IF;
33+
END;
34+
d//
35+
delimiter ;
36+
call add_task_output_log_path_to_t_ds_task_instance();
37+
drop PROCEDURE if EXISTS add_task_output_log_path_to_t_ds_task_instance;

dolphinscheduler-dao/src/main/resources/sql/upgrade/3.4.1_schema/postgresql/dolphinscheduler_ddl.sql

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,3 +18,6 @@
1818
CREATE SEQUENCE IF NOT EXISTS t_ds_task_instance_context_id_seq;
1919
ALTER TABLE t_ds_task_instance_context
2020
ALTER COLUMN id SET DEFAULT nextval('t_ds_task_instance_context_id_seq'::regclass);
21+
22+
ALTER TABLE t_ds_task_instance
23+
ADD COLUMN IF NOT EXISTS task_output_log_path text DEFAULT NULL;

dolphinscheduler-master/src/main/java/org/apache/dolphinscheduler/server/master/engine/task/execution/AbstractTaskInstanceFactory.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ protected TaskInstance cloneTaskInstance(TaskInstance originTaskInstance) {
5050
result.setEndTime(originTaskInstance.getEndTime());
5151
result.setHost(originTaskInstance.getHost());
5252
result.setExecutePath(originTaskInstance.getExecutePath());
53-
result.setTaskOutPutLogPath(originTaskInstance.getTaskOutPutLogPath());
53+
result.setTaskOutputLogPath(originTaskInstance.getTaskOutputLogPath());
5454
result.setLogPath(originTaskInstance.getLogPath());
5555
result.setRetryTimes(originTaskInstance.getRetryTimes());
5656
result.setAlertFlag(originTaskInstance.getAlertFlag());

0 commit comments

Comments
 (0)