Merge branch 'apache-3.1' into apache-3.2

apache · Mar 12, 2023 · 179e1e7 · 179e1e7
2 parents 100a442 + 234f1c6
commit 179e1e7
Show file tree

Hide file tree

Showing 4 changed files with 31 additions and 2 deletions.
diff --git a/dubbo-common/src/main/java/org/apache/dubbo/rpc/model/ApplicationModel.java b/dubbo-common/src/main/java/org/apache/dubbo/rpc/model/ApplicationModel.java
@@ -35,6 +35,7 @@
 import java.util.Set;
 import java.util.concurrent.CopyOnWriteArrayList;
 import java.util.concurrent.atomic.AtomicInteger;
+import java.util.concurrent.locks.Lock;
 
 /**
  * {@link ExtensionLoader}, {@code DubboBootstrap} and this class are at present designed to be
@@ -344,6 +345,11 @@ public void setDeployer(ApplicationDeployer deployer) {
         this.deployer = deployer;
     }
 
+    @Override
+    protected Lock acquireDestroyLock() {
+        return frameworkModel.acquireDestroyLock();
+    }
+
     // =============================== Deprecated Methods Start =======================================
 
     /**

diff --git a/dubbo-common/src/main/java/org/apache/dubbo/rpc/model/FrameworkModel.java b/dubbo-common/src/main/java/org/apache/dubbo/rpc/model/FrameworkModel.java
@@ -33,6 +33,8 @@
 import java.util.Set;
 import java.util.concurrent.CopyOnWriteArrayList;
 import java.util.concurrent.atomic.AtomicLong;
+import java.util.concurrent.locks.Lock;
+import java.util.concurrent.locks.ReentrantLock;
 import java.util.stream.Collectors;
 
 /**
@@ -48,7 +50,7 @@ public class FrameworkModel extends ScopeModel {
     private static final AtomicLong index = new AtomicLong(1);
 
     private static final Object globalLock = new Object();
-    
+
     private volatile static FrameworkModel defaultInstance;
 
     private static final List<FrameworkModel> allInstances = new CopyOnWriteArrayList<>();
@@ -68,6 +70,8 @@ public class FrameworkModel extends ScopeModel {
 
     private final ApplicationModel internalApplicationModel;
 
+    private final ReentrantLock destroyLock = new ReentrantLock();
+
     /**
      * Use {@link FrameworkModel#newModel()} to create a new model
      */
@@ -356,6 +360,12 @@ public FrameworkServiceRepository getServiceRepository() {
         return serviceRepository;
     }
 
+
+    @Override
+    protected Lock acquireDestroyLock() {
+        return destroyLock;
+    }
+
     @Override
     public Environment getModelEnvironment() {
         throw new UnsupportedOperationException("Environment is inaccessible for FrameworkModel");

diff --git a/dubbo-common/src/main/java/org/apache/dubbo/rpc/model/ModuleModel.java b/dubbo-common/src/main/java/org/apache/dubbo/rpc/model/ModuleModel.java
@@ -32,6 +32,7 @@
 
 import java.util.HashMap;
 import java.util.Set;
+import java.util.concurrent.locks.Lock;
 
 /**
  * Model of a service module
@@ -173,6 +174,11 @@ public void setDeployer(ModuleDeployer deployer) {
         this.deployer = deployer;
     }
 
+    @Override
+    protected Lock acquireDestroyLock() {
+        return getApplicationModel().getFrameworkModel().acquireDestroyLock();
+    }
+
     /**
      * for ut only
      */

diff --git a/dubbo-common/src/main/java/org/apache/dubbo/rpc/model/ScopeModel.java b/dubbo-common/src/main/java/org/apache/dubbo/rpc/model/ScopeModel.java
@@ -34,6 +34,7 @@
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.CopyOnWriteArrayList;
 import java.util.concurrent.atomic.AtomicBoolean;
+import java.util.concurrent.locks.Lock;
 
 import static org.apache.dubbo.common.constants.LoggerCodeConstants.CONFIG_UNABLE_DESTROY_MODEL;
 
@@ -109,8 +110,12 @@ protected void initialize() {
         }
     }
 
+    protected abstract Lock acquireDestroyLock();
+
     public void destroy() {
-        synchronized (instLock) {
+        Lock lock = acquireDestroyLock();
+        try {
+            lock.lock();
             if (destroyed.compareAndSet(false, true)) {
                 try {
                     onDestroy();
@@ -128,6 +133,8 @@ public void destroy() {
                     LOGGER.error(CONFIG_UNABLE_DESTROY_MODEL, "", "", "Error happened when destroying ScopeModel.", t);
                 }
             }
+        } finally {
+            lock.unlock();
         }
     }