You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@servicecomb.apache.org by li...@apache.org on 2018/07/16 06:25:34 UTC

[incubator-servicecomb-java-chassis] 04/11: [SCB-706]rule concurrent access issue and loadbalancer failed logic

This is an automated email from the ASF dual-hosted git repository.

liubao pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-servicecomb-java-chassis.git

commit 3876e5207bdcad77816c97f2dd4f46ca33744b8c
Author: liubao <ba...@huawei.com>
AuthorDate: Thu Jul 12 10:07:55 2018 +0800

    [SCB-706]rule concurrent access issue and loadbalancer failed logic
---
 .../main/java/org/apache/servicecomb/loadbalance/LoadBalancer.java    | 4 +++-
 .../java/org/apache/servicecomb/loadbalance/LoadbalanceHandler.java   | 2 +-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/handlers/handler-loadbalance/src/main/java/org/apache/servicecomb/loadbalance/LoadBalancer.java b/handlers/handler-loadbalance/src/main/java/org/apache/servicecomb/loadbalance/LoadBalancer.java
index 51bcc68..56db6ff 100644
--- a/handlers/handler-loadbalance/src/main/java/org/apache/servicecomb/loadbalance/LoadBalancer.java
+++ b/handlers/handler-loadbalance/src/main/java/org/apache/servicecomb/loadbalance/LoadBalancer.java
@@ -41,7 +41,6 @@ public class LoadBalancer extends AbstractLoadBalancer {
       LoadBalancerStats stats) {
     this.microServiceName = microServiceName;
     this.rule = rule;
-    this.rule.setLoadBalancer(this);
     this.lbStats = stats;
   }
 
@@ -56,6 +55,9 @@ public class LoadBalancer extends AbstractLoadBalancer {
 
   @Override
   public Server chooseServer(Object key) {
+    // rule is shared across loadbalancers, so it will get concurrent access problems that it's owned loadbalancer is
+    // not 'this', but this is fine to use other loadbalancer instances only when serverList is correctly set
+    this.rule.setLoadBalancer(this);
     return rule.choose(key);
   }
 
diff --git a/handlers/handler-loadbalance/src/main/java/org/apache/servicecomb/loadbalance/LoadbalanceHandler.java b/handlers/handler-loadbalance/src/main/java/org/apache/servicecomb/loadbalance/LoadbalanceHandler.java
index e0e1e42..9750f19 100644
--- a/handlers/handler-loadbalance/src/main/java/org/apache/servicecomb/loadbalance/LoadbalanceHandler.java
+++ b/handlers/handler-loadbalance/src/main/java/org/apache/servicecomb/loadbalance/LoadbalanceHandler.java
@@ -142,7 +142,7 @@ public class LoadbalanceHandler implements Handler {
     invocation.next(resp -> {
       // this stats is for WeightedResponseTimeRule
       chosenLB.getLoadBalancerStats().noteResponseTime(server, (System.currentTimeMillis() - time));
-      if (resp.isFailed()) {
+      if (isFailedResponse(resp)) {
         chosenLB.getLoadBalancerStats().incrementSuccessiveConnectionFailureCount(server);
         ServiceCombLoadBalancerStats.INSTANCE.markFailure(server);
       } else {