diff --git a/sermant-plugins/sermant-service-registry/spring-cloud-registry-plugin/src/main/java/io/sermant/registry/entity/GraceShutdownBehavior.java b/sermant-plugins/sermant-service-registry/spring-cloud-registry-plugin/src/main/java/io/sermant/registry/entity/GraceShutdownBehavior.java index c66d6599cf..cda9b4e907 100644 --- a/sermant-plugins/sermant-service-registry/spring-cloud-registry-plugin/src/main/java/io/sermant/registry/entity/GraceShutdownBehavior.java +++ b/sermant-plugins/sermant-service-registry/spring-cloud-registry-plugin/src/main/java/io/sermant/registry/entity/GraceShutdownBehavior.java @@ -31,6 +31,7 @@ import io.sermant.registry.services.GraceService; import io.sermant.registry.utils.CommonUtils; +import java.time.LocalDateTime; import java.util.Locale; import java.util.logging.Logger; @@ -72,7 +73,8 @@ private void graceShutDown() { CommonUtils.sleep(shutdownCheckTimeUnit); shutdownWaitTime -= shutdownCheckTimeUnit; } - System.out.println("shutdown: " + graceService.isCompleteNotify()); + System.out.println(Thread.currentThread().getName() + LocalDateTime.now() + "shutdown: " + + graceService.isCompleteNotify()); final int requestCount = GraceContext.INSTANCE.getGraceShutDownManager().getRequestCount(); if (requestCount > 0) { LOGGER.warning(String.format(Locale.ENGLISH, "Request num that does not completed is [%s] ", requestCount)); diff --git a/sermant-plugins/sermant-service-registry/spring-cloud-registry-service/src/main/java/io/sermant/registry/service/impl/GraceServiceImpl.java b/sermant-plugins/sermant-service-registry/spring-cloud-registry-service/src/main/java/io/sermant/registry/service/impl/GraceServiceImpl.java index 990f7441bd..5712526584 100644 --- a/sermant-plugins/sermant-service-registry/spring-cloud-registry-service/src/main/java/io/sermant/registry/service/impl/GraceServiceImpl.java +++ b/sermant-plugins/sermant-service-registry/spring-cloud-registry-service/src/main/java/io/sermant/registry/service/impl/GraceServiceImpl.java @@ -87,7 +87,8 @@ public void shutdown() { Arrays.asList(clientInfo.getIp() + ":" + clientInfo.getPort(), clientInfo.getHost() + ":" + clientInfo.getPort())); latch = new CountDownLatch(AddressCache.INSTANCE.getAddressSet().size()); - System.out.println(LocalDateTime.now() + "latch count is " + latch.getCount()); + System.out.println( + Thread.currentThread().getName() + LocalDateTime.now() + "latch count is " + latch.getCount()); AddressCache.INSTANCE.getAddressSet().forEach(address -> notifyToGraceHttpServer(address, header)); } } @@ -95,9 +96,10 @@ public void shutdown() { @Override public boolean isCompleteNotify() { if (latch == null) { - System.out.println(LocalDateTime.now() + "latch is null."); + System.out.println(Thread.currentThread().getName() + LocalDateTime.now() + "latch is null."); } else { - System.out.println(LocalDateTime.now() + "isCompleteNotify: " + latch.getCount()); + System.out.println( + Thread.currentThread().getName() + LocalDateTime.now() + "isCompleteNotify: " + latch.getCount()); } return latch != null && latch.getCount() == 0; } @@ -107,11 +109,12 @@ private void notifyToGraceHttpServer(String address, Map> header) { if (result.getCode() == GraceConstants.GRACE_HTTP_SUCCESS_CODE) { break; } + System.out.println("Failed to notify before shutdown, address: " + address); LOGGER.log(Level.WARNING, "Failed to notify before shutdown, address: {0}", address); } latch.countDown(); diff --git a/sermant-plugins/sermant-service-registry/spring-cloud-registry-service/src/main/java/io/sermant/registry/service/utils/HttpClientUtils.java b/sermant-plugins/sermant-service-registry/spring-cloud-registry-service/src/main/java/io/sermant/registry/service/utils/HttpClientUtils.java index 560d2a3484..07e5089064 100644 --- a/sermant-plugins/sermant-service-registry/spring-cloud-registry-service/src/main/java/io/sermant/registry/service/utils/HttpClientUtils.java +++ b/sermant-plugins/sermant-service-registry/spring-cloud-registry-service/src/main/java/io/sermant/registry/service/utils/HttpClientUtils.java @@ -120,6 +120,12 @@ public HttpClientResult doPost(String url, String json, Map