fix: shutdown nacos client when discovery destroy (#4471)

Co-authored-by: ZhangJian He <[email protected]>
apache · Aug 16, 2024 · e676df9 · e676df9
1 parent 356f8b0
commit e676df9
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 1 deletion.
diff --git a/...ry/registry-nacos/src/main/java/org/apache/servicecomb/registry/nacos/NacosDiscovery.java b/...ry/registry-nacos/src/main/java/org/apache/servicecomb/registry/nacos/NacosDiscovery.java
@@ -24,6 +24,7 @@
 import java.util.Map;
 import java.util.concurrent.atomic.AtomicBoolean;
 
+import com.alibaba.nacos.api.exception.NacosException;
 import org.apache.servicecomb.registry.api.Discovery;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.core.env.Environment;
@@ -137,7 +138,13 @@ public void run() {
 
   @Override
   public void destroy() {
-
+    if (namingService != null) {
+      try {
+        namingService.shutDown();
+      } catch (NacosException e) {
+        throw new IllegalStateException("destroy process is interrupted.");
+      }
+    }
   }
 
   @Override

diff --git a/...registry-nacos/src/main/java/org/apache/servicecomb/registry/nacos/NacosRegistration.java b/...registry-nacos/src/main/java/org/apache/servicecomb/registry/nacos/NacosRegistration.java
@@ -114,6 +114,7 @@ public void destroy() {
     try {
       namingService.deregisterInstance(nacosRegistrationInstance.getServiceName(),
           nacosRegistrationInstance.getApplication(), instance);
+      namingService.shutDown();
     } catch (NacosException e) {
       throw new IllegalStateException("destroy process is interrupted.");
     }