|
|
@@ -50,7 +50,7 @@ public class ExecutorBizImpl implements ExecutorBiz {
|
|
50
|
50
|
// kill handlerThread, and create new one
|
|
51
|
51
|
JobThread jobThread = XxlJobExecutor.loadJobThread(jobId);
|
|
52
|
52
|
if (jobThread != null) {
|
|
53
|
|
- XxlJobExecutor.removeJobThread(jobId, "人工手动终止");
|
|
|
53
|
+ XxlJobExecutor.removeJobThread(jobId, "scheduling center kill job.");
|
|
54
|
54
|
return ReturnT.SUCCESS;
|
|
55
|
55
|
}
|
|
56
|
56
|
|
|
|
@@ -83,7 +83,7 @@ public class ExecutorBizImpl implements ExecutorBiz {
|
|
83
|
83
|
// valid old jobThread
|
|
84
|
84
|
if (jobThread!=null && jobHandler != newJobHandler) {
|
|
85
|
85
|
// change handler, need kill old thread
|
|
86
|
|
- removeOldReason = "更换JobHandler或更换任务模式,终止旧任务线程";
|
|
|
86
|
+ removeOldReason = "change jobhandler or glue type, and terminate the old job thread.";
|
|
87
|
87
|
|
|
88
|
88
|
jobThread = null;
|
|
89
|
89
|
jobHandler = null;
|
|
|
@@ -104,7 +104,7 @@ public class ExecutorBizImpl implements ExecutorBiz {
|
|
104
|
104
|
!(jobThread.getHandler() instanceof GlueJobHandler
|
|
105
|
105
|
&& ((GlueJobHandler) jobThread.getHandler()).getGlueUpdatetime()==triggerParam.getGlueUpdatetime() )) {
|
|
106
|
106
|
// change handler or gluesource updated, need kill old thread
|
|
107
|
|
- removeOldReason = "更新任务逻辑或更换任务模式,终止旧任务线程";
|
|
|
107
|
+ removeOldReason = "change job source or glue type, and terminate the old job thread.";
|
|
108
|
108
|
|
|
109
|
109
|
jobThread = null;
|
|
110
|
110
|
jobHandler = null;
|
|
|
@@ -127,7 +127,7 @@ public class ExecutorBizImpl implements ExecutorBiz {
|
|
127
|
127
|
!(jobThread.getHandler() instanceof ScriptJobHandler
|
|
128
|
128
|
&& ((ScriptJobHandler) jobThread.getHandler()).getGlueUpdatetime()==triggerParam.getGlueUpdatetime() )) {
|
|
129
|
129
|
// change script or gluesource updated, need kill old thread
|
|
130
|
|
- removeOldReason = "更新任务逻辑或更换任务模式,终止旧任务线程";
|
|
|
130
|
+ removeOldReason = "change job source or glue type, and terminate the old job thread.";
|
|
131
|
131
|
|
|
132
|
132
|
jobThread = null;
|
|
133
|
133
|
jobHandler = null;
|
|
|
@@ -147,12 +147,12 @@ public class ExecutorBizImpl implements ExecutorBiz {
|
|
147
|
147
|
if (ExecutorBlockStrategyEnum.DISCARD_LATER == blockStrategy) {
|
|
148
|
148
|
// discard when running
|
|
149
|
149
|
if (jobThread.isRunningOrHasQueue()) {
|
|
150
|
|
- return new ReturnT<String>(ReturnT.FAIL_CODE, "阻塞处理策略-生效:"+ExecutorBlockStrategyEnum.DISCARD_LATER.getTitle());
|
|
|
150
|
+ return new ReturnT<String>(ReturnT.FAIL_CODE, "block strategy effect:"+ExecutorBlockStrategyEnum.DISCARD_LATER.getTitle());
|
|
151
|
151
|
}
|
|
152
|
152
|
} else if (ExecutorBlockStrategyEnum.COVER_EARLY == blockStrategy) {
|
|
153
|
153
|
// kill running jobThread
|
|
154
|
154
|
if (jobThread.isRunningOrHasQueue()) {
|
|
155
|
|
- removeOldReason = "阻塞处理策略-生效:" + ExecutorBlockStrategyEnum.COVER_EARLY.getTitle();
|
|
|
155
|
+ removeOldReason = "block strategy effect:" + ExecutorBlockStrategyEnum.COVER_EARLY.getTitle();
|
|
156
|
156
|
|
|
157
|
157
|
jobThread = null;
|
|
158
|
158
|
}
|