Service offline speedup (#12869)

* Service offline speedup * Service offline speedup
apache · Aug 9, 2023 · 1dd248a · 1dd248a
1 parent 78a4dba
commit 1dd248a
Show file tree

Hide file tree

Showing 3 changed files with 42 additions and 14 deletions.
diff --git a/dubbo-plugin/dubbo-qos/src/main/java/org/apache/dubbo/qos/command/impl/BaseOffline.java b/dubbo-plugin/dubbo-qos/src/main/java/org/apache/dubbo/qos/command/impl/BaseOffline.java
@@ -18,6 +18,7 @@
 
 import org.apache.dubbo.common.logger.Logger;
 import org.apache.dubbo.common.logger.LoggerFactory;
+import org.apache.dubbo.common.threadpool.manager.FrameworkExecutorRepository;
 import org.apache.dubbo.common.utils.ArrayUtils;
 import org.apache.dubbo.qos.api.BaseCommand;
 import org.apache.dubbo.qos.api.CommandContext;
@@ -29,14 +30,20 @@
 import org.apache.dubbo.rpc.model.ServiceMetadata;
 
 import java.util.Collection;
+import java.util.LinkedList;
 import java.util.List;
+import java.util.concurrent.CompletableFuture;
+import java.util.concurrent.ExecutionException;
+import java.util.concurrent.ExecutorService;
 
 public class BaseOffline implements BaseCommand {
     private static final Logger logger = LoggerFactory.getLogger(BaseOffline.class);
     public FrameworkServiceRepository serviceRepository;
+    private ExecutorService executorService;
 
     public BaseOffline(FrameworkModel frameworkModel) {
         this.serviceRepository = frameworkModel.getServiceRepository();
+        this.executorService = frameworkModel.getBeanFactory().getBean(FrameworkExecutorRepository.class).getSharedExecutor();
     }
 
     @Override
@@ -63,18 +70,28 @@ protected boolean doExecute(String servicePattern) {
     public boolean offline(String servicePattern) {
         boolean hasService = false;
 
-        Collection<ProviderModel> providerModelList = serviceRepository.allProviderModels();
-        for (ProviderModel providerModel : providerModelList) {
-            ServiceMetadata metadata = providerModel.getServiceMetadata();
-            if (metadata.getServiceKey().matches(servicePattern) || metadata.getDisplayServiceKey().matches(servicePattern)) {
-                hasService = true;
-                List<ProviderModel.RegisterStatedURL> statedUrls = providerModel.getStatedUrl();
-                for (ProviderModel.RegisterStatedURL statedURL : statedUrls) {
-                    if (statedURL.isRegistered()) {
-                        doUnexport(statedURL);
+        try {
+            List<CompletableFuture<Void>> futures = new LinkedList<>();
+            Collection<ProviderModel> providerModelList = serviceRepository.allProviderModels();
+            for (ProviderModel providerModel : providerModelList) {
+                ServiceMetadata metadata = providerModel.getServiceMetadata();
+                if (metadata.getServiceKey().matches(servicePattern) || metadata.getDisplayServiceKey().matches(servicePattern)) {
+                    hasService = true;
+                    List<ProviderModel.RegisterStatedURL> statedUrls = providerModel.getStatedUrl();
+                    for (ProviderModel.RegisterStatedURL statedURL : statedUrls) {
+                        if (statedURL.isRegistered()) {
+                            futures.add(CompletableFuture.runAsync(() -> {
+                                doUnexport(statedURL);
+                            }, executorService));
+                        }
                     }
                 }
             }
+            for (CompletableFuture<Void> future : futures) {
+                future.get();
+            }
+        } catch (ExecutionException | InterruptedException e) {
+            throw new RuntimeException(e);
         }
 
         return hasService;

diff --git a/dubbo-plugin/dubbo-qos/src/main/java/org/apache/dubbo/qos/command/impl/GracefulShutdown.java b/dubbo-plugin/dubbo-qos/src/main/java/org/apache/dubbo/qos/command/impl/GracefulShutdown.java
@@ -37,11 +37,11 @@ public GracefulShutdown(FrameworkModel frameworkModel) {
 
     @Override
     public String execute(CommandContext commandContext, String[] args) {
-        offline.execute(commandContext, new String[0]);
         for (org.apache.dubbo.rpc.GracefulShutdown gracefulShutdown :
             org.apache.dubbo.rpc.GracefulShutdown.getGracefulShutdowns(frameworkModel)) {
             gracefulShutdown.readonly();
         }
+        offline.execute(commandContext, new String[0]);
         return "OK";
     }
 }
diff --git a/...bo-registry-api/src/main/java/org/apache/dubbo/registry/integration/RegistryProtocol.java b/...bo-registry-api/src/main/java/org/apache/dubbo/registry/integration/RegistryProtocol.java
@@ -1016,11 +1016,22 @@ public void register() {
         public synchronized void unregister() {
             if (registered.compareAndSet(true, false)) {
                 Registry registry = RegistryProtocol.this.getRegistry(getRegistryUrl(originInvoker));
-                try {
-                    registry.unregister(registerUrl);
-                } catch (Throwable t) {
-                    logger.warn(INTERNAL_ERROR, "unknown error in registry module", "", t.getMessage(), t);
+
+                ProviderModel providerModel = frameworkModel.getServiceRepository()
+                    .lookupExportedService(getRegisterUrl().getServiceKey());
+
+                List<ProviderModel.RegisterStatedURL> statedUrls = providerModel.getStatedUrl();
+                if (statedUrls.stream()
+                    .filter(u -> u.getRegistryUrl().equals(getRegisterUrl())
+                        && u.getProviderUrl().getProtocol().equals(getRegisterUrl().getProtocol()))
+                    .anyMatch(ProviderModel.RegisterStatedURL::isRegistered)) {
+                    try {
+                        registry.unregister(registerUrl);
+                    } catch (Throwable t) {
+                        logger.warn(INTERNAL_ERROR, "unknown error in registry module", "", t.getMessage(), t);
+                    }
                 }
+
                 try {
                     if (subscribeUrl != null) {
                         Map<URL, Set<NotifyListener>> overrideListeners = getProviderConfigurationListener(subscribeUrl).getOverrideListeners();