You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@servicecomb.apache.org by li...@apache.org on 2018/05/03 06:21:40 UTC

[incubator-servicecomb-java-chassis] 04/04: [SCB-526]member refresh do not wait and fix it's concurrent access problems; config refresh wait for body read is done.

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

commit 114a752f4d02db1133e569ca530b7849ee4287b7
Author: liubao <ba...@huawei.com>
AuthorDate: Thu May 3 11:32:26 2018 +0800

    [SCB-526]member refresh do not wait and fix it's concurrent access problems; config refresh wait for body read is done.
---
 .../config/client/ConfigCenterClient.java          | 21 +++++-------------
 .../servicecomb/config/client/MemberDiscovery.java | 25 +++++++++++++++-------
 2 files changed, 22 insertions(+), 24 deletions(-)

diff --git a/dynamic-config/config-cc/src/main/java/org/apache/servicecomb/config/client/ConfigCenterClient.java b/dynamic-config/config-cc/src/main/java/org/apache/servicecomb/config/client/ConfigCenterClient.java
index 43e2163..aaef866 100644
--- a/dynamic-config/config-cc/src/main/java/org/apache/servicecomb/config/client/ConfigCenterClient.java
+++ b/dynamic-config/config-cc/src/main/java/org/apache/servicecomb/config/client/ConfigCenterClient.java
@@ -130,7 +130,7 @@ public class ConfigCenterClient {
     } catch (InterruptedException e) {
       throw new IllegalStateException(e);
     }
-    refreshMembers(memberDiscovery, true);
+    refreshMembers(memberDiscovery);
     ConfigRefresh refreshTask = new ConfigRefresh(parseConfigUtils, memberDiscovery);
     refreshTask.run(true);
     EXECUTOR.scheduleWithFixedDelay(refreshTask,
@@ -139,11 +139,10 @@ public class ConfigCenterClient {
         TimeUnit.MILLISECONDS);
   }
 
-  private void refreshMembers(MemberDiscovery memberDiscovery, boolean wait) {
+  private void refreshMembers(MemberDiscovery memberDiscovery) {
     if (CONFIG_CENTER_CONFIG.getAutoDiscoveryEnabled()) {
       String configCenter = memberDiscovery.getConfigServer();
       IpPort ipPort = NetUtils.parseIpPortFromURI(configCenter);
-      CountDownLatch latch = new CountDownLatch(1);
       clientMgr.findThreadBindClientPool().runOnContext(client -> {
         HttpClientRequest request = client.get(ipPort.getPort(), ipPort.getHostOrIp(), URIConst.MEMBERS, rsp -> {
           if (rsp.statusCode() == HttpResponseStatus.OK.code()) {
@@ -151,7 +150,6 @@ public class ConfigCenterClient {
               memberDiscovery.refreshMembers(buf.toJsonObject());
             });
           }
-          latch.countDown();
         });
         SignRequest signReq = createSignRequest(request.method().toString(),
             configCenter + URIConst.MEMBERS,
@@ -163,19 +161,9 @@ public class ConfigCenterClient {
         authHeaderProviders.forEach(provider -> request.headers().addAll(provider.getSignAuthHeaders(signReq)));
         request.exceptionHandler(e -> {
           LOGGER.error("Fetch member from {} failed. Error message is [{}].", configCenter, e.getMessage());
-          latch.countDown();
         });
         request.end();
       });
-      if (wait) {
-        LOGGER.info("Refreshing config center members...");
-        try {
-          latch.await(BOOTUP_WAIT_TIME, TimeUnit.SECONDS);
-        } catch (InterruptedException e) {
-          LOGGER.warn(e.getMessage());
-        }
-        LOGGER.info("Refreshing config center members is done.");
-      }
     }
   }
 
@@ -295,7 +283,7 @@ public class ConfigCenterClient {
                 if ("CREATE".equals(mAction.get("action"))) {
                   refreshConfig(configCenter, false);
                 } else if ("MEMBER_CHANGE".equals(mAction.get("action"))) {
-                  refreshMembers(memberdis, false);
+                  refreshMembers(memberdis);
                 } else {
                   parseConfigUtils.refreshConfigItemsIncremental(mAction);
                 }
@@ -357,15 +345,16 @@ public class ConfigCenterClient {
                 EventManager.post(new ConnFailEvent("config refresh result parse fail " + e.getMessage()));
                 LOGGER.error("Config refresh from {} failed. Error message is [{}].", configcenter, e.getMessage());
               }
+              latch.countDown();
             });
           } else {
             rsp.bodyHandler(buf -> {
               LOGGER.error("Server error message is [{}].", buf);
+              latch.countDown();
             });
             EventManager.post(new ConnFailEvent("fetch config fail"));
             LOGGER.error("Config refresh from {} failed.", configcenter);
           }
-          latch.countDown();
         });
         Map<String, String> headers = new HashMap<>();
         headers.put("x-domain-name", tenantName);
diff --git a/dynamic-config/config-cc/src/main/java/org/apache/servicecomb/config/client/MemberDiscovery.java b/dynamic-config/config-cc/src/main/java/org/apache/servicecomb/config/client/MemberDiscovery.java
index 6db80e6..cee4c04 100644
--- a/dynamic-config/config-cc/src/main/java/org/apache/servicecomb/config/client/MemberDiscovery.java
+++ b/dynamic-config/config-cc/src/main/java/org/apache/servicecomb/config/client/MemberDiscovery.java
@@ -41,6 +41,8 @@ public class MemberDiscovery {
 
   private List<String> configServerAddresses = new ArrayList<>();
 
+  private Object lock = new Object();
+
   private AtomicInteger counter = new AtomicInteger(0);
 
   public MemberDiscovery(List<String> configCenterUri) {
@@ -52,11 +54,13 @@ public class MemberDiscovery {
   }
 
   public String getConfigServer() {
-    if(configServerAddresses.isEmpty()) {
-      throw new IllegalStateException("Config center address is not available.");
+    synchronized (lock) {
+      if (configServerAddresses.isEmpty()) {
+        throw new IllegalStateException("Config center address is not available.");
+      }
+      int index = Math.abs(counter.get() % configServerAddresses.size());
+      return configServerAddresses.get(index);
     }
-    int index = Math.abs(counter.get() % configServerAddresses.size());
-    return configServerAddresses.get(index);
   }
 
   @Subscribe
@@ -65,17 +69,22 @@ public class MemberDiscovery {
   }
 
   public void refreshMembers(JsonObject members) {
-    configServerAddresses.clear();
+    List<String> newServerAddresses = new ArrayList<>();
     members.getJsonArray("instances").forEach(m -> {
       JsonObject instance = (JsonObject) m;
       if ("UP".equals(instance.getString("status", "UP"))) {
         String endpoint = instance.getJsonArray("endpoints").getString(0);
         String scheme = instance.getBoolean("isHttps", false) ? "https" : "http";
-        configServerAddresses.add(scheme + SCHEMA_SEPRATOR
+        newServerAddresses.add(scheme + SCHEMA_SEPRATOR
             + endpoint.substring(endpoint.indexOf(SCHEMA_SEPRATOR) + SCHEMA_SEPRATOR.length()));
       }
     });
-    Collections.shuffle(configServerAddresses);
-    LOGGER.info("config center members: {}", configServerAddresses);
+
+    synchronized (lock) {
+      this.configServerAddresses.clear();
+      this.configServerAddresses.addAll(newServerAddresses);
+      Collections.shuffle(this.configServerAddresses);
+    }
+    LOGGER.info("New config center members: {}", this.configServerAddresses);
   }
 }

-- 
To stop receiving notification emails like this one, please contact
liubao@apache.org.