[#4074] optimize cors model init failed unclear prompt problem. (#4095)

apache · Dec 7, 2023 · 07ccddc · 07ccddc
1 parent 549024f
commit 07ccddc
Show file tree

Hide file tree

Showing 6 changed files with 43 additions and 15 deletions.
diff --git a/...ns/foundation-vertx/src/main/java/org/apache/servicecomb/foundation/vertx/VertxUtils.java b/...ns/foundation-vertx/src/main/java/org/apache/servicecomb/foundation/vertx/VertxUtils.java
@@ -20,13 +20,13 @@
 import java.io.IOException;
 import java.io.InputStream;
 import java.lang.management.ManagementFactory;
+import java.util.HashMap;
 import java.util.Map;
 import java.util.concurrent.CompletableFuture;
 import java.util.concurrent.CountDownLatch;
 import java.util.concurrent.TimeUnit;
 
 import org.apache.commons.io.IOUtils;
-import org.apache.servicecomb.foundation.common.Holder;
 import org.apache.servicecomb.foundation.common.concurrent.ConcurrentHashMapEx;
 import org.apache.servicecomb.foundation.vertx.client.ClientPoolManager;
 import org.apache.servicecomb.foundation.vertx.client.ClientVerticle;
@@ -85,16 +85,16 @@ public static <CLIENT_POOL> DeploymentOptions createClientDeployOptions(
   }
 
   // deploy Verticle and wait for its success. do not call this method in event-loop thread
-  public static <VERTICLE extends Verticle> boolean blockDeploy(Vertx vertx,
+  public static <VERTICLE extends Verticle> Map<String, Object> blockDeploy(Vertx vertx,
       Class<VERTICLE> cls,
       DeploymentOptions options) throws InterruptedException {
-    Holder<Boolean> result = new Holder<>();
+    Map<String, Object> result = new HashMap<>();
 
     CountDownLatch latch = new CountDownLatch(1);
     vertx.deployVerticle(cls.getName(), options, ar -> {
-      result.value = ar.succeeded();
-
+      result.put("code", ar.succeeded());
       if (ar.failed()) {
+        result.put("message", ar.cause().getMessage());
         LOGGER.error("deploy vertx failed, cause ", ar.cause());
       }
 
@@ -103,7 +103,7 @@ public static <VERTICLE extends Verticle> boolean blockDeploy(Vertx vertx,
 
     latch.await();
 
-    return result.value;
+    return result;
   }
 
   public static Vertx getOrCreateVertxByName(String name, VertxOptions vertxOptions) {

diff --git a/...ansport-highway/src/main/java/org/apache/servicecomb/transport/highway/HighwayClient.java b/...ansport-highway/src/main/java/org/apache/servicecomb/transport/highway/HighwayClient.java
@@ -17,6 +17,7 @@
 
 package org.apache.servicecomb.transport.highway;
 
+import java.util.Map;
 import java.util.concurrent.TimeoutException;
 
 import javax.ws.rs.core.Response.Status;
@@ -63,7 +64,10 @@ public void init(Vertx vertx) throws Exception {
 
     DeploymentOptions deployOptions = VertxUtils.createClientDeployOptions(clientMgr,
         HighwayConfig.getClientThreadCount());
-    VertxUtils.blockDeploy(vertx, ClientVerticle.class, deployOptions);
+    Map<String, Object> result = VertxUtils.blockDeploy(vertx, ClientVerticle.class, deployOptions);
+    if (!(boolean) result.get("code")) {
+      throw new IllegalStateException((String) result.get("message"));
+    }
   }
 
   @VisibleForTesting

diff --git a/...port-highway/src/main/java/org/apache/servicecomb/transport/highway/HighwayTransport.java b/...port-highway/src/main/java/org/apache/servicecomb/transport/highway/HighwayTransport.java
@@ -18,6 +18,7 @@
 package org.apache.servicecomb.transport.highway;
 
 import java.util.Collections;
+import java.util.Map;
 
 import org.apache.servicecomb.core.Const;
 import org.apache.servicecomb.core.Invocation;
@@ -47,7 +48,12 @@ public boolean init() throws Exception {
     json.put(ENDPOINT_KEY, getEndpoint());
     deployOptions.setConfig(json);
     deployOptions.setWorkerPoolName("pool-worker-transport-highway");
-    return VertxUtils.blockDeploy(transportVertx, HighwayServerVerticle.class, deployOptions);
+    Map<String, Object> result = VertxUtils.blockDeploy(transportVertx, HighwayServerVerticle.class, deployOptions);
+    if ((boolean) result.get("code")) {
+      return true;
+    } else {
+      throw new IllegalStateException((String) result.get("message"));
+    }
   }
 
   @Override

diff --git a/...ort-highway/src/test/java/org/apache/servicecomb/transport/highway/TestHighwayClient.java b/...ort-highway/src/test/java/org/apache/servicecomb/transport/highway/TestHighwayClient.java
@@ -17,6 +17,9 @@
 
 package org.apache.servicecomb.transport.highway;
 
+import java.util.HashMap;
+import java.util.Map;
+
 import javax.ws.rs.core.Response.Status;
 
 import org.apache.servicecomb.codec.protobuf.definition.OperationProtobuf;
@@ -97,10 +100,12 @@ public void testLoginTimeout(@Mocked Vertx vertx) {
   public void testHighwayClientSSL(@Mocked Vertx vertx) throws Exception {
     new MockUp<VertxUtils>() {
       @Mock
-      <VERTICLE extends AbstractVerticle> boolean blockDeploy(Vertx vertx,
+      <VERTICLE extends AbstractVerticle> Map<String, Object> blockDeploy(Vertx vertx,
           Class<VERTICLE> cls,
           DeploymentOptions options) {
-        return true;
+        Map<String, Object> result = new HashMap<>();
+        result.put("code", true);
+        return result;
       }
     };
 
@@ -114,10 +119,12 @@ private Object doTestSend(Vertx vertx, HighwayClientConnectionPool pool, Highway
       Object decodedResponse) throws Exception {
     new MockUp<VertxUtils>() {
       @Mock
-      <VERTICLE extends AbstractVerticle> boolean blockDeploy(Vertx vertx,
+      <VERTICLE extends AbstractVerticle> Map<String, Object> blockDeploy(Vertx vertx,
           Class<VERTICLE> cls,
           DeploymentOptions options) {
-        return true;
+        Map<String, Object> result = new HashMap<>();
+        result.put("code", true);
+        return result;
       }
     };
 

diff --git a/...t-vertx/src/main/java/org/apache/servicecomb/transport/rest/vertx/VertxRestTransport.java b/...t-vertx/src/main/java/org/apache/servicecomb/transport/rest/vertx/VertxRestTransport.java
@@ -19,6 +19,7 @@
 
 import java.util.Collections;
 import java.util.List;
+import java.util.Map;
 
 import org.apache.servicecomb.core.Const;
 import org.apache.servicecomb.core.Invocation;
@@ -105,7 +106,13 @@ public boolean init() throws Exception {
     options.setWorkerPoolSize(VertxOptions.DEFAULT_WORKER_POOL_SIZE);
 
     prepareBlockResource();
-    return VertxUtils.blockDeploy(transportVertx, TransportConfig.getRestServerVerticle(), options);
+    Map<String, Object> result = VertxUtils.blockDeploy(transportVertx, TransportConfig.getRestServerVerticle(),
+        options);
+    if ((boolean) result.get("code")) {
+      return true;
+    } else {
+      throw new IllegalStateException((String) result.get("message"));
+    }
   }
 
   private void prepareBlockResource() {

diff --git a/...rtx/src/test/java/org/apache/servicecomb/transport/rest/vertx/TestVertxRestTransport.java b/...rtx/src/test/java/org/apache/servicecomb/transport/rest/vertx/TestVertxRestTransport.java
@@ -19,6 +19,8 @@
 
 import java.io.IOException;
 import java.net.ServerSocket;
+import java.util.HashMap;
+import java.util.Map;
 
 import org.apache.servicecomb.core.Endpoint;
 import org.apache.servicecomb.core.Invocation;
@@ -62,9 +64,11 @@ public Vertx init(VertxOptions vertxOptions) {
         }
 
         @Mock
-        public <VERTICLE extends AbstractVerticle> boolean blockDeploy(Vertx vertx, Class<VERTICLE> cls,
+        public <VERTICLE extends AbstractVerticle> Map<String, Object> blockDeploy(Vertx vertx, Class<VERTICLE> cls,
             DeploymentOptions options) throws InterruptedException {
-          return true;
+          Map<String, Object> result = new HashMap<>();
+          result.put("code", true);
+          return result;
         }
       };
       instance.init();