From ddd79711dee736624af8658e52cbf072e0bacaa9 Mon Sep 17 00:00:00 2001 From: srzou Date: Sun, 29 Sep 2024 09:28:15 +0800 Subject: [PATCH] =?UTF-8?q?fix:(1.2.0-beta2):=20=E4=BF=AE=E5=A4=8D?= =?UTF-8?q?=E9=AB=98=E5=B9=B6=E5=8F=91=E5=9C=BA=E6=99=AF=E4=B8=8B=EF=BC=8C?= =?UTF-8?q?=E5=AE=9A=E6=97=B6=E4=BB=BB=E5=8A=A1=E5=9B=A0=E8=B6=85=E6=97=B6?= =?UTF-8?q?=E6=88=96=E6=89=8B=E5=8A=A8=E5=81=9C=E6=AD=A2=EF=BC=8C=E5=AF=BC?= =?UTF-8?q?=E8=87=B4=E7=9A=84=E5=BC=82=E5=B8=B8=E9=87=8D=E8=AF=95=E9=97=AE?= =?UTF-8?q?=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../job/core/executor/JobExecutorFutureCallback.java | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/snail-job-client/snail-job-client-job-core/src/main/java/com/aizuda/snailjob/client/job/core/executor/JobExecutorFutureCallback.java b/snail-job-client/snail-job-client-job-core/src/main/java/com/aizuda/snailjob/client/job/core/executor/JobExecutorFutureCallback.java index b9574b19..dd10d2cf 100644 --- a/snail-job-client/snail-job-client-job-core/src/main/java/com/aizuda/snailjob/client/job/core/executor/JobExecutorFutureCallback.java +++ b/snail-job-client/snail-job-client-job-core/src/main/java/com/aizuda/snailjob/client/job/core/executor/JobExecutorFutureCallback.java @@ -104,6 +104,10 @@ public class JobExecutorFutureCallback implements FutureCallback @Override public void onFailure(final Throwable t) { + if (t instanceof CancellationException) { + SnailJobLog.LOCAL.debug("任务已经被取消，不做状态回传"); + return; + } ExecuteResult failure = ExecuteResult.failure(); try { // 初始化调度信息（日志上报LogUtil） @@ -111,12 +115,7 @@ public class JobExecutorFutureCallback implements FutureCallback // 上报执行失败 SnailJobLog.REMOTE.error("任务执行失败 taskBatchId:[{}]", jobContext.getTaskBatchId(), t); - - if (t instanceof CancellationException) { - failure.setMessage("任务被取消"); - } else { - failure.setMessage(t.getMessage()); - } + failure.setMessage(t.getMessage()); CLIENT.dispatchResult( buildDispatchJobResultRequest(failure, JobTaskStatusEnum.FAIL.getStatus())