From 4a70ee2e32c3bd5522a25a574b2617ce96a67d21 Mon Sep 17 00:00:00 2001 From: Srzou Date: Tue, 30 Jul 2024 08:38:14 +0000 Subject: [PATCH] =?UTF-8?q?!79=20feat:=E5=A2=9E=E5=8A=A0=E7=AC=AC=E4=B8=80?= =?UTF-8?q?=E4=B8=AA=E5=8F=8A=E6=9C=80=E5=90=8E=E4=B8=80=E4=B8=AA=E5=AE=A2?= =?UTF-8?q?=E6=88=B7=E7=AB=AF=E8=B7=AF=E7=94=B1=E5=8A=9F=E8=83=BD=EF=BC=9B?= =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E8=B7=AF=E7=94=B1=E7=BC=93=E5=AD=98=E5=AE=9A?= =?UTF-8?q?=E6=9C=9F=E6=B8=85=E7=90=86=E5=8A=9F=E8=83=BD=20*=20feat(sj=5F1?= =?UTF-8?q?.2.0-beta1):=E5=A2=9E=E5=8A=A0=E7=AC=AC=E4=B8=80=E5=92=8C?= =?UTF-8?q?=E6=9C=80=E5=90=8E=E4=B8=80=E4=B8=AA=E8=B7=AF=E7=94=B1=E5=8A=9F?= =?UTF-8?q?=E8=83=BD=20*=20feat(sj=5F1.2.0-beta1):=E5=A2=9E=E5=8A=A0LRU?= =?UTF-8?q?=E5=92=8C=E8=BD=AE=E8=AF=A2=E8=B7=AF=E7=94=B1=E7=BC=93=E5=AD=98?= =?UTF-8?q?=E7=9A=84=E5=AE=9A=E6=9C=9F=E6=B8=85=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../allocate/client/ClientLoadBalanceFirst.java | 17 +++++++++++++++++ .../allocate/client/ClientLoadBalanceLRU.java | 7 +++++++ .../allocate/client/ClientLoadBalanceLast.java | 17 +++++++++++++++++ .../client/ClientLoadBalanceManager.java | 4 +++- .../allocate/client/ClientLoadBalanceRound.java | 7 +++++++ 5 files changed, 51 insertions(+), 1 deletion(-) create mode 100644 snail-job-server/snail-job-server-common/src/main/java/com/aizuda/snailjob/server/common/allocate/client/ClientLoadBalanceFirst.java create mode 100644 snail-job-server/snail-job-server-common/src/main/java/com/aizuda/snailjob/server/common/allocate/client/ClientLoadBalanceLast.java diff --git a/snail-job-server/snail-job-server-common/src/main/java/com/aizuda/snailjob/server/common/allocate/client/ClientLoadBalanceFirst.java b/snail-job-server/snail-job-server-common/src/main/java/com/aizuda/snailjob/server/common/allocate/client/ClientLoadBalanceFirst.java new file mode 100644 index 000000000..57f3d72df --- /dev/null +++ b/snail-job-server/snail-job-server-common/src/main/java/com/aizuda/snailjob/server/common/allocate/client/ClientLoadBalanceFirst.java @@ -0,0 +1,17 @@ +package com.aizuda.snailjob.server.common.allocate.client; + +import com.aizuda.snailjob.server.common.ClientLoadBalance; + +import java.util.TreeSet; + +public class ClientLoadBalanceFirst implements ClientLoadBalance { + @Override + public String route(String key, TreeSet clientAllAddressSet) { + return clientAllAddressSet.first(); + } + + @Override + public int routeType() { + return ClientLoadBalanceManager.AllocationAlgorithmEnum.FIRST.getType(); + } +} diff --git a/snail-job-server/snail-job-server-common/src/main/java/com/aizuda/snailjob/server/common/allocate/client/ClientLoadBalanceLRU.java b/snail-job-server/snail-job-server-common/src/main/java/com/aizuda/snailjob/server/common/allocate/client/ClientLoadBalanceLRU.java index 9c8014360..1cf47317f 100644 --- a/snail-job-server/snail-job-server-common/src/main/java/com/aizuda/snailjob/server/common/allocate/client/ClientLoadBalanceLRU.java +++ b/snail-job-server/snail-job-server-common/src/main/java/com/aizuda/snailjob/server/common/allocate/client/ClientLoadBalanceLRU.java @@ -21,9 +21,16 @@ public class ClientLoadBalanceLRU implements ClientLoadBalance { } private ConcurrentHashMap> LRU_CACHE = new ConcurrentHashMap<>(); + private static long CACHE_VALID_TIME = 0; @Override public String route(String allocKey, TreeSet clientAllAddressSet) { + // cache clear + if (System.currentTimeMillis() > CACHE_VALID_TIME) { + LRU_CACHE.clear(); + // 每12个小时定时清理一次数据 + CACHE_VALID_TIME = System.currentTimeMillis() + 1000*60*60*12; + } LinkedHashMap lruItem = LRU_CACHE.get(allocKey); if (Objects.isNull(lruItem)) { lruItem = new LinkedHashMap(16, 0.75f, true) { diff --git a/snail-job-server/snail-job-server-common/src/main/java/com/aizuda/snailjob/server/common/allocate/client/ClientLoadBalanceLast.java b/snail-job-server/snail-job-server-common/src/main/java/com/aizuda/snailjob/server/common/allocate/client/ClientLoadBalanceLast.java new file mode 100644 index 000000000..1e978cc21 --- /dev/null +++ b/snail-job-server/snail-job-server-common/src/main/java/com/aizuda/snailjob/server/common/allocate/client/ClientLoadBalanceLast.java @@ -0,0 +1,17 @@ +package com.aizuda.snailjob.server.common.allocate.client; + +import com.aizuda.snailjob.server.common.ClientLoadBalance; + +import java.util.TreeSet; + +public class ClientLoadBalanceLast implements ClientLoadBalance { + @Override + public String route(String key, TreeSet clientAllAddressSet) { + return clientAllAddressSet.last(); + } + + @Override + public int routeType() { + return ClientLoadBalanceManager.AllocationAlgorithmEnum.LAST.getType(); + } +} diff --git a/snail-job-server/snail-job-server-common/src/main/java/com/aizuda/snailjob/server/common/allocate/client/ClientLoadBalanceManager.java b/snail-job-server/snail-job-server-common/src/main/java/com/aizuda/snailjob/server/common/allocate/client/ClientLoadBalanceManager.java index a18183aba..b8fd40d70 100644 --- a/snail-job-server/snail-job-server-common/src/main/java/com/aizuda/snailjob/server/common/allocate/client/ClientLoadBalanceManager.java +++ b/snail-job-server/snail-job-server-common/src/main/java/com/aizuda/snailjob/server/common/allocate/client/ClientLoadBalanceManager.java @@ -29,7 +29,9 @@ public class ClientLoadBalanceManager { CONSISTENT_HASH(1, new ClientLoadBalanceConsistentHash(100)), RANDOM(2, new ClientLoadBalanceRandom()), LRU(3, new ClientLoadBalanceLRU(100)), - ROUND(4, new ClientLoadBalanceRound()); + ROUND(4, new ClientLoadBalanceRound()), + FIRST(5, new ClientLoadBalanceFirst()), + LAST(6, new ClientLoadBalanceLast()); private final int type; private final ClientLoadBalance clientLoadBalance; diff --git a/snail-job-server/snail-job-server-common/src/main/java/com/aizuda/snailjob/server/common/allocate/client/ClientLoadBalanceRound.java b/snail-job-server/snail-job-server-common/src/main/java/com/aizuda/snailjob/server/common/allocate/client/ClientLoadBalanceRound.java index a1650387b..aed743111 100644 --- a/snail-job-server/snail-job-server-common/src/main/java/com/aizuda/snailjob/server/common/allocate/client/ClientLoadBalanceRound.java +++ b/snail-job-server/snail-job-server-common/src/main/java/com/aizuda/snailjob/server/common/allocate/client/ClientLoadBalanceRound.java @@ -16,9 +16,16 @@ public class ClientLoadBalanceRound implements ClientLoadBalance { private static final ConcurrentHashMap COUNTER = new ConcurrentHashMap<>(); private static final int THRESHOLD = Integer.MAX_VALUE - 10000; + private static long CACHE_VALID_TIME = 0; @Override public String route(final String allocKey, final TreeSet clientAllAddressSet) { + // cache clear + if (System.currentTimeMillis() > CACHE_VALID_TIME) { + COUNTER.clear(); + // 每12个小时定时清理一次数据 + CACHE_VALID_TIME = System.currentTimeMillis() + 1000*60*60*12; + } String[] addressArr = clientAllAddressSet.toArray(new String[0]); AtomicInteger next = COUNTER.getOrDefault(allocKey, new AtomicInteger(1)); String nextClientId = addressArr[next.get() % clientAllAddressSet.size()];