You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@iotdb.apache.org by hx...@apache.org on 2020/11/07 02:42:31 UTC
[iotdb] branch master updated: try to fix unseq merge ci bug
This is an automated email from the ASF dual-hosted git repository.
hxd 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 5fecbdd try to fix unseq merge ci bug
5fecbdd is described below
commit 5fecbdd2bb14d5e21e9bcf63f814b96dd0966094
Author: 张凌哲 <44...@qq.com>
AuthorDate: Sat Nov 7 10:25:37 2020 +0800
try to fix unseq merge ci bug
---
.../org/apache/iotdb/db/engine/compaction/TsFileManagement.java | 6 ++----
1 file changed, 2 insertions(+), 4 deletions(-)
diff --git a/server/src/main/java/org/apache/iotdb/db/engine/compaction/TsFileManagement.java b/server/src/main/java/org/apache/iotdb/db/engine/compaction/TsFileManagement.java
index 5b98725..245769a 100644
--- a/server/src/main/java/org/apache/iotdb/db/engine/compaction/TsFileManagement.java
+++ b/server/src/main/java/org/apache/iotdb/db/engine/compaction/TsFileManagement.java
@@ -19,9 +19,7 @@
package org.apache.iotdb.db.engine.compaction;
-import static org.apache.iotdb.db.conf.IoTDBConstant.FILE_NAME_SEPARATOR;
import static org.apache.iotdb.db.engine.storagegroup.StorageGroupProcessor.MERGING_MODIFICATION_FILE_NAME;
-import static org.apache.iotdb.tsfile.common.constant.TsFileConstant.TSFILE_SUFFIX;
import java.io.File;
import java.io.IOException;
@@ -231,6 +229,8 @@ public abstract class TsFileManagement {
tsFileResource.setMerging(true);
}
+ isUnseqMerging = true;
+ mergeStartTime = System.currentTimeMillis();
MergeTask mergeTask = new MergeTask(mergeResource, storageGroupDir,
this::mergeEndAction, taskName, fullMerge, fileSelector.getConcurrentMergeNum(),
storageGroupName);
@@ -241,8 +241,6 @@ public abstract class TsFileManagement {
logger.info("{} submits a merge task {}, merging {} seqFiles, {} unseqFiles",
storageGroupName, taskName, mergeFiles[0].size(), mergeFiles[1].size());
}
- isUnseqMerging = true;
- mergeStartTime = System.currentTimeMillis();
} catch (MergeException | IOException e) {
logger.error("{} cannot select file for merge", storageGroupName, e);