负载均衡

mwq0106 · Oct 12, 2020 · 5df7640 · 5df7640
1 parent b66c480
commit 5df7640
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 7 deletions.
diff --git a/client/src/main/java/com/hirpc/loadbalance/Balancer.java b/client/src/main/java/com/hirpc/loadbalance/Balancer.java
@@ -11,7 +11,7 @@
 public interface Balancer {
 
     /**
-     * 从候选地址<code>candidates</code>中根据一定的负载均衡算法选出一台服务器的地址
+     * 从候选地址 candidates 中根据一定的负载均衡算法选出一台服务器的地址
      *
      * @param service 服务
      * @param candidates  服务的候选地址

diff --git a/client/src/main/java/com/hirpc/loadbalance/impl/ConsistentHashBalancer.java b/client/src/main/java/com/hirpc/loadbalance/impl/ConsistentHashBalancer.java
@@ -50,11 +50,10 @@ private long hash(String key) {
                 | ((long) (digest[1] & 0xFF) << 8)
                 | (digest[0] & 0xFF);
 
-        long truncateHashCode = hashCode & 0xffffffffL;
-        return truncateHashCode;
+        return hashCode & 0xffffffffL;
     }
 
-    public RpcClientHandler doRoute(String serviceKey, List<RpcClientHandler> handlers) {
+    private RpcClientHandler doRoute(String serviceKey, List<RpcClientHandler> handlers) {
 
         // ------A1------A2-------A3------
         // -----------J1------------------

diff --git a/client/src/main/java/com/hirpc/loadbalance/impl/RoundRobinBalancer.java b/client/src/main/java/com/hirpc/loadbalance/impl/RoundRobinBalancer.java
@@ -7,6 +7,7 @@
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.atomic.AtomicInteger;
 
 /**
@@ -15,13 +16,15 @@
  */
 public class RoundRobinBalancer implements Balancer {
 
-    private volatile Map<String, AtomicInteger> requestMap = new HashMap<>();
+    private volatile Map<String, AtomicInteger> requestMap = new ConcurrentHashMap<>();
     @Override
     public RpcClientHandler elect(String service, List<RpcClientHandler> candidates) {
-        if (!requestMap.containsKey(service)) {
+        AtomicInteger lastIndex = requestMap.get(service);
+        if (lastIndex == null) {
             requestMap.put(service, new AtomicInteger(0));
+            lastIndex = requestMap.get(service);
         }
-        int index = requestMap.get(service).getAndAdd(1) %  candidates.size();
+        int index = lastIndex.getAndAdd(1) %  candidates.size();
 
         return candidates.get(index);
     }