[SCB-2842]change default setting for connection timeout and zone-aware ratio

Author: liubao68

foundations/foundation-registry/src/main/java/org/apache/servicecomb/registry/consumer/MicroserviceVersions.java

@@ -234,20 +234,20 @@ private void setInstances(List<MicroserviceInstance> pulledInstances, String rev
       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(),
                 microserviceId -> createMicroserviceVersion(microserviceId, entry.getValue()))
             .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);
       }

handlers/handler-loadbalance/src/main/java/org/apache/servicecomb/loadbalance/filterext/ZoneAwareDiscoveryFilter.java

@@ -45,7 +45,7 @@ public boolean enabled() {
 
   private int getRatio() {
     return DynamicPropertyFactory.getInstance()
-        .getIntProperty(CONFIG_RATIO, 50).get();
+        .getIntProperty(CONFIG_RATIO, 30).get();
   }
 
   @Override

handlers/handler-loadbalance/src/test/java/org/apache/servicecomb/loadbalance/filterext/TestZoneAwareDiscoveryFilter.java

@@ -49,6 +49,7 @@ public void tearDown() {
 
   @Test
   public void test_not_enough_instance() {
+    ArchaiusUtils.setProperty(ZoneAwareDiscoveryFilter.CONFIG_RATIO, 50);
     ZoneAwareDiscoveryFilter filter = new ZoneAwareDiscoveryFilter();
 
     // set up data

transports/transport-rest/transport-rest-client/src/main/java/org/apache/servicecomb/transport/rest/client/TransportClientConfig.java

@@ -139,7 +139,7 @@ public static boolean isHttpTransportClientEnabled() {
 
   public static int getConnectionTimeoutInMillis() {
     return DynamicPropertyFactory.getInstance()
-        .getIntProperty("servicecomb.rest.client.connection.timeoutInMillis", 1000)
+        .getIntProperty("servicecomb.rest.client.connection.timeoutInMillis", 60000)
         .get();
   }
 }