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 2021/03/30 11:31:01 UTC

[servicecomb-java-chassis] branch master updated: [SCB-2246]fix common client retry given wrong address and fail with 404 (#2332)

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 0eacdfa  [SCB-2246]fix common client retry given wrong address and fail with 404 (#2332)
0eacdfa is described below

commit 0eacdfab6c04785b7d83f5143498a1f07c8523b5
Author: bao liu <bi...@qq.com>
AuthorDate: Tue Mar 30 19:30:45 2021 +0800

    [SCB-2246]fix common client retry given wrong address and fail with 404 (#2332)
---
 .../servicecomb/service/center/client/AddressManager.java   | 12 ++++++++++--
 .../service/center/client/ServiceCenterRawClient.java       | 13 ++++++++-----
 .../serviceregistry/auth/RBACBootStrapService.java          |  2 +-
 3 files changed, 19 insertions(+), 8 deletions(-)

diff --git a/clients/service-center-client/src/main/java/org/apache/servicecomb/service/center/client/AddressManager.java b/clients/service-center-client/src/main/java/org/apache/servicecomb/service/center/client/AddressManager.java
index 93b47ba..11966c9 100644
--- a/clients/service-center-client/src/main/java/org/apache/servicecomb/service/center/client/AddressManager.java
+++ b/clients/service-center-client/src/main/java/org/apache/servicecomb/service/center/client/AddressManager.java
@@ -55,15 +55,23 @@ public class AddressManager {
     return address();
   }
 
-  public String address() {
+  public boolean sslEnabled() {
+    return address().startsWith("https://");
+  }
+
+  private String address() {
     synchronized (this) {
       return formatAddress(addresses.get(index));
     }
   }
 
-  public String nonFormattedAddress() {
+  private String nonFormattedAddress() {
     synchronized (this) {
       return addresses.get(index);
     }
   }
+
+  public String formatUrl(String url, boolean absoluteUrl) {
+    return absoluteUrl ? nonFormattedAddress() + url : address() + url;
+  }
 }
diff --git a/clients/service-center-client/src/main/java/org/apache/servicecomb/service/center/client/ServiceCenterRawClient.java b/clients/service-center-client/src/main/java/org/apache/servicecomb/service/center/client/ServiceCenterRawClient.java
index 4bf1e3e..91e39ac 100755
--- a/clients/service-center-client/src/main/java/org/apache/servicecomb/service/center/client/ServiceCenterRawClient.java
+++ b/clients/service-center-client/src/main/java/org/apache/servicecomb/service/center/client/ServiceCenterRawClient.java
@@ -69,23 +69,26 @@ public class ServiceCenterRawClient {
   private HttpResponse doHttpRequest(String url, boolean absoluteUrl, Map<String, String> headers, String content,
       String method)
       throws IOException {
+
+    String address = addressManager.formatUrl(url, absoluteUrl);
     if (headers == null) {
       headers = new HashMap<>();
     }
     headers.put(HEADER_TENANT_NAME, tenantName);
-    String address = absoluteUrl ? addressManager.nonFormattedAddress() + url : addressManager.address() + url;
     HttpRequest httpRequest = new HttpRequest(address, headers, content, method);
 
     try {
       return httpTransport.doRequest(httpRequest);
     } catch (IOException e) {
-      LOGGER.warn("send request to {} failed and retry to {} once. ", addressManager.address(),
-          addressManager.nextAddress(), e);
-      httpRequest = new HttpRequest(addressManager.address() + url, headers, content, method);
+      addressManager.nextAddress();
+      String retryAddress = addressManager.formatUrl(url, absoluteUrl);
+      LOGGER.warn("send request to {} failed and retry to {} once. ", address,
+          retryAddress, e);
+      httpRequest = new HttpRequest(address, headers, content, method);
       try {
         return httpTransport.doRequest(httpRequest);
       } catch (IOException ioException) {
-        LOGGER.warn("retry to {} failed again, and change next address {}. ", addressManager.address()
+        LOGGER.warn("retry to {} failed again, and change next address {}. ", retryAddress
             , addressManager.nextAddress());
         throw ioException;
       }
diff --git a/service-registry/registry-service-center/src/main/java/org/apache/servicecomb/serviceregistry/auth/RBACBootStrapService.java b/service-registry/registry-service-center/src/main/java/org/apache/servicecomb/serviceregistry/auth/RBACBootStrapService.java
index 6b05677..fcc1f42 100644
--- a/service-registry/registry-service-center/src/main/java/org/apache/servicecomb/serviceregistry/auth/RBACBootStrapService.java
+++ b/service-registry/registry-service-center/src/main/java/org/apache/servicecomb/serviceregistry/auth/RBACBootStrapService.java
@@ -58,7 +58,7 @@ public class RBACBootStrapService implements BootStrapService {
 
     AddressManager addressManager = createAddressManager(environment);
     SSLProperties sslProperties = createSSLProperties(environment, "sc.consumer");
-    sslProperties.setEnabled(addressManager.address().startsWith("https://"));
+    sslProperties.setEnabled(addressManager.sslEnabled());
 
     // header: x-domain-name and url: /v1/{project}/ are all token from getTenantName。
     ServiceCenterClient serviceCenterClient = new ServiceCenterClient(