fix xds, append 'xds' cluster to url

chickenlj · Jul 11, 2024 · 7b0952b · 7b0952b
1 parent c4a891c
commit 7b0952b
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 15 deletions.
diff --git a/dubbo-common/src/main/java/org/apache/dubbo/config/Constants.java b/dubbo-common/src/main/java/org/apache/dubbo/config/Constants.java
@@ -168,7 +168,7 @@ public interface Constants {
 
     Set<String> SUPPORT_MESH_TYPE = new HashSet<String>() {
         {
-            addAll(Arrays.asList("istio"));
+            addAll(Arrays.asList("xds"));
         }
     };
 }
diff --git a/dubbo-config/dubbo-config-api/src/main/java/org/apache/dubbo/config/ReferenceConfig.java b/dubbo-config/dubbo-config-api/src/main/java/org/apache/dubbo/config/ReferenceConfig.java
@@ -727,7 +727,8 @@ private void checkInvokerAvailable(long timeout) throws IllegalStateException {
         long startTime = System.currentTimeMillis();
         long checkDeadline = startTime + timeout;
         do {
-            logger.info("Waiting for service " + getUniqueServiceName() + " to be available..., set 'dubbo.consumer.check=false' to skip check.");
+            logger.info("Waiting for service " + getUniqueServiceName()
+                    + " to be available..., set 'dubbo.consumer.check=false' to skip check.");
             try {
                 Thread.sleep(100);
             } catch (InterruptedException e) {

diff --git a/dubbo-xds/src/main/java/org/apache/dubbo/xds/registry/XdsServiceDiscovery.java b/dubbo-xds/src/main/java/org/apache/dubbo/xds/registry/XdsServiceDiscovery.java
@@ -36,21 +36,21 @@ public XdsServiceDiscovery(ApplicationModel applicationModel, URL registryURL) {
     }
 
     public void doInitialize(URL registryURL) {
-         try {
-             exchanger = PilotExchanger.initialize(registryURL);
-         } catch (Throwable t) {
-             logger.error(REGISTRY_ERROR_INITIALIZE_XDS, "", "", t.getMessage(), t);
-         }
+        try {
+            exchanger = PilotExchanger.initialize(registryURL);
+        } catch (Throwable t) {
+            logger.error(REGISTRY_ERROR_INITIALIZE_XDS, "", "", t.getMessage(), t);
+        }
     }
 
     public void doDestroy() {
-         try {
-             if (exchanger == null) {
-                 return;
-             }
-             exchanger.destroy();
-         } catch (Throwable t) {
-             logger.error(REGISTRY_ERROR_INITIALIZE_XDS, "", "", t.getMessage(), t);
-         }
+        try {
+            if (exchanger == null) {
+                return;
+            }
+            exchanger.destroy();
+        } catch (Throwable t) {
+            logger.error(REGISTRY_ERROR_INITIALIZE_XDS, "", "", t.getMessage(), t);
+        }
     }
 }