msb-public-java
/
xxl-job
mirror of https://gitee.com/xuxueli0323/xxl-job.git
4
2
Code Issues Projects Releases Wiki Activity

Pre Merge pull request !49 from buzhidaolvtu/master

Browse Source
pull/49/MERGE
buzhidaolvtu 2 years ago committed by Gitee
parent 6effc8b98f f07fb34d89
commit 398dd64d6e
No known key found for this signature in database
GPG Key ID: 173E9B9CA92EEF8F
6 changed files with 287 additions and 85 deletions
Show Stats Download Patch File Download Diff File

13
xxl-job-admin/src/main/java/com/xxl/job/admin/core/route/ExecutorRouter.java
Unescape View File

@ -1,5 +1,6 @@
package com.xxl.job.admin.core.route;
import com.xxl.job.admin.core.model.XxlJobGroup;
import com.xxl.job.core.biz.model.ReturnT;
import com.xxl.job.core.biz.model.TriggerParam;
import org.slf4j.Logger;
@ -21,4 +22,16 @@ public abstract class ExecutorRouter {
*/
public abstract ReturnT<String> route(TriggerParam triggerParam, List<String> addressList);
/**
* route address within group
* @param group
* @param triggerParam
* @param addressList
* @return
*/
public ReturnT<String> route(XxlJobGroup group, TriggerParam triggerParam, List<String> addressList) {
return route(triggerParam, addressList);
}
}

40
xxl-job-admin/src/main/java/com/xxl/job/admin/core/route/ExecutorRouterHelper.java
Unescape View File

@ -0,0 +1,40 @@
package com.xxl.job.admin.core.route;
import com.xxl.job.admin.core.route.strategy.ExecutorRouteLFU;
import com.xxl.job.admin.core.route.strategy.ExecutorRouteLRU;
public class ExecutorRouterHelper {
/**
* 以executor为单位，更新LRU和LFU
*
* @param appname
* @param address
*/
public static void updateRouteStats(String appname, String address) {
updateLRUStats(appname, address);
updateLFUStats(appname, address);
}
/**
* 统计LFU
*
* @param appname
* @param address
*/
private static void updateLFUStats(String appname, String address) {
ExecutorRouteLFU.AppAddressPool.getOrCreate(appname).updateAddressStats(address);
}
/**
* @param appname
* @param address
*/
private static void updateLRUStats(String appname, String address) {
ExecutorRouteLRU.AppAddressPool.getOrCreate(appname).updateAddressStats(address);
}
}

80
xxl-job-admin/src/main/java/com/xxl/job/admin/core/route/strategy/ExecutorRouteLFU.java
Unescape View File

@ -12,36 +12,42 @@ import java.util.concurrent.ConcurrentMap;
* 单个JOB对应的每个执行器，使用频率最低的优先被选举
* a(*)、LFU(Least Frequently Used)：最不经常使用，频率/次数
* b、LRU(Least Recently Used)：最近最久未使用，时间
*
* <p>
* Created by xuxueli on 17/3/10.
*/
public class ExecutorRouteLFU extends ExecutorRouter {
private static ConcurrentMap<Integer, HashMap<String, Integer>> jobLfuMap = new ConcurrentHashMap<Integer, HashMap<String, Integer>>();
private static long CACHE_VALID_TIME = 0;
public String route(int jobId, List<String> addressList) {
public static class AppAddressPool {
private static ConcurrentMap<String, AppAddressPool> APP_LFU_MANAGER = new ConcurrentHashMap();
// cache clear
if (System.currentTimeMillis() > CACHE_VALID_TIME) {
jobLfuMap.clear();
CACHE_VALID_TIME = System.currentTimeMillis() + 1000*60*60*24;
/**
* 每个APP name 实例化一个地址池
*
* @param appname
* @return
*/
public static AppAddressPool getOrCreate(String appname) {
return APP_LFU_MANAGER.computeIfAbsent(appname, key -> new AppAddressPool());
}
// lfu item init
HashMap<String, Integer> lfuItemMap = jobLfuMap.get(jobId); // Key排序可以用TreeMap+构造入参Compare；Value排序暂时只能通过ArrayList；
if (lfuItemMap == null) {
lfuItemMap = new HashMap<String, Integer>();
jobLfuMap.putIfAbsent(jobId, lfuItemMap); // 避免重复覆盖
}
private List<String> freeAddressList = new ArrayList<>();
// put new
for (String address: addressList) {
if (!lfuItemMap.containsKey(address) || lfuItemMap.get(address) >1000000 ) {
lfuItemMap.put(address, new Random().nextInt(addressList.size())); // 初始化时主动Random一次，缓解首次压力
//key=address
private HashMap<String, Integer> usedAddressManager = new HashMap<>();
private synchronized void clear(String appname) {
APP_LFU_MANAGER.remove(appname);
getOrCreate(appname);
}
public synchronized void updateAddressStats(String address) {
usedAddressManager.put(address, usedAddressManager.getOrDefault(address, 0) + 1);
}
// remove old
private synchronized String route(List<String> addressList) {
HashMap<String, Integer> lfuItemMap = usedAddressManager;
// remove dead address
List<String> delKeys = new ArrayList<>();
for (String existKey : lfuItemMap.keySet()) {
if (!addressList.contains(existKey)) {
@ -54,6 +60,20 @@ public class ExecutorRouteLFU extends ExecutorRouter {
}
}
// put new address into free list
freeAddressList.clear();
for (String address : addressList) {
if (!lfuItemMap.containsKey(address)) {
freeAddressList.add(address);
}
}
if (freeAddressList.size() > 0) {
String freeAddress = freeAddressList.get(0);
freeAddressList.remove(0);
return freeAddress;
}
// load least userd count address
List<Map.Entry<String, Integer>> lfuItemList = new ArrayList<Map.Entry<String, Integer>>(lfuItemMap.entrySet());
Collections.sort(lfuItemList, new Comparator<Map.Entry<String, Integer>>() {
@ -64,16 +84,28 @@ public class ExecutorRouteLFU extends ExecutorRouter {
});
Map.Entry<String, Integer> addressItem = lfuItemList.get(0);
String minAddress = addressItem.getKey();
addressItem.setValue(addressItem.getValue() + 1);
return addressItem.getKey();
}
}
public String route(String appname, List<String> addressList) {
AppAddressPool appAddressPool = AppAddressPool.getOrCreate(appname);
// cache clear
if (System.currentTimeMillis() > CACHE_VALID_TIME) {
appAddressPool.clear(appname);
CACHE_VALID_TIME = System.currentTimeMillis() + 1000 * 60 * 60 * 24;
}
return appAddressPool.route(addressList);
}
private static long CACHE_VALID_TIME = 0;
@Override
public ReturnT<String> route(TriggerParam triggerParam, List<String> addressList) {
String address = route(triggerParam.getJobId(), addressList);
return new ReturnT<String>(address);
throw new RuntimeException("remove");
}
}

86
xxl-job-admin/src/main/java/com/xxl/job/admin/core/route/strategy/ExecutorRouteLRU.java
Unescape View File

@ -1,5 +1,6 @@
package com.xxl.job.admin.core.route.strategy;
import com.xxl.job.admin.core.model.XxlJobGroup;
import com.xxl.job.admin.core.route.ExecutorRouter;
import com.xxl.job.core.biz.model.ReturnT;
import com.xxl.job.core.biz.model.TriggerParam;
@ -14,41 +15,46 @@ import java.util.concurrent.ConcurrentMap;
* 单个JOB对应的每个执行器，最久为使用的优先被选举
* a、LFU(Least Frequently Used)：最不经常使用，频率/次数
* b(*)、LRU(Least Recently Used)：最近最久未使用，时间
*
* <p>
* Created by xuxueli on 17/3/10.
*/
public class ExecutorRouteLRU extends ExecutorRouter {
private static ConcurrentMap<Integer, LinkedHashMap<String, String>> jobLRUMap = new ConcurrentHashMap<Integer, LinkedHashMap<String, String>>();
private static long CACHE_VALID_TIME = 0;
public String route(int jobId, List<String> addressList) {
public static class AppAddressPool {
private static ConcurrentMap<String, AppAddressPool> APP_LRU_MANAGER = new ConcurrentHashMap();
// cache clear
if (System.currentTimeMillis() > CACHE_VALID_TIME) {
jobLRUMap.clear();
CACHE_VALID_TIME = System.currentTimeMillis() + 1000*60*60*24;
/**
* 每个APP name 实例化一个地址池
*
* @param appname
* @return
*/
public static AppAddressPool getOrCreate(String appname) {
return APP_LRU_MANAGER.computeIfAbsent(appname, key -> new AppAddressPool());
}
// init lru
LinkedHashMap<String, String> lruItem = jobLRUMap.get(jobId);
if (lruItem == null) {
private List<String> freeAddressList = new ArrayList<>();
/**
* LinkedHashMap
* a、accessOrder：true=访问顺序排序（get/put时排序）；false=插入顺序排期；
* b、removeEldestEntry：新增元素时将会调用，返回true时会删除最老元素；可封装LinkedHashMap并重写该方法，比如定义最大容量，超出是返回true即可实现固定长度的LRU算法；
*/
lruItem = new LinkedHashMap<String, String>(16, 0.75f, true);
jobLRUMap.putIfAbsent(jobId, lruItem);
}
private LinkedHashMap<String, String> usedAddressManager = new LinkedHashMap<String, String>(16, 0.75f, true);
// put new
for (String address: addressList) {
if (!lruItem.containsKey(address)) {
lruItem.put(address, address);
private synchronized void clear(String appname) {
APP_LRU_MANAGER.remove(appname);
getOrCreate(appname);
}
public synchronized void updateAddressStats(String address) {
usedAddressManager.put(address, address);
}
// remove old
private synchronized String route(List<String> addressList) {
LinkedHashMap<String, String> lruItem = usedAddressManager;
// remove dead address
List<String> delKeys = new ArrayList<>();
for (String existKey : lruItem.keySet()) {
if (!addressList.contains(existKey)) {
@ -61,16 +67,52 @@ public class ExecutorRouteLRU extends ExecutorRouter {
}
}
// put new address into free list
freeAddressList.clear();
for (String address : addressList) {
if (!lruItem.containsKey(address)) {
freeAddressList.add(address);
}
}
if (freeAddressList.size() > 0) {
String freeAddress = freeAddressList.get(0);
freeAddressList.remove(0);
return freeAddress;
}
// load
String eldestKey = lruItem.entrySet().iterator().next().getKey();
String eldestValue = lruItem.get(eldestKey);
return eldestValue;
}
}
public String route(String appname, List<String> addressList) {
AppAddressPool appAddressPool = AppAddressPool.getOrCreate(appname);
// cache clear
if (System.currentTimeMillis() > CACHE_VALID_TIME) {
appAddressPool.clear(appname);
CACHE_VALID_TIME = System.currentTimeMillis() + 1000 * 60 * 60 * 24;
}
return appAddressPool.route(addressList);
}
private static long CACHE_VALID_TIME = 0;
@Override
public ReturnT<String> route(TriggerParam triggerParam, List<String> addressList) {
String address = route(triggerParam.getJobId(), addressList);
public ReturnT<String> route(XxlJobGroup group, TriggerParam triggerParam, List<String> addressList) {
String address = route(group.getAppname(), addressList);
return new ReturnT<String>(address);
}
@Override
public ReturnT<String> route(TriggerParam triggerParam, List<String> addressList) {
throw new RuntimeException("remove");
}
}

5
xxl-job-admin/src/main/java/com/xxl/job/admin/core/trigger/XxlJobTrigger.java
Unescape View File

@ -5,6 +5,7 @@ import com.xxl.job.admin.core.model.XxlJobGroup;
import com.xxl.job.admin.core.model.XxlJobInfo;
import com.xxl.job.admin.core.model.XxlJobLog;
import com.xxl.job.admin.core.route.ExecutorRouteStrategyEnum;
import com.xxl.job.admin.core.route.ExecutorRouterHelper;
import com.xxl.job.admin.core.scheduler.XxlJobScheduler;
import com.xxl.job.admin.core.util.I18nUtil;
import com.xxl.job.core.biz.ExecutorBiz;
@ -149,9 +150,11 @@ public class XxlJobTrigger {
address = group.getRegistryList().get(0);
}
} else {
routeAddressResult = executorRouteStrategyEnum.getRouter().route(triggerParam, group.getRegistryList());
routeAddressResult = executorRouteStrategyEnum.getRouter().route(group, triggerParam, group.getRegistryList());
if (routeAddressResult.getCode() == ReturnT.SUCCESS_CODE) {
address = routeAddressResult.getContent();
//以单个executor为范围，更新address的使用统计
ExecutorRouterHelper.updateRouteStats(group.getAppname(), address);
}
}
} else {

72
xxl-job-admin/src/test/java/com/xxl/job/admin/core/route/ExecutorRouterHelperTest.java
Unescape View File

@ -0,0 +1,72 @@
package com.xxl.job.admin.core.route;
import com.xxl.job.admin.core.model.XxlJobGroup;
import com.xxl.job.core.biz.model.ReturnT;
import com.xxl.job.core.biz.model.TriggerParam;
import org.junit.jupiter.api.Test;
import java.util.Date;
import java.util.concurrent.*;
import java.util.concurrent.atomic.AtomicInteger;
class ExecutorRouterHelperTest {
@Test
public void test_LFU() throws InterruptedException {
XxlJobGroup group = new XxlJobGroup();
group.setAppname("setAppName");
group.setTitle("setTitle");
group.setAddressType(0);
group.setAddressList("191,192,193,194,195,196");
group.setUpdateTime(new Date());
TriggerParam triggerParam = new TriggerParam();
triggerParam.setJobId(1);
ConcurrentMap<String, AtomicInteger> addressStatsMap = new ConcurrentHashMap<>();
ThreadPoolExecutor threadPoolExecutor = new ThreadPoolExecutor(100, 100, 0, TimeUnit.HOURS, new LinkedBlockingDeque<>());
for (int i = 0; i < 1000; i++) {
threadPoolExecutor.execute(() -> {
ReturnT<String> route = ExecutorRouteStrategyEnum.LEAST_FREQUENTLY_USED.getRouter().route(group, triggerParam, group.getRegistryList());
if (route.getCode() == ReturnT.SUCCESS_CODE) {
String address = route.getContent();
AtomicInteger atomicInteger = addressStatsMap.computeIfAbsent(address, key -> new AtomicInteger(0));
atomicInteger.incrementAndGet();
//以单个executor为范围，更新address的使用统计
ExecutorRouterHelper.updateRouteStats(group.getAppname(), address);
}
});
}
threadPoolExecutor.shutdown();
threadPoolExecutor.awaitTermination(1, TimeUnit.HOURS);
System.out.println(addressStatsMap.toString());
}
@Test
public void test_LRU() {
XxlJobGroup group = new XxlJobGroup();
group.setAppname("setAppName");
group.setTitle("setTitle");
group.setAddressType(0);
group.setAddressList("191,192,193,194,195,196");
group.setUpdateTime(new Date());
TriggerParam triggerParam = new TriggerParam();
triggerParam.setJobId(1);
ConcurrentMap<String, AtomicInteger> addressStatsMap = new ConcurrentHashMap<>();
for (int i = 0; i < 100; i++) {
ReturnT<String> route = ExecutorRouteStrategyEnum.LEAST_RECENTLY_USED.getRouter().route(group, triggerParam, group.getRegistryList());
if (route.getCode() == ReturnT.SUCCESS_CODE) {
String address = route.getContent();
AtomicInteger atomicInteger = addressStatsMap.computeIfAbsent(address, key -> new AtomicInteger(0));
atomicInteger.incrementAndGet();
//以单个executor为范围，更新address的使用统计
ExecutorRouterHelper.updateRouteStats(group.getAppname(), address);
}
}
System.out.println(addressStatsMap.toString());
}
}
Write Preview
Loading…
Cancel
Save