[3.0] Patch DefaultApplicationDeployer for delay exporting (apache#9183)

* synchronize at the entrance of getServiceExportExecutor * remove useless codes * format codes * synchronize at the entrance of getServiceReferExecutor * shutdown export,refer executor at destroyExecutorRepository
hongyuwen · Nov 4, 2021 · c1f29cd · c1f29cd
1 parent d981788
commit c1f29cd
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 15 deletions.
diff --git a/...n/src/main/java/org/apache/dubbo/common/threadpool/manager/DefaultExecutorRepository.java b/...n/src/main/java/org/apache/dubbo/common/threadpool/manager/DefaultExecutorRepository.java
@@ -212,13 +212,11 @@ public ExecutorService nextExecutorExecutor() {
 
     @Override
     public ScheduledExecutorService getServiceExportExecutor() {
-        if (serviceExportExecutor == null) {
-            synchronized (LOCK) {
-                if (serviceExportExecutor == null) {
-                    int coreSize = getExportThreadNum();
-                    serviceExportExecutor = Executors.newScheduledThreadPool(coreSize,
+        synchronized (LOCK) {
+            if (serviceExportExecutor == null) {
+                int coreSize = getExportThreadNum();
+                serviceExportExecutor = Executors.newScheduledThreadPool(coreSize,
                         new NamedThreadFactory("Dubbo-service-export", true));
-                }
             }
         }
         return serviceExportExecutor;
@@ -241,13 +239,11 @@ public void shutdownServiceExportExecutor() {
 
     @Override
     public ExecutorService getServiceReferExecutor() {
-        if (serviceReferExecutor == null) {
-            synchronized (LOCK) {
-                if (serviceReferExecutor == null) {
-                    int coreSize = getReferThreadNum();
-                    serviceReferExecutor = Executors.newFixedThreadPool(coreSize,
+        synchronized (LOCK) {
+            if (serviceReferExecutor == null) {
+                int coreSize = getReferThreadNum();
+                serviceReferExecutor = Executors.newFixedThreadPool(coreSize,
                         new NamedThreadFactory("Dubbo-service-refer", true));
-                }
             }
         }
         return serviceReferExecutor;

diff --git a/...o-config-api/src/main/java/org/apache/dubbo/config/deploy/DefaultApplicationDeployer.java b/...o-config-api/src/main/java/org/apache/dubbo/config/deploy/DefaultApplicationDeployer.java
@@ -1013,9 +1013,6 @@ private void onStarted() {
             } catch (Exception e) {
                 logger.error("refresh metadata failed: " + e.getMessage(), e);
             }
-            // shutdown export/refer executor after started
-            executorRepository.shutdownServiceExportExecutor();
-            executorRepository.shutdownServiceReferExecutor();
         } finally {
             // complete future
             completeStartFuture(true);
@@ -1057,6 +1054,9 @@ private void onStopped() {
     }
 
     private void destroyExecutorRepository() {
+        // shutdown export/refer executor
+        executorRepository.shutdownServiceExportExecutor();
+        executorRepository.shutdownServiceReferExecutor();
         getExtensionLoader(ExecutorRepository.class).getDefaultExtension().destroyAll();
     }