(servicecomb-java-chassis) branch 2.8.x updated: [SCB-2842]change default setting for connection timeout and zone-aware ratio

[liubao]

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

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


The following commit(s) were added to refs/heads/2.8.x by this push:
     new fb4ccaa4c [SCB-2842]change default setting for connection timeout and 
zone-aware ratio
fb4ccaa4c is described below

commit fb4ccaa4cb4246fb1d745a78422d290ce5eccfd6
Author: liubao <bi...@qq.com>
AuthorDate: Fri Dec 15 11:13:05 2023 +0800

    [SCB-2842]change default setting for connection timeout and zone-aware ratio
---
 .../registry/consumer/MicroserviceVersions.java            | 14 +++++++-------
 .../loadbalance/filterext/ZoneAwareDiscoveryFilter.java    |  2 +-
 .../filterext/TestZoneAwareDiscoveryFilter.java            |  1 +
 .../transport/rest/client/TransportClientConfig.java       |  2 +-
 4 files changed, 10 insertions(+), 9 deletions(-)

diff --git 
a/foundations/foundation-registry/src/main/java/org/apache/servicecomb/registry/consumer/MicroserviceVersions.java
 
b/foundations/foundation-registry/src/main/java/org/apache/servicecomb/registry/consumer/MicroserviceVersions.java
index 4e665b2db..16744f7bc 100644
--- 
a/foundations/foundation-registry/src/main/java/org/apache/servicecomb/registry/consumer/MicroserviceVersions.java
+++ 
b/foundations/foundation-registry/src/main/java/org/apache/servicecomb/registry/consumer/MicroserviceVersions.java
@@ -234,13 +234,6 @@ public class MicroserviceVersions {
       MergedInstances mergedInstances = mergeInstances(pulledInstances, 
instances);
       instances = mergedInstances.instanceIdMap.values();
 
-      // set instances to empty for no instance versions
-      versions.forEach((key, value) -> {
-        if (!mergedInstances.microserviceIdMap.containsKey(key)) {
-          value.setInstances(new ArrayList<>());
-        }
-      });
-
       // update instances
       for (Entry<String, List<MicroserviceInstance>> entry : 
mergedInstances.microserviceIdMap.entrySet()) {
         versions.computeIfAbsent(entry.getKey(),
@@ -248,6 +241,13 @@ public class MicroserviceVersions {
             .setInstances(entry.getValue());
       }
 
+      // set instances to empty for no instance versions
+      versions.forEach((key, value) -> {
+        if (!mergedInstances.microserviceIdMap.containsKey(key)) {
+          value.setInstances(new ArrayList<>());
+        }
+      });
+
       for (MicroserviceVersionRule microserviceVersionRule : 
versionRules.values()) {
         microserviceVersionRule.update(versions, instances);
       }
diff --git 
a/handlers/handler-loadbalance/src/main/java/org/apache/servicecomb/loadbalance/filterext/ZoneAwareDiscoveryFilter.java
 
b/handlers/handler-loadbalance/src/main/java/org/apache/servicecomb/loadbalance/filterext/ZoneAwareDiscoveryFilter.java
index fd308c282..4702f53c8 100644
--- 
a/handlers/handler-loadbalance/src/main/java/org/apache/servicecomb/loadbalance/filterext/ZoneAwareDiscoveryFilter.java
+++ 
b/handlers/handler-loadbalance/src/main/java/org/apache/servicecomb/loadbalance/filterext/ZoneAwareDiscoveryFilter.java
@@ -45,7 +45,7 @@ public class ZoneAwareDiscoveryFilter implements 
ServerListFilterExt {
 
   private int getRatio() {
     return DynamicPropertyFactory.getInstance()
-        .getIntProperty(CONFIG_RATIO, 50).get();
+        .getIntProperty(CONFIG_RATIO, 30).get();
   }
 
   @Override
diff --git 
a/handlers/handler-loadbalance/src/test/java/org/apache/servicecomb/loadbalance/filterext/TestZoneAwareDiscoveryFilter.java
 
b/handlers/handler-loadbalance/src/test/java/org/apache/servicecomb/loadbalance/filterext/TestZoneAwareDiscoveryFilter.java
index 9d7e722ee..c54589780 100644
--- 
a/handlers/handler-loadbalance/src/test/java/org/apache/servicecomb/loadbalance/filterext/TestZoneAwareDiscoveryFilter.java
+++ 
b/handlers/handler-loadbalance/src/test/java/org/apache/servicecomb/loadbalance/filterext/TestZoneAwareDiscoveryFilter.java
@@ -49,6 +49,7 @@ public class TestZoneAwareDiscoveryFilter {
 
   @Test
   public void test_not_enough_instance() {
+    ArchaiusUtils.setProperty(ZoneAwareDiscoveryFilter.CONFIG_RATIO, 50);
     ZoneAwareDiscoveryFilter filter = new ZoneAwareDiscoveryFilter();
 
     // set up data
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 e7ec16ff7..d0be3b82c 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
@@ -139,7 +139,7 @@ public final class TransportClientConfig {
 
   public static int getConnectionTimeoutInMillis() {
     return DynamicPropertyFactory.getInstance()
-        .getIntProperty("servicecomb.rest.client.connection.timeoutInMillis", 
1000)
+        .getIntProperty("servicecomb.rest.client.connection.timeoutInMillis", 
60000)
         .get();
   }
 }