From 9f5267c24649784bbb9e05aac819e1b968b5b075 Mon Sep 17 00:00:00 2001
From: xuxueli <931591021@qq.com>
Date: Sat, 28 Mar 2020 23:59:00 +0800
Subject: [PATCH] =?UTF-8?q?=E6=89=A7=E8=A1=8C=E5=99=A8=E4=BC=98=E9=9B=85?=
 =?UTF-8?q?=E5=81=9C=E6=9C=BA=E4=BC=98=E5=8C=96=EF=BC=8C=E4=BF=AE=E5=A4=8D?=
 =?UTF-8?q?=E4=BB=BB=E5=8A=A1=E7=BA=BF=E7=A8=8B=E4=B8=AD=E6=96=AD=E6=9C=AA?=
 =?UTF-8?q?join=E5=AF=BC=E8=87=B4=E5=9B=9E=E8=B0=83=E4=B8=A2=E5=A4=B1?=
 =?UTF-8?q?=E7=9A=84=E9=97=AE=E9=A2=98=EF=BC=9B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 doc/XXL-JOB官方文档.md                    | 15 +++++-----
 .../xxl/job/core/executor/XxlJobExecutor.java | 30 ++++++++-----------
 2 files changed, 21 insertions(+), 24 deletions(-)

diff --git a/doc/XXL-JOB官方文档.md b/doc/XXL-JOB官方文档.md
index ff0e96e2..94e10107 100644
--- a/doc/XXL-JOB官方文档.md
+++ b/doc/XXL-JOB官方文档.md
@@ -1716,13 +1716,14 @@ public ReturnT<String> execute(String param) {
 - 10、移除旧类注解JobHandler，推荐使用基于方法注解 "@XxlJob" 的方式进行任务开发；(如需保留类注解JobHandler使用方式，可以参考旧版逻辑定制开发);
 - 11、修复bootstrap.min.css.map 404问题；
 - 12、XxlJob注解扫描方式优化，支持查找父类以及接口和基于类代理等常见情况；
-- 13、[迭代中]自定义失败重试时间间隔；
-- 14、[迭代中]任务复制功能；点击复制是弹出新建任务弹框，并初始化被复制任务信息；
-- 15、[迭代中]新增执行器描述、任务描述属性；
-- 16、[迭代中]任务执行一次的时候指定IP；
-- 17、[迭代中]任务日志支持单个清理和状态转移，方便触发子任务；
-- 18、[迭代中]任务结果丢失处理：针对长期处于运行中的任务（设置过期时间时，运行超过"过期时间+1min"；未设置超时时间时，运行超过"30min"），主动检测该执行器是否在线，如果不在线主动标记失败；
-- 19、[迭代中]优雅停机回调丢失问题修复；
+- 13、执行器优雅停机优化，修复任务线程中断未join导致回调丢失的问题；
+- 14、[迭代中]自定义失败重试时间间隔；
+- 15、[迭代中]任务复制功能；点击复制是弹出新建任务弹框，并初始化被复制任务信息；
+- 16、[迭代中]新增执行器描述、任务描述属性；
+- 17、[迭代中]任务执行一次的时候指定IP；
+- 18、[迭代中]任务日志支持单个清理和状态转移，方便触发子任务；
+- 19、[迭代中]任务结果丢失处理：针对长期处于运行中的任务（设置过期时间时，运行超过"过期时间+1min"；未设置超时时间时，运行超过"30min"），主动检测该执行器是否在线，如果不在线主动标记失败；
+- 20、[迭代中]优雅停机回调丢失问题修复；
 
 
 ### TODO LIST
diff --git a/xxl-job-core/src/main/java/com/xxl/job/core/executor/XxlJobExecutor.java b/xxl-job-core/src/main/java/com/xxl/job/core/executor/XxlJobExecutor.java
index 242be6d4..be17f71c 100644
--- a/xxl-job-core/src/main/java/com/xxl/job/core/executor/XxlJobExecutor.java
+++ b/xxl-job-core/src/main/java/com/xxl/job/core/executor/XxlJobExecutor.java
@@ -84,33 +84,26 @@ public class XxlJobExecutor  {
         initRpcProvider(ip, port, appName, accessToken);
     }
     public void destroy(){
-
-        List<JobThread> runningThreads = new ArrayList<>(jobThreadRepository.values());
-        if (logger.isInfoEnabled()) {
-            logger.info("running threads {}", runningThreads);
-        }
-
         // destory executor-server
         stopRpcProvider();
 
         // destory jobThreadRepository
         if (jobThreadRepository.size() > 0) {
             for (Map.Entry<Integer, JobThread> item: jobThreadRepository.entrySet()) {
-                removeJobThread(item.getKey(), "web container destroy and kill the job.");
+                JobThread oldJobThread = removeJobThread(item.getKey(), "web container destroy and kill the job.");
+                // wait for job thread push result to callback queue
+                if (oldJobThread != null) {
+                    try {
+                        oldJobThread.join();
+                    } catch (InterruptedException e) {
+                        logger.error(">>>>>>>>>>> xxl-job, JobThread destroy(join) error, jobId:{}", item.getKey(), e);
+                    }
+                }
             }
             jobThreadRepository.clear();
         }
         jobHandlerRepository.clear();
 
-        for (JobThread runningThread : runningThreads) {
-            try {
-                // wait for all job thread push result to callback queue
-                runningThread.join();
-            } catch (InterruptedException e) {
-                logger.warn("interrupted while stopping {}", runningThread);
-                break;
-            }
-        }
 
         // destory JobLogFileCleanThread
         JobLogFileCleanThread.getInstance().toStop();
@@ -246,12 +239,15 @@ public class XxlJobExecutor  {
 
         return newJobThread;
     }
-    public static void removeJobThread(int jobId, String removeOldReason){
+    public static JobThread removeJobThread(int jobId, String removeOldReason){
         JobThread oldJobThread = jobThreadRepository.remove(jobId);
         if (oldJobThread != null) {
             oldJobThread.toStop(removeOldReason);
             oldJobThread.interrupt();
+
+            return oldJobThread;
         }
+        return null;
     }
     public static JobThread loadJobThread(int jobId){
         JobThread jobThread = jobThreadRepository.get(jobId);