动态日志

xxl-job-admin/src/main/java/com/xxl/job/admin/config/XxlJobConfiguration.java

@@ -1,44 +0,0 @@
-package com.xxl.job.admin.config;
-
-/**
- * @author VcKerry on 2020/1/6
- */
-
-//@Configuration
-public class XxlJobConfiguration {
-
- /*   @Bean
-    public JobTriggerPoolHelper jobTriggerPoolHelper() {
-        return new JobTriggerPoolHelper();
-    }
-
-
-    @Bean
-    public JobFailMonitorHelper jobFailMonitorHelper(JobTriggerPoolHelper jobTriggerPoolHelper) {
-        return new JobFailMonitorHelper(jobTriggerPoolHelper);
-    }
-
-
-    @Bean
-    public JobLogReportHelper jobLogReportHelper() {
-        return new JobLogReportHelper();
-    }
-
-    @Bean
-    public JobScheduleHelper jobScheduleHelper(JobTriggerPoolHelper jobTriggerPoolHelper) {
-        return new JobScheduleHelper(jobTriggerPoolHelper);
-    }
-*/
-
-   /* @Bean(destroyMethod = "destroy")
-    public XxlJobScheduler xxlJobScheduler(JobRegistryMonitorHelper jobRegistryMonitorHelper,
-                                           JobFailMonitorHelper jobFailMonitorHelper,
-                                           JobTriggerPoolHelper jobTriggerPoolHelper,
-                                           JobLogReportHelper jobLogReportHelper,
-                                           JobScheduleHelper jobScheduleHelper) throws Exception {
-        XxlJobScheduler xxlJobScheduler = new XxlJobScheduler(jobRegistryMonitorHelper, jobFailMonitorHelper, jobTriggerPoolHelper, jobLogReportHelper, jobScheduleHelper);
-        xxlJobScheduler.init();
-        return xxlJobScheduler;
-    }*/
-
-}

xxl-job-admin/src/main/java/com/xxl/job/admin/controller/JobLogController.java

@@ -135,6 +135,15 @@ public class JobLogController {
         return "joblog/joblog.detail";
     }
 
+    /**
+     * 获取日志
+     *
+     * @param executorAddress
+     * @param triggerTime
+     * @param logId
+     * @param fromLineNum
+     * @return
+     */
     @RequestMapping("/logDetailCat")
     @ResponseBody
     public ReturnT<LogResult> logDetailCat(String executorAddress, long triggerTime, long logId, int fromLineNum) {

xxl-job-admin/src/main/java/com/xxl/job/admin/core/thread/JobScheduleHelper.java

@@ -56,29 +56,23 @@ public class JobScheduleHelper {
     public void start() {
 
         // schedule thread
-        scheduleThread = new Thread(new Runnable() {
-            @Override
-            public void run() {
-                jobScheduleStop();
-            }
-        });
+        scheduleThread = new Thread(this::jobSchedule);
         scheduleThread.setDaemon(true);
         scheduleThread.setName("xxl-job, admin JobScheduleHelper#scheduleThread");
         scheduleThread.start();
 
         // ring thread
-        ringThread = new Thread(new Runnable() {
-            @Override
-            public void run() {
-                jobScheduleRing();
-            }
-        });
+        ringThread = new Thread(this::jobScheduleRing);
         ringThread.setDaemon(true);
         ringThread.setName("xxl-job, admin JobScheduleHelper#ringThread");
         ringThread.start();
     }
 
-    private void jobScheduleStop() {
+    /**
+     * 不断去数据库获取任务
+     */
+    @SuppressWarnings("AlibabaMethodTooLong")
+    private void jobSchedule() {
 
         try {
             TimeUnit.MILLISECONDS.sleep(5000 - System.currentTimeMillis() % 1000);
@@ -122,13 +116,15 @@ public class JobScheduleHelper {
 
                         // time-ring jump
                         if (nowTime > jobInfo.getTriggerNextTime() + PRE_READ_MS) {
+                            //  过期了
                             // 2.1、trigger-expire > 5s：pass && make next-trigger-time
                             logger.warn(">>>>>>>>>>> xxl-job, schedule misfire, jobId = " + jobInfo.getId());
 
-                            // fresh next
+                            // fresh next 刷新
                             refreshNextValidTime(jobInfo, new Date());
 
                         } else if (nowTime > jobInfo.getTriggerNextTime()) {
+                            // 可以执行
                             // 2.2、trigger-expire < 5s：direct-trigger && make next-trigger-time
 
                             // 1、trigger
@@ -151,7 +147,6 @@ public class JobScheduleHelper {
                                 refreshNextValidTime(jobInfo, new Date(jobInfo.getTriggerNextTime()));
 
                             }
-
                         } else {
                             // 2.3、trigger-pre-read：time-ring trigger && make next-trigger-time
 
@@ -179,7 +174,6 @@ public class JobScheduleHelper {
 
                 // tx stop
 
-
             } catch (Exception e) {
                 if (!scheduleThreadToStop) {
                     logger.error(">>>>>>>>>>> xxl-job, JobScheduleHelper#scheduleThread error:{}", e.getMessage());
@@ -226,7 +220,8 @@ public class JobScheduleHelper {
 
 
             // Wait seconds, align second
-            if (cost < 1000) {  // scan-overtime, not wait
+            if (cost < 1000) {
+                // scan-overtime, not wait
                 try {
                     // pre-read period: success > scan each second; fail > skip this period;
                     TimeUnit.MILLISECONDS.sleep((preReadSuc ? 1000 : PRE_READ_MS) - System.currentTimeMillis() % 1000);
@@ -236,9 +231,7 @@ public class JobScheduleHelper {
                     }
                 }
             }
-
         }
-
         logger.info(">>>>>>>>>>> xxl-job, JobScheduleHelper#scheduleThread stop");
     }
 
@@ -258,7 +251,8 @@ public class JobScheduleHelper {
             try {
                 // second data
                 List<Integer> ringItemData = new ArrayList<>();
-                int nowSecond = Calendar.getInstance().get(Calendar.SECOND);   // 避免处理耗时太长，跨过刻度，向前校验一个刻度；
+                // 避免处理耗时太长，跨过刻度，向前校验一个刻度；
+                int nowSecond = Calendar.getInstance().get(Calendar.SECOND);
                 for (int i = 0; i < 2; i++) {
                     List<Integer> tmpData = ringData.remove((nowSecond + 60 - i) % 60);
                     if (tmpData != null) {
@@ -267,7 +261,7 @@ public class JobScheduleHelper {
                 }
 
                 // ring trigger
-                logger.debug(">>>>>>>>>>> xxl-job, time-ring beat : " + nowSecond + " = " + Arrays.asList(ringItemData));
+                logger.debug(">>>>>>>>>>> xxl-job, time-ring beat : {} = {}", nowSecond, ringItemData);
                 if (ringItemData.size() > 0) {
                     // do trigger
                     for (int jobId : ringItemData) {

xxl-job-admin/src/main/java/com/xxl/job/admin/core/thread/JobTriggerPoolHelper.java

@@ -95,7 +95,8 @@ public class JobTriggerPoolHelper {
         // choose thread pool
         ThreadPoolExecutor triggerPool_ = fastTriggerPool;
         AtomicInteger jobTimeoutCount = jobTimeoutCountMap.get(jobId);
-        if (jobTimeoutCount != null && jobTimeoutCount.get() > 10) {      // job-timeout 10 times in 1 min
+        // job-timeout 10 times in 1 min
+        if (jobTimeoutCount != null && jobTimeoutCount.get() > 10) {
             triggerPool_ = slowTriggerPool;
         }
 

xxl-job-admin/src/main/java/com/xxl/job/admin/core/trigger/XxlJobTrigger.java

@@ -211,6 +211,7 @@ public class XxlJobTrigger {
         ReturnT<String> runResult = null;
         try {
             ExecutorBiz executorBiz = xxlJobScheduler.getExecutorBiz(address);
+            // 远程执行
             runResult = executorBiz.run(triggerParam);
         } catch (Exception e) {
             logger.error(">>>>>>>>>>> xxl-job trigger error, please check if the executor[{}] is running.", address, e);

xxl-job-admin/src/main/resources/application.properties

@@ -6,8 +6,8 @@ spring.datasource.url=jdbc:mysql://192.168.10.210:6446/xxl_job?Unicode=true&useS
 spring.datasource.username=xxl_job
 spring.datasource.password=E_wsq@163.com
 spring.datasource.hikari.connection-test-query=SELECT 1
-spring.datasource.hikari.maximum-pool-size=20
-spring.datasource.hikari.minimum-idle=10
+spring.datasource.hikari.maximum-pool-size=30
+spring.datasource.hikari.minimum-idle=20
 ### actuator
 management.server.servlet.context-path=/actuator
 management.health.mail.enabled=false

xxl-job-core/src/main/java/com/xxl/job/core/biz/impl/ExecutorBizImpl.java

@@ -77,6 +77,9 @@ public class ExecutorBizImpl implements ExecutorBiz {
         GlueTypeEnum glueTypeEnum = GlueTypeEnum.match(triggerParam.getGlueType());
         if (GlueTypeEnum.BEAN == glueTypeEnum) {
 
+            // bean 模式
+
+            // rec
             // new jobhandler
             IJobHandler newJobHandler = XxlJobExecutor.loadJobHandler(triggerParam.getExecutorHandler());
 

xxl-job-core/src/main/java/com/xxl/job/core/thread/JobThread.java

@@ -93,6 +93,9 @@ public class JobThread extends Thread {
         return running || triggerQueue.size() > 0;
     }
 
+    /**
+     * 取出来
+     */
     @Override
     public void run() {
 
@@ -121,6 +124,7 @@ public class JobThread extends Thread {
                     // log filename, like "logPath/yyyy-MM-dd/9999.log"
                     String logFileName = XxlJobFileAppender.makeLogFileName(new Date(triggerParam.getLogDateTime()), triggerParam.getLogId());
                     XxlJobFileAppender.contextHolder.set(logFileName);
+
                     ShardingUtil.setShardingVo(new ShardingUtil.ShardingVO(triggerParam.getBroadcastIndex(), triggerParam.getBroadcastTotal()));
 
                     // execute

xxl-job-executor-samples/xxl-job-executor-sample-frameless/src/main/resources/xxl-job-executor.properties

@@ -1,6 +1,6 @@
 ### xxl-job admin address list, such as "http://address" or "http://address01,http://address02"
 
-xxl.job.admin.addresses=http://192.168.10.177:8091/xxl-job-admin,http://192.168.10.177:8090/xxl-job-admin
+xxl.job.admin.addresses=http://192.168.10.172:8080/xxl-job-admin
 
 ### xxl-job executor address
 xxl.job.executor.appname=xxl-job-executor-sample