This is an automated email from the ASF dual-hosted git repository. ejttianyu pushed a commit to branch valid_block_problem in repository https://gitbox.apache.org/repos/asf/iotdb.git
commit c64ca0d645e93c458b66029de3d1eaae32217059 Author: EJTTianyu <[email protected]> AuthorDate: Sat Nov 7 11:03:32 2020 +0800 try fix block problem --- .../org/apache/iotdb/db/engine/compaction/TsFileManagement.java | 2 ++ .../iotdb/db/engine/storagegroup/StorageGroupProcessorTest.java | 6 +++++- server/src/test/resources/logback.xml | 2 ++ 3 files changed, 9 insertions(+), 1 deletion(-) 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..c369b8f 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 @@ -241,7 +241,9 @@ public abstract class TsFileManagement { logger.info("{} submits a merge task {}, merging {} seqFiles, {} unseqFiles", storageGroupName, taskName, mergeFiles[0].size(), mergeFiles[1].size()); } + logger.info("try to set isUnseqMerging to true"); isUnseqMerging = true; + logger.info("set isUnseqMerging to true"); mergeStartTime = System.currentTimeMillis(); } catch (MergeException | IOException e) { diff --git a/server/src/test/java/org/apache/iotdb/db/engine/storagegroup/StorageGroupProcessorTest.java b/server/src/test/java/org/apache/iotdb/db/engine/storagegroup/StorageGroupProcessorTest.java index 6e0efbc..70b2ecb 100644 --- a/server/src/test/java/org/apache/iotdb/db/engine/storagegroup/StorageGroupProcessorTest.java +++ b/server/src/test/java/org/apache/iotdb/db/engine/storagegroup/StorageGroupProcessorTest.java @@ -26,11 +26,11 @@ import org.apache.iotdb.db.conf.IoTDBConfig; import org.apache.iotdb.db.conf.IoTDBDescriptor; import org.apache.iotdb.db.constant.TestConstant; import org.apache.iotdb.db.engine.MetadataManagerHelper; +import org.apache.iotdb.db.engine.compaction.CompactionStrategy; import org.apache.iotdb.db.engine.flush.TsFileFlushPolicy; import org.apache.iotdb.db.engine.merge.manage.MergeManager; import org.apache.iotdb.db.engine.querycontext.QueryDataSource; import org.apache.iotdb.db.engine.querycontext.ReadOnlyMemChunk; -import org.apache.iotdb.db.engine.compaction.CompactionStrategy; import org.apache.iotdb.db.exception.StorageGroupProcessorException; import org.apache.iotdb.db.exception.WriteProcessException; import org.apache.iotdb.db.exception.metadata.IllegalPathException; @@ -53,9 +53,12 @@ import org.junit.After; import org.junit.Assert; import org.junit.Before; import org.junit.Test; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; public class StorageGroupProcessorTest { + private static final Logger logger = LoggerFactory.getLogger(StorageGroupProcessorTest.class); private String storageGroup = "root.vehicle.d0"; private String systemDir = TestConstant.OUTPUT_DATA_DIR.concat("info"); private String deviceId = "root.vehicle.d0"; @@ -578,6 +581,7 @@ public class StorageGroupProcessorTest { processor.merge(true); while (processor.getTsFileManagement().isUnseqMerging) { // wait + logger.info("test info, isUnseqMerging:{}", processor.getTsFileManagement().isUnseqMerging); } QueryDataSource queryDataSource = processor diff --git a/server/src/test/resources/logback.xml b/server/src/test/resources/logback.xml index a1c1c44..d2fbb7a 100644 --- a/server/src/test/resources/logback.xml +++ b/server/src/test/resources/logback.xml @@ -49,6 +49,8 @@ <logger name="org.apache.iotdb.db.service.RPCService" level="INFO"/> <logger name="org.apache.iotdb.db.service.MQTTService" level="INFO"/> <logger name="org.apache.iotdb.db.sync.receiver.SyncServerManager" level="INFO"/> + <logger name="org.apache.iotdb.db.engine.storagegroup.StorageGroupProcessorTest" level="INFO"/> + <logger name="org.apache.iotdb.db.engine.compaction.TsFileManagement" level="INFO"/> <root level="WARN"> <appender-ref ref="stdout"/> </root>
