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 2021/06/29 02:20:54 UTC
[iotdb] 01/01: remove compaction log
This is an automated email from the ASF dual-hosted git repository.
qiaojialin pushed a commit to branch remove_compaction_log_0.12
in repository https://gitbox.apache.org/repos/asf/iotdb.git
commit 91e48f986279b0121b466d3a42acfb1e39c5ea8c
Author: qiaojialin <64...@qq.com>
AuthorDate: Tue Jun 29 10:20:18 2021 +0800
remove compaction log
---
server/src/assembly/resources/conf/logback.xml | 24 +++++++++++-----------
.../level/LevelCompactionTsFileManagement.java | 12 ++++++-----
.../no/NoCompactionTsFileManagement.java | 20 ++++--------------
.../engine/storagegroup/StorageGroupProcessor.java | 9 --------
4 files changed, 23 insertions(+), 42 deletions(-)
diff --git a/server/src/assembly/resources/conf/logback.xml b/server/src/assembly/resources/conf/logback.xml
index 7abefca..f346e51 100644
--- a/server/src/assembly/resources/conf/logback.xml
+++ b/server/src/assembly/resources/conf/logback.xml
@@ -26,7 +26,7 @@
<appender class="ch.qos.logback.core.rolling.RollingFileAppender" name="FILEERROR">
<file>${IOTDB_HOME}/logs/log_error.log</file>
<rollingPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedRollingPolicy">
- <fileNamePattern>${IOTDB_HOME}/logs/log-error-%d{yyyyMMdd-HH}.%i.log.gz</fileNamePattern>
+ <fileNamePattern>${IOTDB_HOME}/logs/log-error-%d{yyyyMMdd}.%i.log.gz</fileNamePattern>
<maxFileSize>10MB</maxFileSize>
<maxHistory>168</maxHistory>
<totalSizeCap>512MB</totalSizeCap>
@@ -45,7 +45,7 @@
<appender class="ch.qos.logback.core.rolling.RollingFileAppender" name="FILEWARN">
<file>${IOTDB_HOME}/logs/log_warn.log</file>
<rollingPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedRollingPolicy">
- <fileNamePattern>${IOTDB_HOME}/logs/log-warn-%d{yyyyMMdd-HH}.%i.log.gz</fileNamePattern>
+ <fileNamePattern>${IOTDB_HOME}/logs/log-warn-%d{yyyyMMdd}.%i.log.gz</fileNamePattern>
<maxFileSize>10MB</maxFileSize>
<maxHistory>168</maxHistory>
<totalSizeCap>512MB</totalSizeCap>
@@ -64,7 +64,7 @@
<appender class="ch.qos.logback.core.rolling.RollingFileAppender" name="FILEINFO">
<file>${IOTDB_HOME}/logs/log_info.log</file>
<rollingPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedRollingPolicy">
- <fileNamePattern>${IOTDB_HOME}/logs/log-info-%d{yyyyMMdd-HH}.%i.log.gz</fileNamePattern>
+ <fileNamePattern>${IOTDB_HOME}/logs/log-info-%d{yyyyMMdd}.%i.log.gz</fileNamePattern>
<maxFileSize>50MB</maxFileSize>
<maxHistory>168</maxHistory>
<totalSizeCap>5GB</totalSizeCap>
@@ -83,7 +83,7 @@
<appender class="ch.qos.logback.core.rolling.RollingFileAppender" name="FILEDEBUG">
<file>${IOTDB_HOME}/logs/log_debug.log</file>
<rollingPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedRollingPolicy">
- <fileNamePattern>${IOTDB_HOME}/logs/log-debug-%d{yyyyMMdd-HH}.%i.log.gz</fileNamePattern>
+ <fileNamePattern>${IOTDB_HOME}/logs/log-debug-%d{yyyyMMdd}.%i.log.gz</fileNamePattern>
<maxFileSize>50MB</maxFileSize>
<maxHistory>168</maxHistory>
<totalSizeCap>5GB</totalSizeCap>
@@ -102,7 +102,7 @@
<appender class="ch.qos.logback.core.rolling.RollingFileAppender" name="FILETRACE">
<file>${IOTDB_HOME}/logs/log_trace.log</file>
<rollingPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedRollingPolicy">
- <fileNamePattern>${IOTDB_HOME}/logs/log-trace-%d{yyyyMMdd-HH}.%i.log.gz</fileNamePattern>
+ <fileNamePattern>${IOTDB_HOME}/logs/log-trace-%d{yyyyMMdd}.%i.log.gz</fileNamePattern>
<maxFileSize>50MB</maxFileSize>
<maxHistory>168</maxHistory>
<totalSizeCap>5GB</totalSizeCap>
@@ -132,7 +132,7 @@
<appender class="ch.qos.logback.core.rolling.RollingFileAppender" name="FILEALL">
<file>${IOTDB_HOME}/logs/log_all.log</file>
<rollingPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedRollingPolicy">
- <fileNamePattern>${IOTDB_HOME}/logs/log-all-%d{yyyyMMdd-HH}.%i.log.gz</fileNamePattern>
+ <fileNamePattern>${IOTDB_HOME}/logs/log-all-%d{yyyyMMdd}.%i.log.gz</fileNamePattern>
<maxFileSize>50MB</maxFileSize>
<maxHistory>168</maxHistory>
<totalSizeCap>5GB</totalSizeCap>
@@ -149,7 +149,7 @@
<appender class="ch.qos.logback.core.rolling.RollingFileAppender" name="FILE_COST_MEASURE">
<file>${IOTDB_HOME}/logs/log_measure.log</file>
<rollingPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedRollingPolicy">
- <fileNamePattern>${IOTDB_HOME}/logs/log-measure-%d{yyyyMMdd-HH}.%i.log.gz</fileNamePattern>
+ <fileNamePattern>${IOTDB_HOME}/logs/log-measure-%d{yyyyMMdd}.%i.log.gz</fileNamePattern>
<maxFileSize>10MB</maxFileSize>
<maxHistory>168</maxHistory>
<totalSizeCap>512MB</totalSizeCap>
@@ -166,7 +166,7 @@
<appender class="ch.qos.logback.core.rolling.RollingFileAppender" name="SYNC">
<file>${IOTDB_HOME}/logs/log_sync.log</file>
<rollingPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedRollingPolicy">
- <fileNamePattern>${IOTDB_HOME}/logs/log-sync-%d{yyyyMMdd-HH}.%i.log.gz</fileNamePattern>
+ <fileNamePattern>${IOTDB_HOME}/logs/log-sync-%d{yyyyMMdd}.%i.log.gz</fileNamePattern>
<maxFileSize>10MB</maxFileSize>
<maxHistory>168</maxHistory>
<totalSizeCap>512MB</totalSizeCap>
@@ -183,7 +183,7 @@
<appender class="ch.qos.logback.core.rolling.RollingFileAppender" name="AUDIT">
<file>${IOTDB_HOME}/logs/log_audit.log</file>
<rollingPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedRollingPolicy">
- <fileNamePattern>${IOTDB_HOME}/logs/log-audit-%d{yyyyMMdd-HH}.%i.log.gz</fileNamePattern>
+ <fileNamePattern>${IOTDB_HOME}/logs/log-audit-%d{yyyyMMdd}.%i.log.gz</fileNamePattern>
<maxFileSize>10MB</maxFileSize>
<maxHistory>168</maxHistory>
<totalSizeCap>512MB</totalSizeCap>
@@ -200,7 +200,7 @@
<appender class="ch.qos.logback.core.rolling.RollingFileAppender" name="QUERY_DEBUG">
<file>${IOTDB_HOME}/logs/log_query_debug.log</file>
<rollingPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedRollingPolicy">
- <fileNamePattern>${IOTDB_HOME}/logs/log-query-debug-%d{yyyyMMdd-HH}.%i.log.gz</fileNamePattern>
+ <fileNamePattern>${IOTDB_HOME}/logs/log-query-debug-%d{yyyyMMdd}.%i.log.gz</fileNamePattern>
<maxFileSize>10MB</maxFileSize>
<maxHistory>168</maxHistory>
<totalSizeCap>512MB</totalSizeCap>
@@ -217,7 +217,7 @@
<appender class="ch.qos.logback.core.rolling.RollingFileAppender" name="SLOW_SQL">
<file>${IOTDB_HOME}/logs/log_slow_sql.log</file>
<rollingPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedRollingPolicy">
- <fileNamePattern>${IOTDB_HOME}/logs/log-slow-sql-%d{yyyyMMdd-HH}.%i.log.gz</fileNamePattern>
+ <fileNamePattern>${IOTDB_HOME}/logs/log-slow-sql-%d{yyyyMMdd}.%i.log.gz</fileNamePattern>
<maxFileSize>10MB</maxFileSize>
<maxHistory>168</maxHistory>
<totalSizeCap>512MB</totalSizeCap>
@@ -234,7 +234,7 @@
<appender class="ch.qos.logback.core.rolling.RollingFileAppender" name="QUERY_FREQUENCY">
<file>${IOTDB_HOME}/logs/log_query_frequency.log</file>
<rollingPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedRollingPolicy">
- <fileNamePattern>${IOTDB_HOME}/logs/log-query-frequency-%d{yyyyMMdd-HH}.%i.log.gz</fileNamePattern>
+ <fileNamePattern>${IOTDB_HOME}/logs/log-query-frequency-%d{yyyyMMdd}.%i.log.gz</fileNamePattern>
<maxFileSize>10MB</maxFileSize>
<maxHistory>168</maxHistory>
<totalSizeCap>512MB</totalSizeCap>
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 50ec39f..5a96761 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
@@ -741,11 +741,13 @@ public class LevelCompactionTsFileManagement extends TsFileManagement {
} finally {
isSeqMerging = false;
// reset the merge working state to false
- logger.info(
- "{} [Compaction] merge end time isSeq = {}, consumption: {} ms",
- storageGroupName,
- sequence,
- System.currentTimeMillis() - startTimeMillis);
+ if (isMergeExecutedInCurrentTask) {
+ logger.info(
+ "{} [Compaction] merge end time isSeq = {}, consumption: {} ms",
+ storageGroupName,
+ sequence,
+ System.currentTimeMillis() - startTimeMillis);
+ }
}
return isMergeExecutedInCurrentTask;
}
diff --git a/server/src/main/java/org/apache/iotdb/db/engine/compaction/no/NoCompactionTsFileManagement.java b/server/src/main/java/org/apache/iotdb/db/engine/compaction/no/NoCompactionTsFileManagement.java
index 5c3d8b1..b62ce94 100644
--- a/server/src/main/java/org/apache/iotdb/db/engine/compaction/no/NoCompactionTsFileManagement.java
+++ b/server/src/main/java/org/apache/iotdb/db/engine/compaction/no/NoCompactionTsFileManagement.java
@@ -22,9 +22,6 @@ package org.apache.iotdb.db.engine.compaction.no;
import org.apache.iotdb.db.engine.compaction.TsFileManagement;
import org.apache.iotdb.db.engine.storagegroup.TsFileResource;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
import java.util.ArrayList;
import java.util.Collections;
import java.util.Iterator;
@@ -36,7 +33,6 @@ import java.util.TreeSet;
public class NoCompactionTsFileManagement extends TsFileManagement {
- private static final Logger logger = LoggerFactory.getLogger(NoCompactionTsFileManagement.class);
// includes sealed and unsealed sequence TsFiles
private final Map<Long, TreeSet<TsFileResource>> sequenceFileTreeSetMap = new TreeMap<>();
@@ -177,9 +173,7 @@ public class NoCompactionTsFileManagement extends TsFileManagement {
}
@Override
- public void addRecover(TsFileResource tsFileResource, boolean sequence) {
- logger.info("{} do not need to recover", storageGroupName);
- }
+ public void addRecover(TsFileResource tsFileResource, boolean sequence) {}
@Override
public void addAll(List<TsFileResource> tsFileResourceList, boolean sequence) {
@@ -266,19 +260,13 @@ public class NoCompactionTsFileManagement extends TsFileManagement {
}
@Override
- public void recover() {
- logger.info("{} no recover logic", storageGroupName);
- }
+ public void recover() {}
@Override
- public void forkCurrentFileList(long timePartition) {
- logger.info("{} do not need fork", storageGroupName);
- }
+ public void forkCurrentFileList(long timePartition) {}
@Override
- protected void merge(long timePartition) {
- logger.info("{} no merge logic", storageGroupName);
- }
+ protected void merge(long timePartition) {}
private TreeSet<TsFileResource> newSequenceTsFileResources(Long k) {
return new TreeSet<>((o1, o2) -> compareFileName(o1.getTsFile(), o2.getTsFile()));
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 53b731e..d3d64c1 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
@@ -519,10 +519,6 @@ public class StorageGroupProcessor {
@Override
public Void call() {
- logger.info(
- "all partition in storage group {}: {}",
- logicalStorageGroupName,
- partitionLatestFlushedTimeForEachDevice.keySet());
for (long timePartitionId : partitionLatestFlushedTimeForEachDevice.keySet()) {
syncCompactOnePartition(
timePartitionId, IoTDBDescriptor.getInstance().getConfig().isForceFullMerge());
@@ -1990,11 +1986,6 @@ public class StorageGroupProcessor {
}
private void syncCompactOnePartition(long timePartition, boolean fullMerge) {
- logger.info(
- "{}-{} partition:{}, submit a compaction merge task",
- logicalStorageGroupName,
- virtualStorageGroupId,
- timePartition);
try {
// fork and filter current tsfile, then commit then to compaction merge
tsFileManagement.forkCurrentFileList(timePartition);