【fix sonar】 JobTriggerPoolHelper.java文件
This commit is contained in:
+14
-16
@@ -30,26 +30,28 @@ public class JobTriggerPoolHelper {
|
|||||||
XxlJobAdminConfig.getAdminConfig().getTriggerPoolFastMax(),
|
XxlJobAdminConfig.getAdminConfig().getTriggerPoolFastMax(),
|
||||||
60L,
|
60L,
|
||||||
TimeUnit.SECONDS,
|
TimeUnit.SECONDS,
|
||||||
new LinkedBlockingQueue<Runnable>(1000),
|
new LinkedBlockingQueue<>(1000),
|
||||||
new ThreadFactory() {
|
r-> new Thread(r, "xxl-job, admin JobTriggerPoolHelper-fastTriggerPool-" + r.hashCode()));
|
||||||
|
/*new ThreadFactory() {
|
||||||
@Override
|
@Override
|
||||||
public Thread newThread(Runnable r) {
|
public Thread newThread(Runnable r) {
|
||||||
return new Thread(r, "xxl-job, admin JobTriggerPoolHelper-fastTriggerPool-" + r.hashCode());
|
return new Thread(r, "xxl-job, admin JobTriggerPoolHelper-fastTriggerPool-" + r.hashCode());
|
||||||
}
|
}
|
||||||
});
|
});*/
|
||||||
|
|
||||||
slowTriggerPool = new ThreadPoolExecutor(
|
slowTriggerPool = new ThreadPoolExecutor(
|
||||||
10,
|
10,
|
||||||
XxlJobAdminConfig.getAdminConfig().getTriggerPoolSlowMax(),
|
XxlJobAdminConfig.getAdminConfig().getTriggerPoolSlowMax(),
|
||||||
60L,
|
60L,
|
||||||
TimeUnit.SECONDS,
|
TimeUnit.SECONDS,
|
||||||
new LinkedBlockingQueue<Runnable>(2000),
|
new LinkedBlockingQueue<>(2000),
|
||||||
new ThreadFactory() {
|
r-> new Thread(r, "xxl-job, admin JobTriggerPoolHelper-slowTriggerPool-" + r.hashCode()));
|
||||||
|
/*new ThreadFactory() {
|
||||||
@Override
|
@Override
|
||||||
public Thread newThread(Runnable r) {
|
public Thread newThread(Runnable r) {
|
||||||
return new Thread(r, "xxl-job, admin JobTriggerPoolHelper-slowTriggerPool-" + r.hashCode());
|
return new Thread(r, "xxl-job, admin JobTriggerPoolHelper-slowTriggerPool-" + r.hashCode());
|
||||||
}
|
}
|
||||||
});
|
});*/
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
@@ -77,16 +79,14 @@ public class JobTriggerPoolHelper {
|
|||||||
final String addressList) {
|
final String addressList) {
|
||||||
|
|
||||||
// choose thread pool
|
// choose thread pool
|
||||||
ThreadPoolExecutor triggerPool_ = fastTriggerPool;
|
ThreadPoolExecutor triggerPool = fastTriggerPool;
|
||||||
AtomicInteger jobTimeoutCount = jobTimeoutCountMap.get(jobId);
|
AtomicInteger jobTimeoutCount = jobTimeoutCountMap.get(jobId);
|
||||||
if (jobTimeoutCount!=null && jobTimeoutCount.get() > 10) { // job-timeout 10 times in 1 min
|
if (jobTimeoutCount!=null && jobTimeoutCount.get() > 10) { // job-timeout 10 times in 1 min
|
||||||
triggerPool_ = slowTriggerPool;
|
triggerPool = slowTriggerPool;
|
||||||
}
|
}
|
||||||
|
|
||||||
// trigger
|
// trigger
|
||||||
triggerPool_.execute(new Runnable() {
|
triggerPool.execute(()-> {
|
||||||
@Override
|
|
||||||
public void run() {
|
|
||||||
|
|
||||||
long start = System.currentTimeMillis();
|
long start = System.currentTimeMillis();
|
||||||
|
|
||||||
@@ -98,9 +98,9 @@ public class JobTriggerPoolHelper {
|
|||||||
} finally {
|
} finally {
|
||||||
|
|
||||||
// check timeout-count-map
|
// check timeout-count-map
|
||||||
long minTim_now = System.currentTimeMillis()/60000;
|
long minTimNow = System.currentTimeMillis()/60000;
|
||||||
if (minTim != minTim_now) {
|
if (minTim != minTimNow) {
|
||||||
minTim = minTim_now;
|
minTim = minTimNow;
|
||||||
jobTimeoutCountMap.clear();
|
jobTimeoutCountMap.clear();
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -114,8 +114,6 @@ public class JobTriggerPoolHelper {
|
|||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user