失败任务重复执行

byit-myth-core/myth-admin-core/src/main/java/com/byit/service/impl/JobTaskRunLogAndJobTaskServiceImpl.java

@@ -35,6 +35,7 @@ public class JobTaskRunLogAndJobTaskServiceImpl implements JobTaskRunLogAndJobTa
         log.debug("-------------【{}节点失败重试------------------】",jobTaskRunLog);
         jobTaskRunLog.setFailedRemainingCount(jobTaskRunLog.getFailedRemainingCount()-1);
         jobTaskRunLog.setRunCount(jobTaskRunLog.getRunCount()+1);
+        jobTaskRunLog.setRunCode("0");
         jobTaskRunLogService.updateJobTaskRunLog(jobTaskRunLog);
 
         //查询节点

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

@@ -8,6 +8,7 @@ import com.byit.job.enums.JobResultEnum;
 import com.byit.model.JobTaskRunLogWithBLOBs;
 import com.byit.model.JobTaskSchedule;
 import com.byit.model.RunRecording;
+import com.byit.rpc.util.RpcException;
 import com.byit.service.RunScriptService;
 import com.byit.service.impl.JobTaskRunLogServiceImpl;
 import com.byit.service.impl.RunRecordingServiceImpl;
@@ -84,7 +85,15 @@ public class ScriptExecutorJobTask implements TimerTask {
         scriptDto.setRunId(mythJobTaskSchedule.getRunId());
         scriptDto.setRemotePath(mythJobTaskSchedule.getScriptUrls());
         scriptDto.setCallbackUrl("http://127.0.0.1:8998/job/callbackRes");
-        DispatchResponseDto dispatchResponseDto = runScriptService.runScript(scriptDto);
+        DispatchResponseDto dispatchResponseDto = new DispatchResponseDto();
+        try{
+            dispatchResponseDto = runScriptService.runScript(scriptDto);
+        }catch (RpcException rpcException){
+            dispatchResponseDto.setMsg(rpcException.getMessage());
+            dispatchResponseDto.setCode(JobResultEnum.DISPATCH_FAIL.getRes());
+            log.error("--------------执行机不存在----------------");
+        }
+
         saveLog(mythJobTaskSchedule,dispatchResponseDto);
     }
 
@@ -121,7 +130,7 @@ public class ScriptExecutorJobTask implements TimerTask {
             if (jobTaskRunLogById.getRunCount()>1) {
                 //上一次的执行日志
                 String runMsg = jobTaskRunLogById.getRunMsg();
-                jobTaskRunLog.setRunMsg(runMsg+"|"+"调度失败");
+                jobTaskRunLog.setRunMsg(runMsg+"|"+dispatchResponseDto.getMsg());
             }
         }
         //获取执行机地址

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

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