合并master分支到develop并解决冲突，为后续develop合并回master做准备

.github/workflows/unit-test.yml

@@ -13,24 +13,30 @@ jobs:
   build:
 
     runs-on: ubuntu-latest
+    timeout-minutes: 15
 
     steps:
-      - uses: actions/checkout@v2
-      - name: Set up JDK 1.8
-        uses: actions/setup-java@v1
-        with:
-          java-version: 1.8
-      - name: Unit Testt
-        run: mvn compile -B
-          && mvn clean test -DisSkipIntegrationTest=true "-Dtest.logging.level=ERROR" --fail-at-end --batch-mode
-      - name: Publish Test Report
-        if: ${{ always() }}
-        uses: ScaCap/action-surefire-report@v1
-        with:
-          fail_on_test_failures: true
-          skip_publishing: true
-      - name: Codecov
-        uses: codecov/codecov-action@v1
-        with:
-          token: ${{secrets.CODECOV_TOKEN}}
-          fail_ci_if_error: false
+    - uses: actions/checkout@v2
+    - name: Set up JDK 1.8
+      uses: actions/setup-java@v1
+      with:
+        java-version: 1.8
+    - name: Unit Testt
+      run: mvn compile -B
+        && mvn clean test -DisSkipIntegrationTest=true "-Dtest.logging.level=ERROR" --fail-at-end --batch-mode
+    - name: Upload heap dump
+      if: always()
+      uses: actions/upload-artifact@v2
+      with:
+        name: heap-dump
+        path: /tmp/*.hprof
+    - name: Publish Test Report
+      if: ${{ always() }}
+      uses: ScaCap/action-surefire-report@v1
+      with:
+        fail_on_test_failures: true
+        skip_publishing: true
+    - name: Codecov
+      uses: codecov/codecov-action@v1
+      with:
+        token: ${{secrets.CODECOV_TOKEN}}

VERSION

@@ -1 +1 @@
-6.1.9
+6.5.1

client/all/pom.xml

@@ -6,7 +6,7 @@
 
     <groupId>com.alipay.sofa</groupId>
     <artifactId>registry-client-all</artifactId>
-    <version>6.1.9</version>
+    <version>6.5.1</version>
 
     <name>${project.groupId}:${project.artifactId}</name>
     <url>http://github.com/alipay/sofa-registry</url>

client/api/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <groupId>com.alipay.sofa</groupId>
         <artifactId>registry-client-parent</artifactId>
-        <version>6.1.9</version>
+        <version>6.5.1</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>

client/impl/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <groupId>com.alipay.sofa</groupId>
         <artifactId>registry-client-parent</artifactId>
-        <version>6.1.9</version>
+        <version>6.5.1</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>

client/impl/src/main/java/com/alipay/sofa/registry/client/provider/DefaultServerManager.java

@@ -90,7 +90,7 @@ public ServerNode random() {
   private void syncServerList() {
     String url =
         String.format(
-            "http://%s:%d/api/servers/query",
+            "http://%s:%d/api/servers/queryWithWeight",
             config.getRegistryEndpoint(), config.getRegistryEndpointPort());
     Map<String, String> params = new HashMap<String, String>();
     params.put("env", config.getEnv());
@@ -100,6 +100,14 @@ private void syncServerList() {
     params.put("instanceId", config.getInstanceId());
     try {
       String result = HttpClientUtils.get(url, params, config);
+      if (null == result) {
+        // when registry not support query with weight , go back
+        url =
+            String.format(
+                "http://%s:%d/api/servers/query",
+                config.getRegistryEndpoint(), config.getRegistryEndpointPort());
+        result = HttpClientUtils.get(url, params, config);
+      }
       if (null != result) {
         String[] servers = result.split(";");
         Set<ServerNode> tempNodes = new HashSet<ServerNode>();

client/impl/src/main/java/com/alipay/sofa/registry/client/provider/DefaultServerNode.java

@@ -17,6 +17,7 @@
 package com.alipay.sofa.registry.client.provider;
 
 import com.alipay.sofa.registry.client.remoting.ServerNode;
+import com.alipay.sofa.registry.client.util.StringUtils;
 import java.util.Properties;
 
 /**
@@ -35,6 +36,8 @@ public class DefaultServerNode implements ServerNode {
 
   private Properties properties;
 
+  private static final String WEIGHT_KEY = "weight";
+
   /**
    * Instantiates a new Default server node.
    *
@@ -80,6 +83,22 @@ public String getUrl() {
     return url;
   }
 
+  @Override
+  public int getWeight() {
+    if (null == getProperties()) {
+      return 0;
+    }
+    String weightStr = getProperties().getProperty(WEIGHT_KEY);
+    if (StringUtils.isBlank(weightStr)) {
+      return 0;
+    }
+    try {
+      return Integer.parseInt(weightStr);
+    } catch (NumberFormatException e) {
+      return 0;
+    }
+  }
+
   /**
    * Gets properties.
    *

client/impl/src/main/java/com/alipay/sofa/registry/client/remoting/ClientConnection.java

@@ -125,20 +125,29 @@ private boolean connect() {
     List<ServerNode> serverNodes = new ArrayList<ServerNode>(serverManager.getServerList());
     // shuffle server list to make server connections as discrete as possible
     Collections.shuffle(serverNodes);
-    for (ServerNode serverNode : serverNodes) {
+    int choosed = 0;
+    for (int i = 0; i < serverNodes.size(); i++) {
       try {
-        connection = connect(serverNode);
+        // Power of Two Choices
+        if (serverNodes.size() > 1) {
+          choosed =
+              serverNodes.get(i).getWeight()
+                      > serverNodes.get((i + 1) % serverNodes.size()).getWeight()
+                  ? (i + 1) % serverNodes.size()
+                  : i;
+        }
+        connection = connect(serverNodes.get(choosed));
         if (null != connection && connection.isFine()) {
           resetRegister();
-          LOGGER.info("[Connect] Successfully connected to server: {}", serverNode);
+          LOGGER.info("[Connect] Successfully connected to server: {}", serverNodes.get(choosed));
           break;
         } else {
           recycle(connection);
         }
 
         Thread.sleep(random.nextInt(RECONNECTING_DELAY));
       } catch (Exception e) {
-        LOGGER.error("[Connect] Failed trying connect to {}", serverNode, e);
+        LOGGER.error("[Connect] Failed trying connect to {}", serverNodes.get(choosed), e);
       }
     }
 

client/impl/src/main/java/com/alipay/sofa/registry/client/remoting/ServerNode.java

@@ -53,4 +53,11 @@ public interface ServerNode {
    * @return the url
    */
   String getUrl();
+
+  /**
+   * Gets Weight
+   *
+   * @return the weight
+   */
+  int getWeight();
 }

client/impl/src/test/java/com/alipay/sofa/registry/client/provider/DefaultServerManagerTest.java

@@ -17,9 +17,7 @@
 package com.alipay.sofa.registry.client.provider;
 
 import static org.junit.Assert.assertNotNull;
-import static org.mockito.Matchers.any;
-import static org.mockito.Matchers.anyMapOf;
-import static org.mockito.Matchers.anyString;
+import static org.mockito.Matchers.*;
 import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.times;
 import static org.mockito.Mockito.when;
@@ -67,4 +65,36 @@ public void initServerList() throws Exception {
     // verify
     PowerMockito.verifyStatic(times(4));
   }
+
+  @Test
+  public void initServerListCompatible() throws Exception {
+    // given
+    PowerMockito.mockStatic(HttpClientUtils.class);
+    RegistryClientConfig config = mock(RegistryClientConfig.class);
+
+    // when
+    when(config.getSyncConfigRetryInterval()).thenReturn(100);
+    when(HttpClientUtils.get(
+            eq("http://null:0/api/servers/queryWithWeight"),
+            anyMapOf(String.class, String.class),
+            any(RegistryClientConfig.class)))
+        .thenReturn(null);
+    when(HttpClientUtils.get(
+            eq("http://null:0/api/servers/query"),
+            anyMapOf(String.class, String.class),
+            any(RegistryClientConfig.class)))
+        .thenReturn("127.0.0.1:9600;127.0.0.2:9600");
+
+    // then
+    ServerManager serverManager = new DefaultServerManager(config);
+
+    List<ServerNode> serverList = serverManager.getServerList();
+
+    assertNotNull(serverList);
+
+    Thread.sleep(450);
+
+    // verify
+    PowerMockito.verifyStatic(times(4));
+  }
 }

client/log/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <groupId>com.alipay.sofa</groupId>
         <artifactId>registry-client-parent</artifactId>
-        <version>6.1.9</version>
+        <version>6.5.1</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>

client/pom.xml

@@ -7,7 +7,7 @@
     <parent>
         <groupId>com.alipay.sofa</groupId>
         <artifactId>registry-parent</artifactId>
-        <version>6.1.9</version>
+        <version>6.5.1</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
 

codecov.yml

@@ -11,4 +11,4 @@ ignore:
 comment:
   behavior: default
   layout: reach,diff,flags,files,footer
-  require_changes: false
+  require_changes: false

core/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <groupId>com.alipay.sofa</groupId>
         <artifactId>registry-parent</artifactId>
-        <version>6.1.9</version>
+        <version>6.5.1</version>
         <relativePath>../pom.xml</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>