PBTree: Fix NPE during concurrent creating and iterating schema (apac…

…he#11786)
l2280212 · Dec 26, 2023 · 2c360ad · 2c360ad
1 parent d9cea67
commit 2c360ad
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 3 deletions.
diff --git a/...pache/iotdb/db/schemaengine/schemaregion/mtree/impl/pbtree/flush/PBTreeFlushExecutor.java b/...pache/iotdb/db/schemaengine/schemaregion/mtree/impl/pbtree/flush/PBTreeFlushExecutor.java
@@ -79,15 +79,15 @@ public void flushVolatileNodes() throws MetadataException {
         processFlushDatabase(databaseMNode);
       } catch (Exception e) {
         exceptions.add(e);
-        logger.error(e.getMessage());
+        logger.warn(e.getMessage(), e);
       }
     }
     while (subtreeRoots.hasNext() && checkRemainToFlush()) {
       try {
         processFlushNonDatabase(subtreeRoots.next());
       } catch (Exception e) {
         exceptions.add(e);
-        logger.error(e.getMessage());
+        logger.warn(e.getMessage(), e);
       }
     }
     if (!exceptions.isEmpty()) {

diff --git a/...b/db/schemaengine/schemaregion/mtree/impl/pbtree/schemafile/pagemgr/BTreePageManager.java b/...b/db/schemaengine/schemaregion/mtree/impl/pbtree/schemafile/pagemgr/BTreePageManager.java
@@ -479,11 +479,15 @@ public boolean hasNext() {
           try {
             ISchemaPage nPage;
             while (children.isEmpty() && nextSeg >= 0) {
+              boolean hasThisPage = cxt.referredPages.containsKey(getPageIndex(nextSeg));
               nPage = getPageInstance(getPageIndex(nextSeg), cxt);
               children = nPage.getAsSegmentedPage().getChildren(getSegIndex(nextSeg));
               nextSeg = nPage.getAsSegmentedPage().getNextSegAddress(getSegIndex(nextSeg));
               // children iteration need not pin page, consistency is guaranteed by upper layer
-              nPage.decrementAndGetRefCnt();
+              if (!hasThisPage) {
+                cxt.referredPages.remove(nPage.getPageIndex());
+                nPage.decrementAndGetRefCnt();
+              }
             }
           } catch (MetadataException | IOException e) {
             logger.error(e.getMessage());