(iotdb) branch master updated: [IOTDB-6316] Fix potential concurrent bug between compaction and load (#12244)

[rong]

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

rong 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 9a09c707a37 [IOTDB-6316] Fix potential concurrent bug between 
compaction and load (#12244)
9a09c707a37 is described below

commit 9a09c707a378b757bc3b6b8f53c482bc02d06f41
Author: Jackie Tien <jackietie...@gmail.com>
AuthorDate: Thu Mar 28 12:30:47 2024 +0800

    [IOTDB-6316] Fix potential concurrent bug between compaction and load 
(#12244)
    
    * Fix potential concurrent bug between compaction and load
    
    * remove useless update file version
---
 .../iotdb/db/storageengine/dataregion/DataRegion.java     | 15 ++++++---------
 1 file changed, 6 insertions(+), 9 deletions(-)

diff --git 
a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/storageengine/dataregion/DataRegion.java
 
b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/storageengine/dataregion/DataRegion.java
index 7b8aa508e21..469eeae7ad6 100644
--- 
a/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/storageengine/dataregion/DataRegion.java
+++ 
b/iotdb-core/datanode/src/main/java/org/apache/iotdb/db/storageengine/dataregion/DataRegion.java
@@ -2630,13 +2630,6 @@ public class DataRegion implements IDataRegionForQuery {
                 false);
       }
 
-      // update partition version
-      updatePartitionFileVersion(
-          newTsFileResource.getTimePartition(), 
newTsFileResource.getVersion());
-
-      // help tsfile resource degrade
-      
TsFileResourceManager.getInstance().registerSealedTsFileResource(newTsFileResource);
-
       logger.info("TsFile {} is successfully loaded in unsequence list.", 
newFileName);
     } catch (DiskSpaceInsufficientException e) {
       logger.error(
@@ -2802,7 +2795,7 @@ public class DataRegion implements IDataRegionForQuery {
       logger.error("The file {} has already been loaded in unsequence list", 
tsFileResource);
       return false;
     }
-    tsFileManager.add(tsFileResource, false);
+
     logger.info(
         "Load tsfile in unsequence list, move file from {} to {}",
         tsFileToLoad.getAbsolutePath(),
@@ -2887,7 +2880,11 @@ public class DataRegion implements IDataRegionForQuery {
       }
     }
 
-    updatePartitionFileVersion(filePartitionId, tsFileResource.getVersion());
+    // help tsfile resource degrade
+    
TsFileResourceManager.getInstance().registerSealedTsFileResource(tsFileResource);
+
+    tsFileManager.add(tsFileResource, false);
+
     return true;
   }