Merge pull request #824 from zyearn/fix_lalb_base_weight_to_zero

fix lalb be disabled wrongly
apache · Jul 13, 2019 · f43bdce · f43bdce
2 parents 96665f3 + d4cc3f3
commit f43bdce
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/src/brpc/policy/locality_aware_load_balancer.cpp b/src/brpc/policy/locality_aware_load_balancer.cpp
@@ -555,7 +555,7 @@ LocalityAwareLoadBalancer::Weight::~Weight() {
 int64_t LocalityAwareLoadBalancer::Weight::Disable() {
     BAIDU_SCOPED_LOCK(_mutex);
     const int64_t saved = _weight;
-    _base_weight = 0;
+    _base_weight = -1;
     _weight = 0;
     return saved;
 }

diff --git a/src/brpc/policy/locality_aware_load_balancer.h b/src/brpc/policy/locality_aware_load_balancer.h
@@ -86,7 +86,7 @@ class LocalityAwareLoadBalancer : public LoadBalancer {
         void Describe(std::ostream& os, int64_t now);
 
         int64_t Disable();
-        bool Disabled() const { return _base_weight == 0; }
+        bool Disabled() const { return _base_weight < 0; }
         int64_t MarkOld(size_t index);
         std::pair<int64_t, int64_t> ClearOld();