(servicecomb-java-chassis) branch master updated: [SCB-2842]change default setting for connection timeout and zone-aware ratio (#4135)

[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 bfe03aef6 [SCB-2842]change default setting for connection timeout and 
zone-aware ratio (#4135)
bfe03aef6 is described below

commit bfe03aef600cf9a9048fdeb7529694f35763fc54
Author: liubao68 <bi...@qq.com>
AuthorDate: Fri Dec 15 11:24:17 2023 +0800

    [SCB-2842]change default setting for connection timeout and zone-aware 
ratio (#4135)
---
 .../apache/servicecomb/loadbalance/filter/ZoneAwareDiscoveryFilter.java | 2 +-
 .../java/org/apache/servicecomb/loadbalance/TestLoadBalanceFilter2.java | 2 +-
 .../servicecomb/loadbalance/filter/TestZoneAwareDiscoveryFilter.java    | 2 +-
 .../apache/servicecomb/transport/rest/client/TransportClientConfig.java | 2 +-
 4 files changed, 4 insertions(+), 4 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 eb86fc8d5..b1e76dc6b 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
@@ -59,7 +59,7 @@ public class ZoneAwareDiscoveryFilter extends 
AbstractGroupDiscoveryFilter {
 
   private int getRatio() {
     return environment.getProperty(CONFIG_RATIO,
-        int.class, 50);
+        int.class, 30);
   }
 
   @Override
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 e2b4418bc..1cf987433 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
@@ -60,7 +60,7 @@ public class TestLoadBalanceFilter2 {
     
Mockito.when(environment.getProperty("servicecomb.loadbalance.filter.zoneaware.enabled",
         Boolean.class, true)).thenReturn(true);
     
Mockito.when(environment.getProperty("servicecomb.loadbalance.filter.zoneaware.ratio",
-        int.class, 50)).thenReturn(0);
+        int.class, 30)).thenReturn(0);
   }
 
   @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 dfab80adc..cd32f3ae3 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
@@ -44,7 +44,7 @@ public class TestZoneAwareDiscoveryFilter {
   @Test
   public void test_not_enough_instance() {
     
Mockito.when(environment.getProperty("servicecomb.loadbalance.filter.zoneaware.ratio",
-        int.class, 50)).thenReturn(50);
+        int.class, 30)).thenReturn(50);
 
     ZoneAwareDiscoveryFilter filter = new ZoneAwareDiscoveryFilter();
     filter.setEnvironment(environment);
diff --git 
a/transports/transport-rest/transport-rest-client/src/main/java/org/apache/servicecomb/transport/rest/client/TransportClientConfig.java
 
b/transports/transport-rest/transport-rest-client/src/main/java/org/apache/servicecomb/transport/rest/client/TransportClientConfig.java
index 1e07973e2..b4fcd77fe 100644
--- 
a/transports/transport-rest/transport-rest-client/src/main/java/org/apache/servicecomb/transport/rest/client/TransportClientConfig.java
+++ 
b/transports/transport-rest/transport-rest-client/src/main/java/org/apache/servicecomb/transport/rest/client/TransportClientConfig.java
@@ -111,6 +111,6 @@ public final class TransportClientConfig {
 
   public static int getConnectionTimeoutInMillis() {
     return LegacyPropertyFactory
-        .getIntProperty("servicecomb.rest.client.connection.timeoutInMillis", 
1000);
+        .getIntProperty("servicecomb.rest.client.connection.timeoutInMillis", 
60000);
   }
 }