From 86acbcd77702bcec415c9ad484445657a72c556a Mon Sep 17 00:00:00 2001
From: chuan <lichuan@365rili.com>
Date: Sat, 24 Feb 2018 14:21:04 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E4=BB=BB=E5=8A=A1=E8=B6=85?=
 =?UTF-8?q?=E6=97=B6=E5=B1=9E=E6=80=A7=EF=BC=8C=E8=B6=85=E6=97=B6=E5=90=8E?=
 =?UTF-8?q?=E5=A4=B1=E8=B4=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 doc/db/tables_xxl_job.sql                     |  1 +
 .../xxl/job/admin/core/model/XxlJobInfo.java  | 11 ++++++
 .../core/thread/JobFailMonitorHelper.java     |  1 +
 .../job/admin/core/trigger/XxlJobTrigger.java |  3 ++
 .../main/resources/i18n/message.properties    |  2 ++
 .../main/resources/i18n/message_en.properties |  2 ++
 .../mybatis-mapper/XxlJobInfoMapper.xml       | 35 +++++++++++--------
 .../template/jobinfo/jobinfo.index.ftl        |  5 +++
 .../main/webapp/static/js/jobinfo.index.1.js  |  1 +
 .../main/webapp/static/js/joblog.index.1.js   |  2 ++
 .../com/xxl/job/core/biz/model/ReturnT.java   |  3 ++
 .../xxl/job/core/biz/model/TriggerParam.java  | 10 ++++++
 .../com/xxl/job/core/handler/IJobHandler.java |  2 ++
 .../com/xxl/job/core/thread/JobThread.java    | 29 +++++++++++++--
 14 files changed, 89 insertions(+), 18 deletions(-)

diff --git a/doc/db/tables_xxl_job.sql b/doc/db/tables_xxl_job.sql
index ed328959..606eb992 100644
--- a/doc/db/tables_xxl_job.sql
+++ b/doc/db/tables_xxl_job.sql
@@ -158,6 +158,7 @@ CREATE TABLE `XXL_JOB_QRTZ_TRIGGER_INFO` (
   `update_time` datetime DEFAULT NULL,
   `author` varchar(64) DEFAULT NULL COMMENT '作者',
   `alarm_email` varchar(255) DEFAULT NULL COMMENT '报警邮件',
+  `execute_timeout` int(11) NOT NULL DEFAULT 0 COMMENT '任务执行超时时间',
   `executor_route_strategy` varchar(50) DEFAULT NULL COMMENT '执行器路由策略',
   `executor_handler` varchar(255) DEFAULT NULL COMMENT '执行器任务handler',
   `executor_param` varchar(512) DEFAULT NULL COMMENT '执行器任务参数',
diff --git a/xxl-job-admin/src/main/java/com/xxl/job/admin/core/model/XxlJobInfo.java b/xxl-job-admin/src/main/java/com/xxl/job/admin/core/model/XxlJobInfo.java
index 51847ac1..01c5227f 100644
--- a/xxl-job-admin/src/main/java/com/xxl/job/admin/core/model/XxlJobInfo.java
+++ b/xxl-job-admin/src/main/java/com/xxl/job/admin/core/model/XxlJobInfo.java
@@ -36,6 +36,17 @@ public class XxlJobInfo {
 	// copy from quartz
 	private String jobStatus;		// 任务状态 【base on quartz】
 
+	private int executeTimeout;     // 任务最多执行时间，超时后报警
+
+	public int getExecuteTimeout() {
+		return executeTimeout;
+	}
+
+	public void setExecuteTimeout(int executeTimeout) {
+		this.executeTimeout = executeTimeout;
+	}
+
+
 	public int getId() {
 		return id;
 	}
diff --git a/xxl-job-admin/src/main/java/com/xxl/job/admin/core/thread/JobFailMonitorHelper.java b/xxl-job-admin/src/main/java/com/xxl/job/admin/core/thread/JobFailMonitorHelper.java
index 66a77346..1faa3984 100644
--- a/xxl-job-admin/src/main/java/com/xxl/job/admin/core/thread/JobFailMonitorHelper.java
+++ b/xxl-job-admin/src/main/java/com/xxl/job/admin/core/thread/JobFailMonitorHelper.java
@@ -63,6 +63,7 @@ public class JobFailMonitorHelper {
 									logger.info(">>>>>>>>>>> job monitor, job success, JobLogId:{}", jobLogId);
 								} else if (IJobHandler.FAIL.getCode() == log.getTriggerCode()
 										|| IJobHandler.FAIL.getCode() == log.getHandleCode()
+										|| IJobHandler.TIMEOUT.getCode() == log.getHandleCode()
 										|| IJobHandler.FAIL_RETRY.getCode() == log.getHandleCode() ) {
 									// job fail,
 									failAlarm(log);
diff --git a/xxl-job-admin/src/main/java/com/xxl/job/admin/core/trigger/XxlJobTrigger.java b/xxl-job-admin/src/main/java/com/xxl/job/admin/core/trigger/XxlJobTrigger.java
index a03d393c..76811ec2 100644
--- a/xxl-job-admin/src/main/java/com/xxl/job/admin/core/trigger/XxlJobTrigger.java
+++ b/xxl-job-admin/src/main/java/com/xxl/job/admin/core/trigger/XxlJobTrigger.java
@@ -96,6 +96,8 @@ public class XxlJobTrigger {
                     triggerParam.setGlueUpdatetime(jobInfo.getGlueUpdatetime().getTime());
                     triggerParam.setBroadcastIndex(i);
                     triggerParam.setBroadcastTotal(addressList.size()); // update02
+                    // 执行超时时间
+                    triggerParam.setExecuteTimeout(jobInfo.getExecuteTimeout());
 
                     // 4.2、trigger-run (route run / trigger remote executor)
                     triggerResult = runExecutor(triggerParam, address);     // update03
@@ -164,6 +166,7 @@ public class XxlJobTrigger {
                 triggerParam.setGlueUpdatetime(jobInfo.getGlueUpdatetime().getTime());
                 triggerParam.setBroadcastIndex(0);
                 triggerParam.setBroadcastTotal(1);
+                triggerParam.setExecuteTimeout(jobInfo.getExecuteTimeout());
 
                 // 4.2、trigger-run (route run / trigger remote executor)
                 triggerResult = executorRouteStrategyEnum.getRouter().routeRun(triggerParam, addressList);
diff --git a/xxl-job-admin/src/main/resources/i18n/message.properties b/xxl-job-admin/src/main/resources/i18n/message.properties
index 66c7aa9d..3972eafa 100644
--- a/xxl-job-admin/src/main/resources/i18n/message.properties
+++ b/xxl-job-admin/src/main/resources/i18n/message.properties
@@ -107,6 +107,7 @@ jobinfo_field_gluetype=运行模式
 jobinfo_field_executorparam=任务参数
 jobinfo_field_cron_unvalid=Cron格式非法
 jobinfo_field_author=负责人
+jobinfo_field_timeout=最大执行时间
 jobinfo_field_alarmemail=报警邮件
 jobinfo_field_alarmemail_placeholder=请输入报警邮件，多个邮件地址则逗号分隔
 jobinfo_field_executorRouteStrategy=路由策略
@@ -157,6 +158,7 @@ joblog_clean_type_9=清理所有日志数据
 joblog_clean_type_unvalid=清理类型参数异常
 joblog_handleCode_200=成功
 joblog_handleCode_500=失败
+joblog_handleCode_400=超时
 joblog_handleCode_501=失败重试
 joblog_kill_log=终止任务
 joblog_kill_log_limit=调度失败，无法终止日志
diff --git a/xxl-job-admin/src/main/resources/i18n/message_en.properties b/xxl-job-admin/src/main/resources/i18n/message_en.properties
index 9a8d14bd..e66b36d7 100644
--- a/xxl-job-admin/src/main/resources/i18n/message_en.properties
+++ b/xxl-job-admin/src/main/resources/i18n/message_en.properties
@@ -103,6 +103,7 @@ jobinfo_field_update=Edit Job
 jobinfo_field_id=Job ID
 jobinfo_field_jobgroup=Executor
 jobinfo_field_jobdesc=Job description
+jobinfo_field_timeout=Max execute time
 jobinfo_field_gluetype=GLUE Type
 jobinfo_field_executorparam=Param
 jobinfo_field_cron_unvalid=The Cron is illegal
@@ -157,6 +158,7 @@ joblog_clean_type_9=Clean up all log data
 joblog_clean_type_unvalid=Clean type is illegal
 joblog_handleCode_200=Success
 joblog_handleCode_500=Fail
+joblog_handleCode_400=Timeout
 joblog_handleCode_501=Fail retry
 joblog_kill_log=Kill Job
 joblog_kill_log_limit=Trigger Fail, can not kill job
diff --git a/xxl-job-admin/src/main/resources/mybatis-mapper/XxlJobInfoMapper.xml b/xxl-job-admin/src/main/resources/mybatis-mapper/XxlJobInfoMapper.xml
index b1fc6302..517e0697 100644
--- a/xxl-job-admin/src/main/resources/mybatis-mapper/XxlJobInfoMapper.xml
+++ b/xxl-job-admin/src/main/resources/mybatis-mapper/XxlJobInfoMapper.xml
@@ -1,18 +1,18 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" 
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 	"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.xxl.job.admin.dao.XxlJobInfoDao">
-	
+
 	<resultMap id="XxlJobInfo" type="com.xxl.job.admin.core.model.XxlJobInfo" >
 		<result column="id" property="id" />
-	
+
 		<result column="job_group" property="jobGroup" />
 	    <result column="job_cron" property="jobCron" />
 	    <result column="job_desc" property="jobDesc" />
-	    
+
 	    <result column="add_time" property="addTime" />
 	    <result column="update_time" property="updateTime" />
-	    
+
 	    <result column="author" property="author" />
 	    <result column="alarm_email" property="alarmEmail" />
 
@@ -21,11 +21,12 @@
 	    <result column="executor_param" property="executorParam" />
 		<result column="executor_block_strategy" property="executorBlockStrategy" />
 		<result column="executor_fail_strategy" property="executorFailStrategy" />
-	    
+
 	    <result column="glue_type" property="glueType" />
 	    <result column="glue_source" property="glueSource" />
 	    <result column="glue_remark" property="glueRemark" />
 		<result column="glue_updatetime" property="glueUpdatetime" />
+		<result column="execute_timeout" property="executeTimeout" />
 
 		<result column="child_jobid" property="childJobId" />
 	</resultMap>
@@ -48,9 +49,10 @@
 		t.glue_source,
 		t.glue_remark,
 		t.glue_updatetime,
+		t.execute_timeout,
 		t.child_jobid
 	</sql>
-	
+
 	<select id="pageList" parameterType="java.util.HashMap" resultMap="XxlJobInfo">
 		SELECT <include refid="Base_Column_List" />
 		FROM XXL_JOB_QRTZ_TRIGGER_INFO AS t
@@ -68,7 +70,7 @@
 		ORDER BY id DESC
 		LIMIT #{offset}, #{pagesize}
 	</select>
-	
+
 	<select id="pageListCount" parameterType="java.util.HashMap" resultType="int">
 		SELECT count(1)
 		FROM XXL_JOB_QRTZ_TRIGGER_INFO AS t
@@ -103,10 +105,11 @@
 			glue_source,
 			glue_remark,
 			glue_updatetime,
-			child_jobid
+			child_jobid,
+		    execute_timeout
 		) VALUES (
 			#{jobGroup},
-			#{jobCron}, 
+			#{jobCron},
 			#{jobDesc},
 			NOW(),
 			NOW(),
@@ -121,7 +124,8 @@
 			#{glueSource},
 			#{glueRemark},
 			NOW(),
-			#{childJobId}
+			#{childJobId},
+		    #{executeTimeout}
 		);
 		<!--<selectKey resultType="java.lang.Integer" order="AFTER" keyProperty="id">
 			SELECT LAST_INSERT_ID()
@@ -134,10 +138,10 @@
 		FROM XXL_JOB_QRTZ_TRIGGER_INFO AS t
 		WHERE t.id = #{id}
 	</select>
-	
+
 	<update id="update" parameterType="com.xxl.job.admin.core.model.XxlJobInfo" >
 		UPDATE XXL_JOB_QRTZ_TRIGGER_INFO
-		SET 
+		SET
 			job_cron = #{jobCron},
 			job_desc = #{jobDesc},
 			update_time = NOW(),
@@ -152,10 +156,11 @@
 			glue_source = #{glueSource},
 			glue_remark = #{glueRemark},
 			glue_updatetime = #{glueUpdatetime},
-			child_jobid = #{childJobId}
+			child_jobid = #{childJobId},
+			execute_timeout = ${executeTimeout}
 		WHERE id = #{id}
 	</update>
-	
+
 	<delete id="delete" parameterType="java.util.HashMap">
 		DELETE
 		FROM XXL_JOB_QRTZ_TRIGGER_INFO
diff --git a/xxl-job-admin/src/main/webapp/WEB-INF/template/jobinfo/jobinfo.index.ftl b/xxl-job-admin/src/main/webapp/WEB-INF/template/jobinfo/jobinfo.index.ftl
index cd9a2c96..ac3ddb27 100644
--- a/xxl-job-admin/src/main/webapp/WEB-INF/template/jobinfo/jobinfo.index.ftl
+++ b/xxl-job-admin/src/main/webapp/WEB-INF/template/jobinfo/jobinfo.index.ftl
@@ -169,6 +169,11 @@
 						<div class="col-sm-4"><input type="text" class="form-control" name="alarmEmail" placeholder="${I18n.jobinfo_field_alarmemail_placeholder}" maxlength="100" ></div>
 					</div>
 
+					<div class="form-group">
+						<label for="lastname" class="col-sm-2 control-label">${I18n.jobinfo_field_timeout}<font color="red">*</font></label>
+						<div class="col-sm-4"><input type="text" class="form-control" name="executeTimeout" placeholder="0" maxlength="100" ></div>
+					</div>
+
                     <hr>
 					<div class="form-group">
 						<div class="col-sm-offset-3 col-sm-6">
diff --git a/xxl-job-admin/src/main/webapp/static/js/jobinfo.index.1.js b/xxl-job-admin/src/main/webapp/static/js/jobinfo.index.1.js
index dbaf734e..7ad5f090 100644
--- a/xxl-job-admin/src/main/webapp/static/js/jobinfo.index.1.js
+++ b/xxl-job-admin/src/main/webapp/static/js/jobinfo.index.1.js
@@ -362,6 +362,7 @@ $(function() {
 		$("#updateModal .form input[name='jobCron']").val( row.jobCron );
 		$("#updateModal .form input[name='author']").val( row.author );
 		$("#updateModal .form input[name='alarmEmail']").val( row.alarmEmail );
+		$("#updateModal .form input[name='executeTimeout']").val( row.executeTimeout );
 		$('#updateModal .form select[name=executorRouteStrategy] option[value='+ row.executorRouteStrategy +']').prop('selected', true);
 		$("#updateModal .form input[name='executorHandler']").val( row.executorHandler );
 		$("#updateModal .form input[name='executorParam']").val( row.executorParam );
diff --git a/xxl-job-admin/src/main/webapp/static/js/joblog.index.1.js b/xxl-job-admin/src/main/webapp/static/js/joblog.index.1.js
index d195241b..d2fa9f6f 100644
--- a/xxl-job-admin/src/main/webapp/static/js/joblog.index.1.js
+++ b/xxl-job-admin/src/main/webapp/static/js/joblog.index.1.js
@@ -159,6 +159,8 @@ $(function() {
                                 html = '<span style="color: red">'+ I18n.joblog_handleCode_500 +'</span>';
                             } else if (data == 501) {
                                 html = '<span style="color: red">'+ I18n.joblog_handleCode_501 +'</span>';
+                            } else if (data == 400) {
+                                html = '<span style="color: red">'+ I18n.joblog_handleCode_400 +'</span>';
                             } else if (data == 0) {
                                 html = '';
                             }
diff --git a/xxl-job-core/src/main/java/com/xxl/job/core/biz/model/ReturnT.java b/xxl-job-core/src/main/java/com/xxl/job/core/biz/model/ReturnT.java
index 112385ee..4c7d8e77 100644
--- a/xxl-job-core/src/main/java/com/xxl/job/core/biz/model/ReturnT.java
+++ b/xxl-job-core/src/main/java/com/xxl/job/core/biz/model/ReturnT.java
@@ -12,8 +12,11 @@ public class ReturnT<T> implements Serializable {
 
 	public static final int SUCCESS_CODE = 200;
 	public static final int FAIL_CODE = 500;
+	public static final int EXECUTE_TIMEOUT = 400;
+
 	public static final ReturnT<String> SUCCESS = new ReturnT<String>(null);
 	public static final ReturnT<String> FAIL = new ReturnT<String>(FAIL_CODE, null);
+	public static final ReturnT<String> TIMEOUT = new ReturnT<String>(EXECUTE_TIMEOUT, "执行超时");
 	
 	private int code;
 	private String msg;
diff --git a/xxl-job-core/src/main/java/com/xxl/job/core/biz/model/TriggerParam.java b/xxl-job-core/src/main/java/com/xxl/job/core/biz/model/TriggerParam.java
index 448f03bd..fa3fb314 100644
--- a/xxl-job-core/src/main/java/com/xxl/job/core/biz/model/TriggerParam.java
+++ b/xxl-job-core/src/main/java/com/xxl/job/core/biz/model/TriggerParam.java
@@ -24,6 +24,16 @@ public class TriggerParam implements Serializable{
     private int broadcastIndex;
     private int broadcastTotal;
 
+    private int executeTimeout;
+
+    public int getExecuteTimeout() {
+        return executeTimeout;
+    }
+
+    public void setExecuteTimeout(int executeTimeout) {
+        this.executeTimeout = executeTimeout;
+    }
+
     public int getJobId() {
         return jobId;
     }
diff --git a/xxl-job-core/src/main/java/com/xxl/job/core/handler/IJobHandler.java b/xxl-job-core/src/main/java/com/xxl/job/core/handler/IJobHandler.java
index fd1d0b12..5c553c74 100644
--- a/xxl-job-core/src/main/java/com/xxl/job/core/handler/IJobHandler.java
+++ b/xxl-job-core/src/main/java/com/xxl/job/core/handler/IJobHandler.java
@@ -14,6 +14,8 @@ public abstract class IJobHandler {
 	public static final ReturnT<String> SUCCESS = new ReturnT<String>(200, null);
 	/** fail */
 	public static final ReturnT<String> FAIL = new ReturnT<String>(500, null);
+	/** timeout */
+	public static final ReturnT<String> TIMEOUT = new ReturnT<String>(400, null);
 	/** fail retry */
 	public static final ReturnT<String> FAIL_RETRY = new ReturnT<String>(501, null);
 
diff --git a/xxl-job-core/src/main/java/com/xxl/job/core/thread/JobThread.java b/xxl-job-core/src/main/java/com/xxl/job/core/thread/JobThread.java
index e6d03967..0d33e19e 100644
--- a/xxl-job-core/src/main/java/com/xxl/job/core/thread/JobThread.java
+++ b/xxl-job-core/src/main/java/com/xxl/job/core/thread/JobThread.java
@@ -16,8 +16,7 @@ import java.io.PrintWriter;
 import java.io.StringWriter;
 import java.util.Arrays;
 import java.util.Date;
-import java.util.concurrent.LinkedBlockingQueue;
-import java.util.concurrent.TimeUnit;
+import java.util.concurrent.*;
 
 /**
  * handler thread
@@ -106,6 +105,7 @@ public class JobThread extends Thread{
 
             TriggerParam triggerParam = null;
             ReturnT<String> executeResult = null;
+			ExecutorService singleThread = Executors.newSingleThreadExecutor();
             try {
 				// to check toStop signal, we need cycle, so wo cannot use queue.take(), instand of poll(timeout)
 				triggerParam = triggerQueue.poll(3L, TimeUnit.SECONDS);
@@ -121,7 +121,27 @@ public class JobThread extends Thread{
 
 					// execute
 					XxlJobLogger.log("<br>----------- xxl-job job execute start -----------<br>----------- Param:" + triggerParam.getExecutorParams());
-					executeResult = handler.execute(triggerParam.getExecutorParams());
+					int executeTimeout = triggerParam.getExecuteTimeout();
+
+
+					final TriggerParam finalTriggerParam = triggerParam;
+
+					Future<ReturnT<String>> future = singleThread.submit(new Callable<ReturnT<String>>() {
+						@Override
+						public ReturnT<String> call() throws Exception {
+							return handler.execute(finalTriggerParam.getExecutorParams());
+						}
+					});
+
+					try {
+						if (executeTimeout > 0) {
+							executeResult = future.get(executeTimeout, TimeUnit.SECONDS);
+						} else {
+							executeResult = future.get();
+						}
+					} catch (TimeoutException timeoutException) {
+						executeResult = ReturnT.TIMEOUT;
+					}
 					if (executeResult == null) {
 						executeResult = IJobHandler.FAIL;
 					}
@@ -144,6 +164,9 @@ public class JobThread extends Thread{
 
 				XxlJobLogger.log("<br>----------- JobThread Exception:" + errorMsg + "<br>----------- xxl-job job execute end(error) -----------");
 			} finally {
+            	if (singleThread != null) {
+            		singleThread.shutdown();
+				}
                 if(triggerParam != null) {
                     // callback handler info
                     if (!toStop) {
-- 
GitLab