(iotdb) branch master updated: PBTree: Fix unlock logic (#11809)

[zyk]

This is an automated email from the ASF dual-hosted git repository.

zyk pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/iotdb.git


The following commit(s) were added to refs/heads/master by this push:
     new 48f2215747f PBTree: Fix unlock logic (#11809)
48f2215747f is described below

commit 48f2215747faa94e23e978737e8b74d8285eeebe
Author: Marcos_Zyk <38524330+marcos...@users.noreply.github.com>
AuthorDate: Fri Dec 29 20:58:31 2023 +0800

    PBTree: Fix unlock logic (#11809)
---
 .../schemaengine/schemaregion/mtree/impl/pbtree/CachedMTreeStore.java   | 2 +-
 .../schemaregion/mtree/impl/pbtree/memory/ReleaseFlushMonitor.java      | 1 -
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git 
a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/schemaengine/schemaregion/mtree/impl/pbtree/CachedMTreeStore.java
 
b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/schemaengine/schemaregion/mtree/impl/pbtree/CachedMTreeStore.java
index 3b8b712ff1c..c0cde5b2988 100644
--- 
a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/schemaengine/schemaregion/mtree/impl/pbtree/CachedMTreeStore.java
+++ 
b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/schemaengine/schemaregion/mtree/impl/pbtree/CachedMTreeStore.java
@@ -586,7 +586,7 @@ public class CachedMTreeStore implements 
IMTreeStore<ICachedMNode> {
    * @return should not continue releasing
    */
   public boolean executeMemoryRelease() {
-    lockManager.globalReadUnlock();
+    lockManager.globalReadLock();
     try {
       if (regionStatistics.getUnpinnedMemorySize() != 0) {
         return !memoryManager.evict();
diff --git 
a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/schemaengine/schemaregion/mtree/impl/pbtree/memory/ReleaseFlushMonitor.java
 
b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/schemaengine/schemaregion/mtree/impl/pbtree/memory/ReleaseFlushMonitor.java
index 7a6d03fe197..99a7059274f 100644
--- 
a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/schemaengine/schemaregion/mtree/impl/pbtree/memory/ReleaseFlushMonitor.java
+++ 
b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/schemaengine/schemaregion/mtree/impl/pbtree/memory/ReleaseFlushMonitor.java
@@ -242,7 +242,6 @@ public class ReleaseFlushMonitor {
         }
       } finally {
         if (needReleaseLock) {
-          lockManager.globalReadUnlock();
           lockManager.globalStampedReadUnlock(lockStamp);
         }
       }