ak
/
xx-job
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

失败处理策略

This commit is contained in:
xueli.xue 2017-05-09 14:52:44 +08:00
parent 370c816355
commit 8600f883e2
1 changed files with 16 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
xxl-job-admin/src/main/java/com/xxl/job/admin/core/jobbean/RemoteHttpJobBean.java
View File

@ -1,5 +1,6 @@
package com.xxl.job.admin.core.jobbean; package com.xxl.job.admin.core.jobbean;
import com.xxl.job.admin.core.enums.ExecutorFailStrategyEnum;
import com.xxl.job.admin.core.model.XxlJobGroup; import com.xxl.job.admin.core.model.XxlJobGroup;
import com.xxl.job.admin.core.model.XxlJobInfo; import com.xxl.job.admin.core.model.XxlJobInfo;
import com.xxl.job.admin.core.model.XxlJobLog; import com.xxl.job.admin.core.model.XxlJobLog;
@ -70,6 +71,15 @@ public class RemoteHttpJobBean extends QuartzJobBean {
// do trigger // do trigger
ReturnT<String> triggerResult = doTrigger(triggerParam, jobInfo, jobLog); ReturnT<String> triggerResult = doTrigger(triggerParam, jobInfo, jobLog);
// fail retry
if (triggerResult.getCode()==ReturnT.FAIL_CODE &&
ExecutorFailStrategyEnum.match(jobInfo.getExecutorFailStrategy(), null) == ExecutorFailStrategyEnum.FAIL_RETRY) {
ReturnT<String> retryTriggerResult = doTrigger(triggerParam, jobInfo, jobLog);
triggerResult.setCode(retryTriggerResult.getCode());
triggerResult.setMsg(triggerResult.getMsg() + "<br><br><span style=\"color:#F39C12;\" > >>>>>>>>>>>失败重试<<<<<<<<<<< </span><br><br>" +retryTriggerResult.getMsg());
}
// log part-2 // log part-2
jobLog.setTriggerCode(triggerResult.getCode()); jobLog.setTriggerCode(triggerResult.getCode());
jobLog.setTriggerMsg(triggerResult.getMsg()); jobLog.setTriggerMsg(triggerResult.getMsg());
@ -97,7 +107,7 @@ public class RemoteHttpJobBean extends QuartzJobBean {
} }
triggerSb.append("<br>地址列表：").append(addressList!=null?addressList.toString():""); triggerSb.append("<br>地址列表：").append(addressList!=null?addressList.toString():"");
if (CollectionUtils.isEmpty(addressList)) { if (CollectionUtils.isEmpty(addressList)) {
triggerSb.append("<hr>调度失败：").append("执行器地址为空"); triggerSb.append("<br>----------------------<br>").append("调度失败：").append("执行器地址为空");
return new ReturnT<String>(ReturnT.FAIL_CODE, triggerSb.toString()); return new ReturnT<String>(ReturnT.FAIL_CODE, triggerSb.toString());
} }
@ -107,7 +117,7 @@ public class RemoteHttpJobBean extends QuartzJobBean {
jobLog.setExecutorAddress(address); jobLog.setExecutorAddress(address);
ReturnT<String> runResult = runExecutor(triggerParam, address); ReturnT<String> runResult = runExecutor(triggerParam, address);
triggerSb.append("<hr>").append(runResult.getMsg()); triggerSb.append("<br>----------------------<br>").append(runResult.getMsg());
return new ReturnT<String>(runResult.getCode(), triggerSb.toString()); return new ReturnT<String>(runResult.getCode(), triggerSb.toString());
} else { } else {
@ -115,7 +125,7 @@ public class RemoteHttpJobBean extends QuartzJobBean {
ExecutorRouteStrategyEnum executorRouteStrategyEnum = ExecutorRouteStrategyEnum.match(jobInfo.getExecutorRouteStrategy(), null); ExecutorRouteStrategyEnum executorRouteStrategyEnum = ExecutorRouteStrategyEnum.match(jobInfo.getExecutorRouteStrategy(), null);
triggerSb.append("<br>路由策略：").append(executorRouteStrategyEnum!=null?(executorRouteStrategyEnum.name() + "-" + executorRouteStrategyEnum.getTitle()):null); triggerSb.append("<br>路由策略：").append(executorRouteStrategyEnum!=null?(executorRouteStrategyEnum.name() + "-" + executorRouteStrategyEnum.getTitle()):null);
if (executorRouteStrategyEnum == null) { if (executorRouteStrategyEnum == null) {
triggerSb.append("<hr>调度失败：").append("执行器路由策略为空"); triggerSb.append("<br>----------------------<br>").append("调度失败：").append("执行器路由策略为空");
return new ReturnT<String>(ReturnT.FAIL_CODE, triggerSb.toString()); return new ReturnT<String>(ReturnT.FAIL_CODE, triggerSb.toString());
} }
@ -126,20 +136,20 @@ public class RemoteHttpJobBean extends QuartzJobBean {
// run // run
ReturnT<String> runResult = runExecutor(triggerParam, address); ReturnT<String> runResult = runExecutor(triggerParam, address);
triggerSb.append("<hr>").append(runResult.getMsg()); triggerSb.append("<br>----------------------<br>").append(runResult.getMsg());
return new ReturnT<String>(runResult.getCode(), triggerSb.toString()); return new ReturnT<String>(runResult.getCode(), triggerSb.toString());
} else { } else {
for (String address : addressList) { for (String address : addressList) {
// beat // beat
ReturnT<String> beatResult = beatExecutor(address); ReturnT<String> beatResult = beatExecutor(address);
triggerSb.append("<hr>").append(beatResult.getMsg()); triggerSb.append("<br>----------------------<br>").append(beatResult.getMsg());
if (beatResult.getCode() == ReturnT.SUCCESS_CODE) { if (beatResult.getCode() == ReturnT.SUCCESS_CODE) {
jobLog.setExecutorAddress(address); jobLog.setExecutorAddress(address);
ReturnT<String> runResult = runExecutor(triggerParam, address); ReturnT<String> runResult = runExecutor(triggerParam, address);
triggerSb.append("<hr>").append(runResult.getMsg()); triggerSb.append("<br>----------------------<br>").append(runResult.getMsg());
return new ReturnT<String>(runResult.getCode(), triggerSb.toString()); return new ReturnT<String>(runResult.getCode(), triggerSb.toString());
} }