(servicecomb-java-chassis) branch master updated: [#4520]ratioCeiling defaults to 100-ratio (#4522)

[liubao]

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/servicecomb-java-chassis.git


The following commit(s) were added to refs/heads/master by this push:
     new 69863e562 [#4520]ratioCeiling defaults to 100-ratio (#4522)
69863e562 is described below

commit 69863e562b95f3098feba39af822bb7d058a248b
Author: liubao68 <bi...@qq.com>
AuthorDate: Sat Sep 14 17:08:21 2024 +0800

    [#4520]ratioCeiling defaults to 100-ratio (#4522)
---
 .../servicecomb/loadbalance/filter/ZoneAwareDiscoveryFilter.java    | 6 +++---
 .../org/apache/servicecomb/loadbalance/TestLoadBalanceFilter2.java  | 2 +-
 .../loadbalance/filter/TestZoneAwareDiscoveryFilter.java            | 4 ++--
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git 
a/handlers/handler-loadbalance/src/main/java/org/apache/servicecomb/loadbalance/filter/ZoneAwareDiscoveryFilter.java
 
b/handlers/handler-loadbalance/src/main/java/org/apache/servicecomb/loadbalance/filter/ZoneAwareDiscoveryFilter.java
index a669cd15e..b39aefe8f 100644
--- 
a/handlers/handler-loadbalance/src/main/java/org/apache/servicecomb/loadbalance/filter/ZoneAwareDiscoveryFilter.java
+++ 
b/handlers/handler-loadbalance/src/main/java/org/apache/servicecomb/loadbalance/filter/ZoneAwareDiscoveryFilter.java
@@ -64,9 +64,9 @@ public class ZoneAwareDiscoveryFilter extends 
AbstractGroupDiscoveryFilter {
         int.class, 30);
   }
 
-  private int getRatioCeiling() {
+  private int getRatioCeiling(int defaultValue) {
     return environment.getProperty(CONFIG_RATIO_CEILING,
-        int.class, 70);
+        int.class, defaultValue);
   }
 
   @Override
@@ -104,7 +104,7 @@ public class ZoneAwareDiscoveryFilter extends 
AbstractGroupDiscoveryFilter {
     }
 
     int ratio = getRatio();
-    int ratioCeiling = getRatioCeiling();
+    int ratioCeiling = getRatioCeiling(100 - ratio);
 
     if (hasEnoughMembers(instances.size(), instancesRegionAndAZMatch.size(), 
ratio, ratioCeiling)) {
       parent.child(GROUP_PREFIX + groups, new DiscoveryTreeNode()
diff --git 
a/handlers/handler-loadbalance/src/test/java/org/apache/servicecomb/loadbalance/TestLoadBalanceFilter2.java
 
b/handlers/handler-loadbalance/src/test/java/org/apache/servicecomb/loadbalance/TestLoadBalanceFilter2.java
index 4eef1d8d6..25858a980 100644
--- 
a/handlers/handler-loadbalance/src/test/java/org/apache/servicecomb/loadbalance/TestLoadBalanceFilter2.java
+++ 
b/handlers/handler-loadbalance/src/test/java/org/apache/servicecomb/loadbalance/TestLoadBalanceFilter2.java
@@ -65,7 +65,7 @@ public class TestLoadBalanceFilter2 {
     
Mockito.when(environment.getProperty("servicecomb.loadbalance.filter.zoneaware.ratio",
         int.class, 30)).thenReturn(0);
     
Mockito.when(environment.getProperty("servicecomb.loadbalance.filter.zoneaware.ratioCeiling",
-        int.class, 70)).thenReturn(100);
+        int.class, 100)).thenReturn(100);
   }
 
   @Test
diff --git 
a/handlers/handler-loadbalance/src/test/java/org/apache/servicecomb/loadbalance/filter/TestZoneAwareDiscoveryFilter.java
 
b/handlers/handler-loadbalance/src/test/java/org/apache/servicecomb/loadbalance/filter/TestZoneAwareDiscoveryFilter.java
index ebb96ba73..13a5f6da9 100644
--- 
a/handlers/handler-loadbalance/src/test/java/org/apache/servicecomb/loadbalance/filter/TestZoneAwareDiscoveryFilter.java
+++ 
b/handlers/handler-loadbalance/src/test/java/org/apache/servicecomb/loadbalance/filter/TestZoneAwareDiscoveryFilter.java
@@ -46,7 +46,7 @@ public class TestZoneAwareDiscoveryFilter {
     
Mockito.when(environment.getProperty("servicecomb.loadbalance.filter.zoneaware.ratio",
         int.class, 30)).thenReturn(50);
     
Mockito.when(environment.getProperty("servicecomb.loadbalance.filter.zoneaware.ratioCeiling",
-        int.class, 70)).thenReturn(70);
+        int.class, 50)).thenReturn(70);
 
     ZoneAwareDiscoveryFilter filter = new ZoneAwareDiscoveryFilter();
     filter.setEnvironment(environment);
@@ -116,7 +116,7 @@ public class TestZoneAwareDiscoveryFilter {
     
Mockito.when(environment.getProperty("servicecomb.loadbalance.filter.zoneaware.ratio",
         int.class, 30)).thenReturn(40);
     
Mockito.when(environment.getProperty("servicecomb.loadbalance.filter.zoneaware.ratioCeiling",
-        int.class, 70)).thenReturn(60);
+        int.class, 60)).thenReturn(60);
 
     ZoneAwareDiscoveryFilter filter = new ZoneAwareDiscoveryFilter();
     filter.setEnvironment(environment);