kill功能任务重复错误重试BUG

byit-myth-core/myth-admin-core/src/main/java/com/byit/task/ScriptExecutorJobTask.java

@@ -172,9 +172,9 @@ public class ScriptExecutorJobTask implements TimerTask {
         if (jobTaskRunLogById.getRunCount()>1) {
             //第一次调度的日志
             String triggerMsg = jobTaskRunLogById.getTriggerMsg();
-            jobTaskRunLog.setTriggerMsg(triggerMsg+"| 节点被kill");
+            jobTaskRunLog.setTriggerMsg(triggerMsg+"| 工作流被kill");
         }else{
-            jobTaskRunLog.setTriggerMsg("节点被kill");
+            jobTaskRunLog.setTriggerMsg("工作流被kill");
         }
 
         jobTaskRunLog.setLogId(mythJobTaskSchedule.getLogId());
@@ -187,12 +187,13 @@ public class ScriptExecutorJobTask implements TimerTask {
         Date thisTime = new Date();
         jobTaskRunLog.setStartTime(thisTime);
         jobTaskRunLog.setEndTime(thisTime);
+        jobTaskRunLog.setFailedRemainingCount(0);
         jobTaskRunLog.setRunCode(NodeRunStatusPropertyEnum.RUN_FAILURE.getCode());
         jobTaskRunLog.setAlertEnd(EmailEnum.IS_ALARM_NO.getCode());
         if (jobTaskRunLogById.getRunCount()>1) {
             //上一次的执行日志
             String runMsg = jobTaskRunLogById.getRunMsg();
-            jobTaskRunLog.setRunMsg(runMsg+"|任务节点被kill！");
+            jobTaskRunLog.setRunMsg(runMsg+"|工作流被kill！");
         }
         jobTaskRunLogService.updateJobTaskRunLogWithBLOBs(jobTaskRunLog);
         log.info("-----------saveLog--保存脚本调度日志结束------------");

byit-myth-core/myth-admin-core/src/main/java/com/byit/thread/helper/TaskThreadRunHelper.java

@@ -230,7 +230,7 @@ public class TaskThreadRunHelper extends BaseThreadRunHelper {
         }
         for (JobTaskRunLog jobTaskRunLog : errorJobLog) {
             //失败重试次数大于0 而且错误原因不是上级节点执行失败
-            if(jobTaskRunLog.getFailedRemainingCount()>0 && !("6".equals(jobTaskRunLog.getRunCode()))){
+            if(jobTaskRunLog.getFailedRemainingCount()>0 && !("6".equals(jobTaskRunLog.getRunCode()) && "5".equals(jobTaskRunLog.getRunCode()))){
                 log.debug("----------------【{}节点没有重试完毕】----------------",jobTaskRunLog);
                 return false;
             }

byit-myth-core/myth-admin-core/src/main/resources/mapper/JobTaskRunLogMapper.xml

@@ -65,7 +65,7 @@
   <select id="findErrorNode" resultMap="BaseResultMap">
     select <include refid="Base_Column_List" />
     from job_task_run_log
-    where (run_code != '6' || run_code != '5') and (run_code = '2' || run_code = '4') and failed_remaining_count > 0
+    where  (run_code = '2' || run_code = '4') and failed_remaining_count > 0
     and is_virtual = '1'
   </select>
 

byit-myth-executor/myth-executor-server/src/main/java/com/byit/service/ScriptExecutorServiceImpl.java

@@ -133,6 +133,9 @@ public class ScriptExecutorServiceImpl implements ScriptExecutorService {
 
             if(exitCode == 0){
                 jobRunResultDto.setReturnResult(ReturnResult.SUCCESS);
+            }else if(exitCode == -100){
+                ReturnResult returnResult = new ReturnResult("5","节点被kill!");
+                jobRunResultDto.setReturnResult(returnResult);
             }else{
                 jobRunResultDto.setReturnResult(ReturnResult.FAIL);
             }