From 5c16e16d96abda0d47db664a6d3548edea6eaa89 Mon Sep 17 00:00:00 2001 From: "xueli.xue" Date: Fri, 30 Sep 2016 20:35:09 +0800 Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E5=BA=A6=E4=B8=AD=E5=BF=83,=20?= =?UTF-8?q?=E6=94=AF=E6=8C=81=E6=A0=B9=E6=8D=AEAppName=E8=87=AA=E5=8A=A8?= =?UTF-8?q?=E5=8F=91=E7=8E=B0=E6=89=A7=E8=A1=8C=E5=99=A8=E5=9C=B0=E5=9D=80?= =?UTF-8?q?;?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../admin/core/jobbean/RemoteHttpJobBean.java | 50 ++++++++++++----- .../job/admin/core/model/XxlJobRegistry.java | 55 +++++++++++++++++++ .../admin/core/util/DynamicSchedulerUtil.java | 32 +++-------- .../xxl/job/admin/dao/IXxlJobRegistryDao.java | 12 ++++ .../admin/dao/impl/XxlJobRegistryDaoImpl.java | 30 ++++++++++ .../mybatis-mapper/XxlJobRegistryMapper.xml | 35 ++++++++++++ 6 files changed, 176 insertions(+), 38 deletions(-) create mode 100644 xxl-job-admin/src/main/java/com/xxl/job/admin/core/model/XxlJobRegistry.java create mode 100644 xxl-job-admin/src/main/java/com/xxl/job/admin/dao/IXxlJobRegistryDao.java create mode 100644 xxl-job-admin/src/main/java/com/xxl/job/admin/dao/impl/XxlJobRegistryDaoImpl.java create mode 100644 xxl-job-admin/src/main/resources/mybatis-mapper/XxlJobRegistryMapper.xml diff --git a/xxl-job-admin/src/main/java/com/xxl/job/admin/core/jobbean/RemoteHttpJobBean.java b/xxl-job-admin/src/main/java/com/xxl/job/admin/core/jobbean/RemoteHttpJobBean.java index 3f6439e0..193b8719 100644 --- a/xxl-job-admin/src/main/java/com/xxl/job/admin/core/jobbean/RemoteHttpJobBean.java +++ b/xxl-job-admin/src/main/java/com/xxl/job/admin/core/jobbean/RemoteHttpJobBean.java @@ -3,8 +3,10 @@ package com.xxl.job.admin.core.jobbean; import com.xxl.job.admin.core.callback.XxlJobLogCallbackServer; import com.xxl.job.admin.core.model.XxlJobInfo; import com.xxl.job.admin.core.model.XxlJobLog; +import com.xxl.job.admin.core.model.XxlJobRegistry; import com.xxl.job.admin.core.thread.JobMonitorHelper; import com.xxl.job.admin.core.util.DynamicSchedulerUtil; +import com.xxl.job.core.registry.RegistHelper; import com.xxl.job.core.router.HandlerRouter.ActionRepository; import com.xxl.job.core.router.model.RequestModel; import com.xxl.job.core.router.model.ResponseModel; @@ -18,10 +20,7 @@ import org.slf4j.LoggerFactory; import org.springframework.scheduling.quartz.QuartzJobBean; import java.text.MessageFormat; -import java.util.Arrays; -import java.util.Collections; -import java.util.Date; -import java.util.List; +import java.util.*; /** * http job bean @@ -57,8 +56,25 @@ public class RemoteHttpJobBean extends QuartzJobBean { requestModel.setLogAddress(XxlJobLogCallbackServer.getTrigger_log_address()); requestModel.setLogId(jobLog.getId()); + // parse address + List addressList = new ArrayList(); + String parseAddressMsg = null; + if (StringUtils.isNotBlank(jobInfo.getExecutorAppname())) { + List xxlJobRegistryList = DynamicSchedulerUtil.xxlJobRegistryDao.findRegistrys(RegistHelper.RegistType.EXECUTOR.name(), jobInfo.getExecutorAppname()); + if (xxlJobRegistryList!=null && xxlJobRegistryList.size()>0) { + for (XxlJobRegistry item: xxlJobRegistryList) { + addressList.add(item.getRegistryValue()); + } + } + parseAddressMsg = MessageFormat.format("Parse Address (Appname注册方式)
>>>[address list] : {0}
", addressList.toArray()); + } else { + List addressArr = Arrays.asList(jobInfo.getExecutorAddress().split(",")); + addressList.addAll(addressArr); + parseAddressMsg = MessageFormat.format("Parse Address (地址配置方式)
>>>[address list] : {0}
", addressList.toArray()); + } + // failover trigger - ResponseModel responseModel = failoverTrigger(jobInfo.getExecutorAddress(), requestModel, jobLog); + ResponseModel responseModel = failoverTrigger(addressList, requestModel, jobLog); jobLog.setExecutorHandler(jobInfo.getExecutorHandler()); jobLog.setExecutorParam(jobInfo.getExecutorParam()); logger.info(">>>>>>>>>>> xxl-job failoverTrigger response, jobId:{}, responseModel:{}", jobLog.getId(), responseModel.toString()); @@ -66,7 +82,7 @@ public class RemoteHttpJobBean extends QuartzJobBean { // update trigger info jobLog.setTriggerTime(new Date()); jobLog.setTriggerStatus(responseModel.getStatus()); - jobLog.setTriggerMsg(responseModel.getMsg()); + jobLog.setTriggerMsg(parseAddressMsg + responseModel.getMsg()); DynamicSchedulerUtil.xxlJobLogDao.updateTriggerInfo(jobLog); // monitor triger @@ -78,16 +94,14 @@ public class RemoteHttpJobBean extends QuartzJobBean { /** * failover for trigger remote address - * @param handler_address * @return */ - public ResponseModel failoverTrigger(String handler_address, RequestModel requestModel, XxlJobLog jobLog){ - if (handler_address.split(",").length > 1) { + public ResponseModel failoverTrigger(List addressList, RequestModel requestModel, XxlJobLog jobLog){ + if (addressList.size() > 1) { // for ha - List addressList = Arrays.asList(handler_address.split(",")); Collections.shuffle(addressList); - + // for failover String failoverMessage = ""; for (String address : addressList) { @@ -119,14 +133,20 @@ public class RemoteHttpJobBean extends QuartzJobBean { result.setStatus(ResponseModel.FAIL); result.setMsg(failoverMessage); return result; - } else { + } else if (addressList.size() == 1) { + String address = addressList.get(0); // store real address - jobLog.setExecutorAddress(handler_address); + jobLog.setExecutorAddress(address); - ResponseModel triggerCallback = XxlJobNetCommUtil.postHex(XxlJobNetCommUtil.addressToUrl(handler_address), requestModel); - String failoverMessage = MessageFormat.format("Trigger running,
>>>[address] : {0},
>>>[status] : {1},
>>>[msg] : {2}
", handler_address, triggerCallback.getStatus(), triggerCallback.getMsg()); + ResponseModel triggerCallback = XxlJobNetCommUtil.postHex(XxlJobNetCommUtil.addressToUrl(address), requestModel); + String failoverMessage = MessageFormat.format("Trigger running,
>>>[address] : {0},
>>>[status] : {1},
>>>[msg] : {2}
", address, triggerCallback.getStatus(), triggerCallback.getMsg()); triggerCallback.setMsg(failoverMessage); return triggerCallback; + } else { + ResponseModel result = new ResponseModel(); + result.setStatus(ResponseModel.FAIL); + result.setMsg( "Trigger error,
>>>address list is null
" ); + return result; } } diff --git a/xxl-job-admin/src/main/java/com/xxl/job/admin/core/model/XxlJobRegistry.java b/xxl-job-admin/src/main/java/com/xxl/job/admin/core/model/XxlJobRegistry.java new file mode 100644 index 00000000..924d6d33 --- /dev/null +++ b/xxl-job-admin/src/main/java/com/xxl/job/admin/core/model/XxlJobRegistry.java @@ -0,0 +1,55 @@ +package com.xxl.job.admin.core.model; + +import java.util.Date; + +/** + * Created by xuxueli on 16/9/30. + */ +public class XxlJobRegistry { + + private int id; + private String registryGroup; + private String registryKey; + private String registryValue; + private Date updateTime; + + public int getId() { + return id; + } + + public void setId(int id) { + this.id = id; + } + + public String getRegistryGroup() { + return registryGroup; + } + + public void setRegistryGroup(String registryGroup) { + this.registryGroup = registryGroup; + } + + public String getRegistryKey() { + return registryKey; + } + + public void setRegistryKey(String registryKey) { + this.registryKey = registryKey; + } + + public String getRegistryValue() { + return registryValue; + } + + public void setRegistryValue(String registryValue) { + this.registryValue = registryValue; + } + + public Date getUpdateTime() { + return updateTime; + } + + public void setUpdateTime(Date updateTime) { + this.updateTime = updateTime; + } +} diff --git a/xxl-job-admin/src/main/java/com/xxl/job/admin/core/util/DynamicSchedulerUtil.java b/xxl-job-admin/src/main/java/com/xxl/job/admin/core/util/DynamicSchedulerUtil.java index 76a7f8a8..068e546f 100644 --- a/xxl-job-admin/src/main/java/com/xxl/job/admin/core/util/DynamicSchedulerUtil.java +++ b/xxl-job-admin/src/main/java/com/xxl/job/admin/core/util/DynamicSchedulerUtil.java @@ -1,26 +1,13 @@ package com.xxl.job.admin.core.util; -import java.util.ArrayList; -import java.util.Date; -import java.util.HashMap; -import java.util.HashSet; -import java.util.List; -import java.util.Map; -import java.util.Set; - +import com.xxl.job.admin.core.callback.XxlJobLogCallbackServer; import com.xxl.job.admin.core.jobbean.RemoteHttpJobBean; -import org.quartz.CronScheduleBuilder; -import org.quartz.CronTrigger; -import org.quartz.Job; -import org.quartz.JobBuilder; -import org.quartz.JobDetail; -import org.quartz.JobKey; -import org.quartz.Scheduler; -import org.quartz.SchedulerException; -import org.quartz.Trigger; +import com.xxl.job.admin.core.model.XxlJobInfo; +import com.xxl.job.admin.dao.IXxlJobInfoDao; +import com.xxl.job.admin.dao.IXxlJobLogDao; +import com.xxl.job.admin.dao.IXxlJobRegistryDao; +import org.quartz.*; import org.quartz.Trigger.TriggerState; -import org.quartz.TriggerBuilder; -import org.quartz.TriggerKey; import org.quartz.impl.matchers.GroupMatcher; import org.quartz.impl.triggers.CronTriggerImpl; import org.slf4j.Logger; @@ -31,10 +18,7 @@ import org.springframework.context.ApplicationContext; import org.springframework.context.ApplicationContextAware; import org.springframework.util.Assert; -import com.xxl.job.admin.core.callback.XxlJobLogCallbackServer; -import com.xxl.job.admin.core.model.XxlJobInfo; -import com.xxl.job.admin.dao.IXxlJobInfoDao; -import com.xxl.job.admin.dao.IXxlJobLogDao; +import java.util.*; /** * base quartz scheduler util @@ -77,11 +61,13 @@ public final class DynamicSchedulerUtil implements ApplicationContextAware, Init // xxlJobLogDao、xxlJobInfoDao public static IXxlJobLogDao xxlJobLogDao; public static IXxlJobInfoDao xxlJobInfoDao; + public static IXxlJobRegistryDao xxlJobRegistryDao; @Override public void setApplicationContext(ApplicationContext applicationContext) throws BeansException { DynamicSchedulerUtil.xxlJobLogDao = applicationContext.getBean(IXxlJobLogDao.class); DynamicSchedulerUtil.xxlJobInfoDao = applicationContext.getBean(IXxlJobInfoDao.class); + DynamicSchedulerUtil.xxlJobRegistryDao = applicationContext.getBean(IXxlJobRegistryDao.class); } @Override diff --git a/xxl-job-admin/src/main/java/com/xxl/job/admin/dao/IXxlJobRegistryDao.java b/xxl-job-admin/src/main/java/com/xxl/job/admin/dao/IXxlJobRegistryDao.java new file mode 100644 index 00000000..ca67567d --- /dev/null +++ b/xxl-job-admin/src/main/java/com/xxl/job/admin/dao/IXxlJobRegistryDao.java @@ -0,0 +1,12 @@ +package com.xxl.job.admin.dao; + +import com.xxl.job.admin.core.model.XxlJobRegistry; + +import java.util.List; + +/** + * Created by xuxueli on 16/9/30. + */ +public interface IXxlJobRegistryDao { + List findRegistrys(String registryGroup, String registryKey); +} diff --git a/xxl-job-admin/src/main/java/com/xxl/job/admin/dao/impl/XxlJobRegistryDaoImpl.java b/xxl-job-admin/src/main/java/com/xxl/job/admin/dao/impl/XxlJobRegistryDaoImpl.java new file mode 100644 index 00000000..36a3c38f --- /dev/null +++ b/xxl-job-admin/src/main/java/com/xxl/job/admin/dao/impl/XxlJobRegistryDaoImpl.java @@ -0,0 +1,30 @@ +package com.xxl.job.admin.dao.impl; + +import com.xxl.job.admin.core.model.XxlJobRegistry; +import com.xxl.job.admin.dao.IXxlJobRegistryDao; +import org.mybatis.spring.SqlSessionTemplate; +import org.springframework.stereotype.Repository; + +import javax.annotation.Resource; +import java.util.HashMap; +import java.util.List; +import java.util.Map; + +/** + * Created by xuxueli on 16/9/30. + */ +@Repository +public class XxlJobRegistryDaoImpl implements IXxlJobRegistryDao { + + @Resource + public SqlSessionTemplate sqlSessionTemplate; + + @Override + public List findRegistrys(String registryGroup, String registryKey) { + Map params = new HashMap(); + params.put("registryGroup", registryGroup); + params.put("registryKey", registryKey); + return sqlSessionTemplate.selectList("XxlJobRegistryMapper.findRegistrys", params); + } + +} diff --git a/xxl-job-admin/src/main/resources/mybatis-mapper/XxlJobRegistryMapper.xml b/xxl-job-admin/src/main/resources/mybatis-mapper/XxlJobRegistryMapper.xml new file mode 100644 index 00000000..42d7d123 --- /dev/null +++ b/xxl-job-admin/src/main/resources/mybatis-mapper/XxlJobRegistryMapper.xml @@ -0,0 +1,35 @@ + + + + + + + + + + + + + + t.id, + t.registry_group, + t.registry_key, + t.registry_value, + t.update_time + + + + + + delete from XXL_JOB_QRTZ_TRIGGER_REGISTRY + WHERE update_time DATE_ADD(NOW(),INTERVAL -30 SECOND) + + + \ No newline at end of file