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 fc24b813a [#3960]fix vertx close may block shutdown (#3964)
fc24b813a is described below
commit fc24b813a6e5b5dd285ac6cabe5dfca64b96e007
Author: liubao68 <[email protected]>
AuthorDate: Tue Oct 10 10:42:55 2023 +0800
[#3960]fix vertx close may block shutdown (#3964)
---
.../java/org/apache/servicecomb/foundation/vertx/VertxUtils.java | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git
a/foundations/foundation-vertx/src/main/java/org/apache/servicecomb/foundation/vertx/VertxUtils.java
b/foundations/foundation-vertx/src/main/java/org/apache/servicecomb/foundation/vertx/VertxUtils.java
index 787a452f6..bc398616f 100644
---
a/foundations/foundation-vertx/src/main/java/org/apache/servicecomb/foundation/vertx/VertxUtils.java
+++
b/foundations/foundation-vertx/src/main/java/org/apache/servicecomb/foundation/vertx/VertxUtils.java
@@ -191,7 +191,7 @@ public final class VertxUtils {
public static void blockCloseVertxByName(String name) {
CompletableFuture<Void> future = closeVertxByName(name);
try {
- future.get();
+ future.get(30, TimeUnit.SECONDS);
} catch (Throwable e) {
LOGGER.error("Failed to wait close vertx {}.", name, e);
}
@@ -210,8 +210,8 @@ public final class VertxUtils {
});
try {
- latch.await();
- } catch (InterruptedException e) {
+ latch.await(30, TimeUnit.SECONDS);
+ } catch (Throwable e) {
LOGGER.info("Failed to wait close vertx {}.", vertx);
}
}