From fa1b5b97b624e79caab95abb7fc96ebf7a9f2f32 Mon Sep 17 00:00:00 2001 From: tjq Date: Wed, 1 Jul 2020 22:06:21 +0800 Subject: [PATCH] [fix] fix the uncorrect log output --- .../kfcfans/powerjob/worker/actors/ProcessorTrackerActor.java | 4 +--- .../worker/core/tracker/processor/ProcessorTracker.java | 4 ++-- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/powerjob-worker/src/main/java/com/github/kfcfans/powerjob/worker/actors/ProcessorTrackerActor.java b/powerjob-worker/src/main/java/com/github/kfcfans/powerjob/worker/actors/ProcessorTrackerActor.java index 3df267c7..e30779cb 100644 --- a/powerjob-worker/src/main/java/com/github/kfcfans/powerjob/worker/actors/ProcessorTrackerActor.java +++ b/powerjob-worker/src/main/java/com/github/kfcfans/powerjob/worker/actors/ProcessorTrackerActor.java @@ -59,9 +59,7 @@ public class ProcessorTrackerActor extends AbstractActor { Long instanceId = req.getInstanceId(); List removedPts = ProcessorTrackerPool.removeProcessorTracker(instanceId); - if (CollectionUtils.isEmpty(removedPts)) { - log.warn("[ProcessorTrackerActor] ProcessorTracker for instance(instanceId={}) already destroyed.", instanceId); - }else { + if (!CollectionUtils.isEmpty(removedPts)) { removedPts.forEach(ProcessorTracker::destroy); } } diff --git a/powerjob-worker/src/main/java/com/github/kfcfans/powerjob/worker/core/tracker/processor/ProcessorTracker.java b/powerjob-worker/src/main/java/com/github/kfcfans/powerjob/worker/core/tracker/processor/ProcessorTracker.java index 2fd99c0e..e9957127 100644 --- a/powerjob-worker/src/main/java/com/github/kfcfans/powerjob/worker/core/tracker/processor/ProcessorTracker.java +++ b/powerjob-worker/src/main/java/com/github/kfcfans/powerjob/worker/core/tracker/processor/ProcessorTracker.java @@ -65,7 +65,7 @@ public class ProcessorTracker { private static final int THREAD_POOL_QUEUE_MAX_SIZE = 100; // 长时间空闲的 ProcessorTracker 会发起销毁请求 - private static final long MAX_IDLE_TIME = 120000; + private static final long MAX_IDLE_TIME = 300000; // 当 ProcessorTracker 出现根本性错误(比如 Processor 创建失败,所有的任务直接失败) private boolean lethal = false; @@ -179,7 +179,7 @@ public class ProcessorTracker { statusReportRetryQueue.clear(); ProcessorTrackerPool.removeProcessorTracker(instanceId); - log.info("[ProcessorTracker-{}] ProcessorTracker already destroyed!", instanceId); + log.info("[ProcessorTracker-{}] ProcessorTracker destroyed successfully!", instanceId); // 3. 关闭定时线程池 CommonUtils.executeIgnoreException(() -> timingPool.shutdownNow());