Merge pull request #1883 from jinyse/fix-ExecutorRouteRound
fix ExecutorRouteRound count++ concurrency problems, use AtomicIntege…
This commit is contained in:
commit
29d926dcf1
|
@ -8,14 +8,16 @@ import java.util.List;
|
||||||
import java.util.Random;
|
import java.util.Random;
|
||||||
import java.util.concurrent.ConcurrentHashMap;
|
import java.util.concurrent.ConcurrentHashMap;
|
||||||
import java.util.concurrent.ConcurrentMap;
|
import java.util.concurrent.ConcurrentMap;
|
||||||
|
import java.util.concurrent.atomic.AtomicInteger;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Created by xuxueli on 17/3/10.
|
* Created by xuxueli on 17/3/10.
|
||||||
*/
|
*/
|
||||||
public class ExecutorRouteRound extends ExecutorRouter {
|
public class ExecutorRouteRound extends ExecutorRouter {
|
||||||
|
|
||||||
private static ConcurrentMap<Integer, Integer> routeCountEachJob = new ConcurrentHashMap<Integer, Integer>();
|
private static ConcurrentMap<Integer, AtomicInteger> routeCountEachJob = new ConcurrentHashMap<>();
|
||||||
private static long CACHE_VALID_TIME = 0;
|
private static long CACHE_VALID_TIME = 0;
|
||||||
|
|
||||||
private static int count(int jobId) {
|
private static int count(int jobId) {
|
||||||
// cache clear
|
// cache clear
|
||||||
if (System.currentTimeMillis() > CACHE_VALID_TIME) {
|
if (System.currentTimeMillis() > CACHE_VALID_TIME) {
|
||||||
|
@ -23,11 +25,16 @@ public class ExecutorRouteRound extends ExecutorRouter {
|
||||||
CACHE_VALID_TIME = System.currentTimeMillis() + 1000*60*60*24;
|
CACHE_VALID_TIME = System.currentTimeMillis() + 1000*60*60*24;
|
||||||
}
|
}
|
||||||
|
|
||||||
// count++
|
AtomicInteger count = routeCountEachJob.get(jobId);
|
||||||
Integer count = routeCountEachJob.get(jobId);
|
// 初始化时主动Random一次,缓解首次压力
|
||||||
count = (count==null || count>1000000)?(new Random().nextInt(100)):++count; // 初始化时主动Random一次,缓解首次压力
|
if (count == null || count.get() > 1000000) {
|
||||||
|
count = new AtomicInteger(new Random().nextInt(100));
|
||||||
|
} else {
|
||||||
|
// count++
|
||||||
|
count.addAndGet(1);
|
||||||
|
}
|
||||||
routeCountEachJob.put(jobId, count);
|
routeCountEachJob.put(jobId, count);
|
||||||
return count;
|
return count.get();
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
|
|
Loading…
Reference in New Issue