优化客户端自适应负载均衡效果，修复客户端生产不均匀问题

jd-opensource · Sep 25, 2020 · 25bfadd · 25bfadd
1 parent e619b32
commit 25bfadd
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 6 deletions.
diff --git a/...-adaptive/src/main/java/org/joyqueue/client/loadbalance/adaptive/AdaptiveLoadBalance.java b/...-adaptive/src/main/java/org/joyqueue/client/loadbalance/adaptive/AdaptiveLoadBalance.java
@@ -66,9 +66,7 @@ public Node doAdaptiveSelect(Nodes nodes) {
                 double compute = scoreJudge.compute(nodes, node);
                 score += (compute / 100 * scoreJudge.getRatio());
             }
-            if (score > 0) {
-                weightNodes.add(new WeightNode(node, score));
-            }
+            weightNodes.add(new WeightNode(node, score));
         }
         return weightSelect(weightNodes);
     }

diff --git a/...-adaptive/src/main/java/org/joyqueue/client/loadbalance/adaptive/judge/AvgScoreJudge.java b/...-adaptive/src/main/java/org/joyqueue/client/loadbalance/adaptive/judge/AvgScoreJudge.java
@@ -11,13 +11,20 @@
  */
 public class AvgScoreJudge implements ScoreJudge {
 
-    public static int threshhold = 500;
+    public static int exceptionThreshhold = 500;
 
     @Override
     public double compute(Nodes nodes, Node node) {
-        double score = node.getMetric().getAvg() / nodes.getMetric().getAvg() * 100;
+        double maxAvg = 0;
+        for (Node otherNode : nodes.getNodes()) {
+            if (!otherNode.getUrl().equals(node.getUrl())) {
+                maxAvg = Math.max(maxAvg, otherNode.getMetric().getAvg());
+            }
+        }
+
+        double score = node.getMetric().getAvg() / maxAvg * 100;
 
-        if (score > threshhold) {
+        if (score > exceptionThreshhold) {
             return -Integer.MAX_VALUE;
         } else {
             return 100;