This is an automated email from the ASF dual-hosted git repository. haonan pushed a commit to branch fix_mem_control_211 in repository https://gitbox.apache.org/repos/asf/iotdb.git
commit b88cca53b1e3b0d775ca6e811729753b821af930 Author: HTHou <[email protected]> AuthorDate: Fri Nov 6 17:39:39 2020 +0800 change log level and remove blocked line --- .../iotdb/db/engine/storagegroup/StorageGroupProcessor.java | 4 ---- .../apache/iotdb/db/engine/storagegroup/TsFileProcessor.java | 10 ++++++---- 2 files changed, 6 insertions(+), 8 deletions(-) diff --git a/server/src/main/java/org/apache/iotdb/db/engine/storagegroup/StorageGroupProcessor.java b/server/src/main/java/org/apache/iotdb/db/engine/storagegroup/StorageGroupProcessor.java index be56a73..2b49583 100755 --- a/server/src/main/java/org/apache/iotdb/db/engine/storagegroup/StorageGroupProcessor.java +++ b/server/src/main/java/org/apache/iotdb/db/engine/storagegroup/StorageGroupProcessor.java @@ -829,10 +829,6 @@ public class StorageGroupProcessor { .put(insertTabletPlan.getDeviceId().getFullPath(), insertTabletPlan.getTimes()[end - 1]); } - if (closingSequenceTsFileProcessor.contains(tsFileProcessor) || - closingUnSequenceTsFileProcessor.contains(tsFileProcessor)) { - return true; - } // check memtable size and may async try to flush the work memtable if (tsFileProcessor.shouldFlush()) { fileFlushPolicy.apply(this, tsFileProcessor, sequence); diff --git a/server/src/main/java/org/apache/iotdb/db/engine/storagegroup/TsFileProcessor.java b/server/src/main/java/org/apache/iotdb/db/engine/storagegroup/TsFileProcessor.java index 7ba02eb..b810774 100644 --- a/server/src/main/java/org/apache/iotdb/db/engine/storagegroup/TsFileProcessor.java +++ b/server/src/main/java/org/apache/iotdb/db/engine/storagegroup/TsFileProcessor.java @@ -421,6 +421,8 @@ public class TsFileProcessor { return false; } if (shouldFlush) { + logger.info("The memtable size {} of tsfile {} reaches the mem control threshold", + workMemTable.memSize(), tsFileResource.getTsFile().getAbsolutePath()); return true; } if (!enableMemControl && workMemTable.memSize() >= getMemtableSizeThresholdBasedOnSeriesNum()) { @@ -493,15 +495,15 @@ public class TsFileProcessor { } try { - if (logger.isDebugEnabled()) { + if (logger.isInfoEnabled()) { if (workMemTable != null) { - logger.debug( + logger.info( "{}: flush a working memtable in async close tsfile {}, memtable size: {}, tsfile size: {}", storageGroupName, tsFileResource.getTsFile().getAbsolutePath(), workMemTable.memSize(), tsFileResource.getTsFileSize()); } else { - logger.debug("{}: flush a NotifyFlushMemTable in async close tsfile {}, tsfile size: {}", + logger.info("{}: flush a NotifyFlushMemTable in async close tsfile {}, tsfile size: {}", storageGroupName, tsFileResource.getTsFile().getAbsolutePath(), tsFileResource.getTsFileSize()); } @@ -687,7 +689,7 @@ public class TsFileProcessor { SystemInfo.getInstance().resetStorageGroupStatus(storageGroupInfo, true); } if (logger.isDebugEnabled()) { - logger.debug("[mem_control] {}: {} flush finished, remove a memtable from flushing list, " + logger.debug("{}: {} flush finished, remove a memtable from flushing list, " + "flushing memtable list size: {}", storageGroupName, tsFileResource.getTsFile().getName(), flushingMemTables.size()); }
