You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@iotdb.apache.org by qi...@apache.org on 2020/11/07 06:40:21 UTC
[iotdb] branch master updated: Fix compaction resource not delete
bug (#1980)
This is an automated email from the ASF dual-hosted git repository.
qiaojialin 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 0bd3bdc Fix compaction resource not delete bug (#1980)
0bd3bdc is described below
commit 0bd3bdcd330d0819a442b18b33f30c575c08bf23
Author: zhanglingzhe0820 <44...@qq.com>
AuthorDate: Sat Nov 7 14:40:06 2020 +0800
Fix compaction resource not delete bug (#1980)
---
.../db/engine/compaction/level/LevelCompactionTsFileManagement.java | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/server/src/main/java/org/apache/iotdb/db/engine/compaction/level/LevelCompactionTsFileManagement.java b/server/src/main/java/org/apache/iotdb/db/engine/compaction/level/LevelCompactionTsFileManagement.java
index 2c47e3a..8dc1517 100644
--- a/server/src/main/java/org/apache/iotdb/db/engine/compaction/level/LevelCompactionTsFileManagement.java
+++ b/server/src/main/java/org/apache/iotdb/db/engine/compaction/level/LevelCompactionTsFileManagement.java
@@ -450,6 +450,10 @@ public class LevelCompactionTsFileManagement extends TsFileManagement {
// do not merge current unseq file level to upper level and just merge all of them to seq file
merge(isForceFullMerge, getTsFileList(true), mergeResources.get(i), Long.MAX_VALUE);
} else {
+ // wait until unseq merge has finished
+ while (isUnseqMerging) {
+ Thread.sleep(200);
+ }
for (TsFileResource mergeResource : mergeResources.get(i)) {
compactionLogger.logFile(SOURCE_NAME, mergeResource.getTsFile());
}