refactor-worker merge to dev bug fix

This commit is contained in:
qiaozhanwei 2020-04-03 12:35:56 +08:00
parent 1f43925c12
commit be1494fd7f
2 changed files with 5 additions and 7 deletions

View File

@ -66,12 +66,7 @@
</select>
<select id="queryProcessInstanceListPaging" resultType="org.apache.dolphinscheduler.dao.entity.ProcessInstance">
select instance.id, instance.name, instance.process_definition_id, instance.state, instance.recovery, instance.start_time,
instance.end_time, instance.run_times, instance.host, instance.command_type, instance.command_param, instance.task_depend_type,
instance.max_try_times, instance.failure_strategy, instance.warning_type, instance.warning_group_id, instance.schedule_time,
instance.command_start_time, instance.global_params, instance.flag, instance.is_sub_process, instance.executor_id,
instance.history_cmd, instance.dependence_schedule_times, instance.process_instance_priority, instance.worker_group_id,
instance.timeout, instance.tenant_id, instance.update_time
select instance.*
from t_ds_process_instance instance
join t_ds_process_definition define ON instance.process_definition_id = define.id
where 1=1

View File

@ -31,4 +31,7 @@
#worker.reserved.memory=0.3
# worker listener port
#worker.listen.port: 1234
#worker.listen.port: 1234
# default worker group
#worker.group=default