[IOTDB-6316] Fix potential concurrent bug between compaction and load (#12244)
* Fix potential concurrent bug between compaction and load
* remove useless update file version
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 7b8aa50..469eeae 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 @@
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 @@
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 @@
}
}
- updatePartitionFileVersion(filePartitionId, tsFileResource.getVersion());
+ // help tsfile resource degrade
+ TsFileResourceManager.getInstance().registerSealedTsFileResource(tsFileResource);
+
+ tsFileManager.add(tsFileResource, false);
+
return true;
}
