|
|
|
|
@ -28,11 +28,11 @@ public class ExecutorBizImpl implements ExecutorBiz {
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
@Override
|
|
|
|
|
public ReturnT<String> idleBeat(IdleBeatParam idleBeatParam) {
|
|
|
|
|
public ReturnT<String> idleBeat(IdleBeatRequest idleBeatRequest) {
|
|
|
|
|
|
|
|
|
|
// isRunningOrHasQueue
|
|
|
|
|
boolean isRunningOrHasQueue = false;
|
|
|
|
|
JobThread jobThread = XxlJobExecutor.loadJobThread(idleBeatParam.getJobId());
|
|
|
|
|
JobThread jobThread = XxlJobExecutor.loadJobThread(idleBeatRequest.getJobId());
|
|
|
|
|
if (jobThread != null && jobThread.isRunningOrHasQueue()) {
|
|
|
|
|
isRunningOrHasQueue = true;
|
|
|
|
|
}
|
|
|
|
|
@ -44,18 +44,18 @@ public class ExecutorBizImpl implements ExecutorBiz {
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
@Override
|
|
|
|
|
public ReturnT<String> run(TriggerParam triggerParam) {
|
|
|
|
|
public ReturnT<String> run(TriggerRequest triggerRequest) {
|
|
|
|
|
// load old：jobHandler + jobThread
|
|
|
|
|
JobThread jobThread = XxlJobExecutor.loadJobThread(triggerParam.getJobId());
|
|
|
|
|
JobThread jobThread = XxlJobExecutor.loadJobThread(triggerRequest.getJobId());
|
|
|
|
|
IJobHandler jobHandler = jobThread!=null?jobThread.getHandler():null;
|
|
|
|
|
String removeOldReason = null;
|
|
|
|
|
|
|
|
|
|
// valid：jobHandler + jobThread
|
|
|
|
|
GlueTypeEnum glueTypeEnum = GlueTypeEnum.match(triggerParam.getGlueType());
|
|
|
|
|
GlueTypeEnum glueTypeEnum = GlueTypeEnum.match(triggerRequest.getGlueType());
|
|
|
|
|
if (GlueTypeEnum.BEAN == glueTypeEnum) {
|
|
|
|
|
|
|
|
|
|
// new jobhandler
|
|
|
|
|
IJobHandler newJobHandler = XxlJobExecutor.loadJobHandler(triggerParam.getExecutorHandler());
|
|
|
|
|
IJobHandler newJobHandler = XxlJobExecutor.loadJobHandler(triggerRequest.getExecutorHandler());
|
|
|
|
|
|
|
|
|
|
// valid old jobThread
|
|
|
|
|
if (jobThread!=null && jobHandler != newJobHandler) {
|
|
|
|
|
@ -70,7 +70,7 @@ public class ExecutorBizImpl implements ExecutorBiz {
|
|
|
|
|
if (jobHandler == null) {
|
|
|
|
|
jobHandler = newJobHandler;
|
|
|
|
|
if (jobHandler == null) {
|
|
|
|
|
return ReturnT.ofFail( "job handler [" + triggerParam.getExecutorHandler() + "] not found.");
|
|
|
|
|
return ReturnT.ofFail( "job handler [" + triggerRequest.getExecutorHandler() + "] not found.");
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
@ -79,7 +79,7 @@ public class ExecutorBizImpl implements ExecutorBiz {
|
|
|
|
|
// valid old jobThread
|
|
|
|
|
if (jobThread != null &&
|
|
|
|
|
!(jobThread.getHandler() instanceof GlueJobHandler
|
|
|
|
|
&& ((GlueJobHandler) jobThread.getHandler()).getGlueUpdatetime()==triggerParam.getGlueUpdatetime() )) {
|
|
|
|
|
&& ((GlueJobHandler) jobThread.getHandler()).getGlueUpdatetime()== triggerRequest.getGlueUpdatetime() )) {
|
|
|
|
|
// change handler or gluesource updated, need kill old thread
|
|
|
|
|
removeOldReason = "change job source or glue type, and terminate the old job thread.";
|
|
|
|
|
|
|
|
|
|
@ -90,8 +90,8 @@ public class ExecutorBizImpl implements ExecutorBiz {
|
|
|
|
|
// valid handler
|
|
|
|
|
if (jobHandler == null) {
|
|
|
|
|
try {
|
|
|
|
|
IJobHandler originJobHandler = GlueFactory.getInstance().loadNewInstance(triggerParam.getGlueSource());
|
|
|
|
|
jobHandler = new GlueJobHandler(originJobHandler, triggerParam.getGlueUpdatetime());
|
|
|
|
|
IJobHandler originJobHandler = GlueFactory.getInstance().loadNewInstance(triggerRequest.getGlueSource());
|
|
|
|
|
jobHandler = new GlueJobHandler(originJobHandler, triggerRequest.getGlueUpdatetime());
|
|
|
|
|
} catch (Exception e) {
|
|
|
|
|
logger.error(e.getMessage(), e);
|
|
|
|
|
return ReturnT.ofFail( e.getMessage());
|
|
|
|
|
@ -102,7 +102,7 @@ public class ExecutorBizImpl implements ExecutorBiz {
|
|
|
|
|
// valid old jobThread
|
|
|
|
|
if (jobThread != null &&
|
|
|
|
|
!(jobThread.getHandler() instanceof ScriptJobHandler
|
|
|
|
|
&& ((ScriptJobHandler) jobThread.getHandler()).getGlueUpdatetime()==triggerParam.getGlueUpdatetime() )) {
|
|
|
|
|
&& ((ScriptJobHandler) jobThread.getHandler()).getGlueUpdatetime()== triggerRequest.getGlueUpdatetime() )) {
|
|
|
|
|
// change script or gluesource updated, need kill old thread
|
|
|
|
|
removeOldReason = "change job source or glue type, and terminate the old job thread.";
|
|
|
|
|
|
|
|
|
|
@ -112,15 +112,15 @@ public class ExecutorBizImpl implements ExecutorBiz {
|
|
|
|
|
|
|
|
|
|
// valid handler
|
|
|
|
|
if (jobHandler == null) {
|
|
|
|
|
jobHandler = new ScriptJobHandler(triggerParam.getJobId(), triggerParam.getGlueUpdatetime(), triggerParam.getGlueSource(), GlueTypeEnum.match(triggerParam.getGlueType()));
|
|
|
|
|
jobHandler = new ScriptJobHandler(triggerRequest.getJobId(), triggerRequest.getGlueUpdatetime(), triggerRequest.getGlueSource(), GlueTypeEnum.match(triggerRequest.getGlueType()));
|
|
|
|
|
}
|
|
|
|
|
} else {
|
|
|
|
|
return ReturnT.ofFail("glueType[" + triggerParam.getGlueType() + "] is not valid.");
|
|
|
|
|
return ReturnT.ofFail("glueType[" + triggerRequest.getGlueType() + "] is not valid.");
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
// executor block strategy
|
|
|
|
|
if (jobThread != null) {
|
|
|
|
|
ExecutorBlockStrategyEnum blockStrategy = ExecutorBlockStrategyEnum.match(triggerParam.getExecutorBlockStrategy(), null);
|
|
|
|
|
ExecutorBlockStrategyEnum blockStrategy = ExecutorBlockStrategyEnum.match(triggerRequest.getExecutorBlockStrategy(), null);
|
|
|
|
|
if (ExecutorBlockStrategyEnum.DISCARD_LATER == blockStrategy) {
|
|
|
|
|
// discard when running
|
|
|
|
|
if (jobThread.isRunningOrHasQueue()) {
|
|
|
|
|
@ -140,20 +140,20 @@ public class ExecutorBizImpl implements ExecutorBiz {
|
|
|
|
|
|
|
|
|
|
// replace thread (new or exists invalid)
|
|
|
|
|
if (jobThread == null) {
|
|
|
|
|
jobThread = XxlJobExecutor.registJobThread(triggerParam.getJobId(), jobHandler, removeOldReason);
|
|
|
|
|
jobThread = XxlJobExecutor.registJobThread(triggerRequest.getJobId(), jobHandler, removeOldReason);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
// push data to queue
|
|
|
|
|
ReturnT<String> pushResult = jobThread.pushTriggerQueue(triggerParam);
|
|
|
|
|
ReturnT<String> pushResult = jobThread.pushTriggerQueue(triggerRequest);
|
|
|
|
|
return pushResult;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
@Override
|
|
|
|
|
public ReturnT<String> kill(KillParam killParam) {
|
|
|
|
|
public ReturnT<String> kill(KillRequest killRequest) {
|
|
|
|
|
// kill handlerThread, and create new one
|
|
|
|
|
JobThread jobThread = XxlJobExecutor.loadJobThread(killParam.getJobId());
|
|
|
|
|
JobThread jobThread = XxlJobExecutor.loadJobThread(killRequest.getJobId());
|
|
|
|
|
if (jobThread != null) {
|
|
|
|
|
XxlJobExecutor.removeJobThread(killParam.getJobId(), "scheduling center kill job.");
|
|
|
|
|
XxlJobExecutor.removeJobThread(killRequest.getJobId(), "scheduling center kill job.");
|
|
|
|
|
return ReturnT.ofSuccess();
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
@ -161,11 +161,11 @@ public class ExecutorBizImpl implements ExecutorBiz {
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
@Override
|
|
|
|
|
public ReturnT<LogResult> log(LogParam logParam) {
|
|
|
|
|
public ReturnT<LogResult> log(LogRequest logRequest) {
|
|
|
|
|
// log filename: logPath/yyyy-MM-dd/9999.log
|
|
|
|
|
String logFileName = XxlJobFileAppender.makeLogFileName(new Date(logParam.getLogDateTim()), logParam.getLogId());
|
|
|
|
|
String logFileName = XxlJobFileAppender.makeLogFileName(new Date(logRequest.getLogDateTim()), logRequest.getLogId());
|
|
|
|
|
|
|
|
|
|
LogResult logResult = XxlJobFileAppender.readLog(logFileName, logParam.getFromLineNum());
|
|
|
|
|
LogResult logResult = XxlJobFileAppender.readLog(logFileName, logRequest.getFromLineNum());
|
|
|
|
|
return ReturnT.ofSuccess(logResult);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
xuxueli
1 month ago