fix the bug, consistenthash loadbalance always construct new Consiste…

…ntHashSelector #5429
apache · Dec 9, 2019 · 68821a1 · 68821a1
1 parent 97e20f5
commit 68821a1
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 1 deletion.
diff --git a/...ter/src/main/java/org/apache/dubbo/rpc/cluster/loadbalance/ConsistentHashLoadBalance.java b/...ter/src/main/java/org/apache/dubbo/rpc/cluster/loadbalance/ConsistentHashLoadBalance.java
@@ -55,7 +55,8 @@ public class ConsistentHashLoadBalance extends AbstractLoadBalance {
     protected <T> Invoker<T> doSelect(List<Invoker<T>> invokers, URL url, Invocation invocation) {
         String methodName = RpcUtils.getMethodName(invocation);
         String key = invokers.get(0).getUrl().getServiceKey() + "." + methodName;
-        int identityHashCode = System.identityHashCode(invokers);
+        // using the hashcode of list to compute the hash only pay attention to the elements in the list
+        int identityHashCode = invokers.hashCode();
         ConsistentHashSelector<T> selector = (ConsistentHashSelector<T>) selectors.get(key);
         if (selector == null || selector.identityHashCode != identityHashCode) {
             selectors.put(key, new ConsistentHashSelector<T>(invokers, methodName, identityHashCode));

diff --git a/...src/test/java/org/apache/dubbo/rpc/cluster/loadbalance/ConsistentHashLoadBalanceTest.java b/...src/test/java/org/apache/dubbo/rpc/cluster/loadbalance/ConsistentHashLoadBalanceTest.java
@@ -16,11 +16,14 @@
  */
 package org.apache.dubbo.rpc.cluster.loadbalance;
 
+import org.apache.dubbo.common.URL;
 import org.apache.dubbo.rpc.Invoker;
 
+import org.apache.dubbo.rpc.cluster.LoadBalance;
 import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Test;
 
+import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.Map;
 import java.util.concurrent.atomic.AtomicLong;
@@ -49,6 +52,14 @@ public void testConsistentHashLoadBalance() {
         Assertions.assertEquals(1, hitedInvokers.size(), "the number of hitedInvoker should be 1");
         Assertions.assertEquals(runs,
                 hitedInvokers.values().iterator().next().intValue(), "the number of hited count should be the number of runs");
+
+        LoadBalance lb = getLoadBalance(ConsistentHashLoadBalance.NAME);
+        URL url = invokers.get(0).getUrl();
+        Invoker  hittedInvoker = hitedInvokers.keySet().iterator().next();
+        for (int i = 0; i < runs; i++) {
+            invokers = new ArrayList<>(invokers);
+            Assertions.assertEquals(hittedInvoker.hashCode(),lb.select(invokers, url, invocation).hashCode());
+        }
     }
 
 }