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 d726fb3 [IOTDB-1180] Reset the system log file names and maximal
disk-space size (#2765)
d726fb3 is described below
commit d726fb314edfc43b941432cede0ebee7651e6ee3
Author: yanhong wang <[email protected]>
AuthorDate: Thu Apr 1 17:08:13 2021 +0800
[IOTDB-1180] Reset the system log file names and maximal disk-space size
(#2765)
---
LICENSE-binary | 4 +-
pom.xml | 2 +-
server/src/assembly/resources/conf/logback.xml | 144 +++++++++++--------------
3 files changed, 63 insertions(+), 87 deletions(-)
diff --git a/LICENSE-binary b/LICENSE-binary
index e844547..cc1b475 100644
--- a/LICENSE-binary
+++ b/LICENSE-binary
@@ -294,8 +294,8 @@ org.slf4j:jcl-over-slf4j:1.7.25
EPL 1.0
------------
com.h2database:h2-mvstore:1.4.199
-ch.qos.logback:logback-classic:1.1.11
-ch.qos.logback:logback-core:1.1.11
+ch.qos.logback:logback-classic:1.2.3
+ch.qos.logback:logback-core:1.2.3
CDDL 1.1
diff --git a/pom.xml b/pom.xml
index 092d8c4..7788072 100644
--- a/pom.xml
+++ b/pom.xml
@@ -114,7 +114,7 @@
<hive2.version>2.3.6</hive2.version>
<junit.version>4.12</junit.version>
<slf4j.version>1.7.12</slf4j.version>
- <logback.version>1.1.11</logback.version>
+ <logback.version>1.2.3</logback.version>
<joda.version>2.9.9</joda.version>
<spark.version>2.4.3</spark.version>
<flink.version>1.11.1</flink.version>
diff --git a/server/src/assembly/resources/conf/logback.xml
b/server/src/assembly/resources/conf/logback.xml
index c36cc66..c7e58a0 100644
--- a/server/src/assembly/resources/conf/logback.xml
+++ b/server/src/assembly/resources/conf/logback.xml
@@ -25,14 +25,12 @@
<statusListener class="ch.qos.logback.core.status.NopStatusListener"/>
<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.FixedWindowRollingPolicy">
-
<fileNamePattern>${IOTDB_HOME}/logs/log-error.%i.log.gz</fileNamePattern>
- <minIndex>1</minIndex>
- <maxIndex>5</maxIndex>
- </rollingPolicy>
- <triggeringPolicy
class="ch.qos.logback.core.rolling.SizeBasedTriggeringPolicy">
+ <rollingPolicy
class="ch.qos.logback.core.rolling.SizeAndTimeBasedRollingPolicy">
+
<fileNamePattern>${IOTDB_HOME}/logs/log-error-%d{yyyyMMdd-HH}.%i.log.gz</fileNamePattern>
<maxFileSize>10MB</maxFileSize>
- </triggeringPolicy>
+ <maxHistory>168</maxHistory>
+ <totalSizeCap>512MB</totalSizeCap>
+ </rollingPolicy>
<append>true</append>
<encoder class="ch.qos.logback.classic.encoder.PatternLayoutEncoder">
<pattern>%d [%t] %-5p %C:%L - %m %n</pattern>
@@ -46,14 +44,12 @@
</appender>
<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.FixedWindowRollingPolicy">
-
<fileNamePattern>${IOTDB_HOME}/logs/log-warn.%i.log.gz</fileNamePattern>
- <minIndex>1</minIndex>
- <maxIndex>5</maxIndex>
- </rollingPolicy>
- <triggeringPolicy
class="ch.qos.logback.core.rolling.SizeBasedTriggeringPolicy">
+ <rollingPolicy
class="ch.qos.logback.core.rolling.SizeAndTimeBasedRollingPolicy">
+
<fileNamePattern>${IOTDB_HOME}/logs/log-warn-%d{yyyyMMdd-HH}.%i.log.gz</fileNamePattern>
<maxFileSize>10MB</maxFileSize>
- </triggeringPolicy>
+ <maxHistory>168</maxHistory>
+ <totalSizeCap>512MB</totalSizeCap>
+ </rollingPolicy>
<append>true</append>
<encoder class="ch.qos.logback.classic.encoder.PatternLayoutEncoder">
<pattern>%d [%t] %-5p %C:%L - %m %n</pattern>
@@ -67,14 +63,12 @@
</appender>
<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.FixedWindowRollingPolicy">
-
<fileNamePattern>${IOTDB_HOME}/logs/log-info.%i.log.gz</fileNamePattern>
- <minIndex>1</minIndex>
- <maxIndex>5</maxIndex>
- </rollingPolicy>
- <triggeringPolicy
class="ch.qos.logback.core.rolling.SizeBasedTriggeringPolicy">
+ <rollingPolicy
class="ch.qos.logback.core.rolling.SizeAndTimeBasedRollingPolicy">
+
<fileNamePattern>${IOTDB_HOME}/logs/log-info-%d{yyyyMMdd-HH}.%i.log.gz</fileNamePattern>
<maxFileSize>50MB</maxFileSize>
- </triggeringPolicy>
+ <maxHistory>168</maxHistory>
+ <totalSizeCap>5GB</totalSizeCap>
+ </rollingPolicy>
<append>true</append>
<encoder class="ch.qos.logback.classic.encoder.PatternLayoutEncoder">
<pattern>%d [%t] %-5p %C:%L - %m %n</pattern>
@@ -88,14 +82,12 @@
</appender>
<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.FixedWindowRollingPolicy">
-
<fileNamePattern>${IOTDB_HOME}/logs/log-debug.%i.log.gz</fileNamePattern>
- <minIndex>1</minIndex>
- <maxIndex>5</maxIndex>
+ <rollingPolicy
class="ch.qos.logback.core.rolling.SizeAndTimeBasedRollingPolicy">
+
<fileNamePattern>${IOTDB_HOME}/logs/log-debug-%d{yyyyMMdd-HH}.%i.log.gz</fileNamePattern>
+ <maxFileSize>50MB</maxFileSize>
+ <maxHistory>168</maxHistory>
+ <totalSizeCap>5GB</totalSizeCap>
</rollingPolicy>
- <triggeringPolicy
class="ch.qos.logback.core.rolling.SizeBasedTriggeringPolicy">
- <maxFileSize>10MB</maxFileSize>
- </triggeringPolicy>
<append>true</append>
<encoder class="ch.qos.logback.classic.encoder.PatternLayoutEncoder">
<pattern>%d [%t] %-5p %C:%L - %m %n</pattern>
@@ -109,14 +101,12 @@
</appender>
<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.FixedWindowRollingPolicy">
-
<fileNamePattern>${IOTDB_HOME}/logs/log-trace.%i.log.gz</fileNamePattern>
- <minIndex>1</minIndex>
- <maxIndex>5</maxIndex>
+ <rollingPolicy
class="ch.qos.logback.core.rolling.SizeAndTimeBasedRollingPolicy">
+
<fileNamePattern>${IOTDB_HOME}/logs/log-trace-%d{yyyyMMdd-HH}.%i.log.gz</fileNamePattern>
+ <maxFileSize>50MB</maxFileSize>
+ <maxHistory>168</maxHistory>
+ <totalSizeCap>5GB</totalSizeCap>
</rollingPolicy>
- <triggeringPolicy
class="ch.qos.logback.core.rolling.SizeBasedTriggeringPolicy">
- <maxFileSize>10MB</maxFileSize>
- </triggeringPolicy>
<append>true</append>
<encoder class="ch.qos.logback.classic.encoder.PatternLayoutEncoder">
<pattern>%d [%t] %-5p %C:%L - %m %n</pattern>
@@ -141,14 +131,12 @@
<!-- a log appender that collect all log records whose level is greater
than debug-->
<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.FixedWindowRollingPolicy">
-
<fileNamePattern>${IOTDB_HOME}/logs/log-all.%i.log.gz</fileNamePattern>
- <minIndex>1</minIndex>
- <maxIndex>5</maxIndex>
- </rollingPolicy>
- <triggeringPolicy
class="ch.qos.logback.core.rolling.SizeBasedTriggeringPolicy">
+ <rollingPolicy
class="ch.qos.logback.core.rolling.SizeAndTimeBasedRollingPolicy">
+
<fileNamePattern>${IOTDB_HOME}/logs/log-all-%d{yyyyMMdd-HH}.%i.log.gz</fileNamePattern>
<maxFileSize>50MB</maxFileSize>
- </triggeringPolicy>
+ <maxHistory>168</maxHistory>
+ <totalSizeCap>5GB</totalSizeCap>
+ </rollingPolicy>
<append>true</append>
<encoder class="ch.qos.logback.classic.encoder.PatternLayoutEncoder">
<pattern>%d [%t] %-5p %C:%L - %m %n</pattern>
@@ -160,14 +148,12 @@
</appender>
<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.FixedWindowRollingPolicy">
-
<fileNamePattern>${IOTDB_HOME}/logs/log-measure.%i.log.gz</fileNamePattern>
- <minIndex>1</minIndex>
- <maxIndex>5</maxIndex>
- </rollingPolicy>
- <triggeringPolicy
class="ch.qos.logback.core.rolling.SizeBasedTriggeringPolicy">
+ <rollingPolicy
class="ch.qos.logback.core.rolling.SizeAndTimeBasedRollingPolicy">
+
<fileNamePattern>${IOTDB_HOME}/logs/log-measure-%d{yyyyMMdd-HH}.%i.log.gz</fileNamePattern>
<maxFileSize>10MB</maxFileSize>
- </triggeringPolicy>
+ <maxHistory>168</maxHistory>
+ <totalSizeCap>512MB</totalSizeCap>
+ </rollingPolicy>
<append>true</append>
<encoder class="ch.qos.logback.classic.encoder.PatternLayoutEncoder">
<pattern>%d [%t] %-5p %C:%L - %m %n</pattern>
@@ -179,14 +165,12 @@
</appender>
<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.FixedWindowRollingPolicy">
-
<fileNamePattern>${IOTDB_HOME}/logs/log-sync.%i.log.gz</fileNamePattern>
- <minIndex>1</minIndex>
- <maxIndex>5</maxIndex>
- </rollingPolicy>
- <triggeringPolicy
class="ch.qos.logback.core.rolling.SizeBasedTriggeringPolicy">
+ <rollingPolicy
class="ch.qos.logback.core.rolling.SizeAndTimeBasedRollingPolicy">
+
<fileNamePattern>${IOTDB_HOME}/logs/log-sync-%d{yyyyMMdd-HH}.%i.log.gz</fileNamePattern>
<maxFileSize>10MB</maxFileSize>
- </triggeringPolicy>
+ <maxHistory>168</maxHistory>
+ <totalSizeCap>512MB</totalSizeCap>
+ </rollingPolicy>
<append>true</append>
<encoder class="ch.qos.logback.classic.encoder.PatternLayoutEncoder">
<pattern>%d [%t] %-5p %C:%L - %m %n</pattern>
@@ -198,14 +182,12 @@
</appender>
<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.FixedWindowRollingPolicy">
-
<fileNamePattern>${IOTDB_HOME}/logs/log-audit.%i.log.gz</fileNamePattern>
- <minIndex>1</minIndex>
- <maxIndex>5</maxIndex>
- </rollingPolicy>
- <triggeringPolicy
class="ch.qos.logback.core.rolling.SizeBasedTriggeringPolicy">
+ <rollingPolicy
class="ch.qos.logback.core.rolling.SizeAndTimeBasedRollingPolicy">
+
<fileNamePattern>${IOTDB_HOME}/logs/log-audit-%d{yyyyMMdd-HH}.%i.log.gz</fileNamePattern>
<maxFileSize>10MB</maxFileSize>
- </triggeringPolicy>
+ <maxHistory>168</maxHistory>
+ <totalSizeCap>512MB</totalSizeCap>
+ </rollingPolicy>
<append>true</append>
<encoder class="ch.qos.logback.classic.encoder.PatternLayoutEncoder">
<pattern>%d [%t] %-5p %C:%L - %m %n</pattern>
@@ -217,14 +199,12 @@
</appender>
<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.FixedWindowRollingPolicy">
-
<fileNamePattern>${IOTDB_HOME}/logs/log-query-debug-%d{yyyy-MM-dd}.%i.log.gz</fileNamePattern>
- <minIndex>1</minIndex>
- <maxIndex>5</maxIndex>
- </rollingPolicy>
- <triggeringPolicy
class="ch.qos.logback.core.rolling.SizeBasedTriggeringPolicy">
+ <rollingPolicy
class="ch.qos.logback.core.rolling.SizeAndTimeBasedRollingPolicy">
+
<fileNamePattern>${IOTDB_HOME}/logs/log-query-debug-%d{yyyyMMdd-HH}.%i.log.gz</fileNamePattern>
<maxFileSize>10MB</maxFileSize>
- </triggeringPolicy>
+ <maxHistory>168</maxHistory>
+ <totalSizeCap>512MB</totalSizeCap>
+ </rollingPolicy>
<append>true</append>
<encoder class="ch.qos.logback.classic.encoder.PatternLayoutEncoder">
<pattern>%d [%t] %-5p %C:%L - %m %n</pattern>
@@ -236,14 +216,12 @@
</appender>
<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.FixedWindowRollingPolicy">
-
<fileNamePattern>${IOTDB_HOME}/logs/log-slow-sql-%d{yyyy-MM-dd}.%i.log.gz</fileNamePattern>
- <minIndex>1</minIndex>
- <maxIndex>5</maxIndex>
- </rollingPolicy>
- <triggeringPolicy
class="ch.qos.logback.core.rolling.SizeBasedTriggeringPolicy">
+ <rollingPolicy
class="ch.qos.logback.core.rolling.SizeAndTimeBasedRollingPolicy">
+
<fileNamePattern>${IOTDB_HOME}/logs/log-slow-sql-%d{yyyyMMdd-HH}.%i.log.gz</fileNamePattern>
<maxFileSize>10MB</maxFileSize>
- </triggeringPolicy>
+ <maxHistory>168</maxHistory>
+ <totalSizeCap>512MB</totalSizeCap>
+ </rollingPolicy>
<append>true</append>
<encoder class="ch.qos.logback.classic.encoder.PatternLayoutEncoder">
<pattern>%d [%t] %-5p %C:%L - %m %n</pattern>
@@ -255,14 +233,12 @@
</appender>
<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.FixedWindowRollingPolicy">
-
<fileNamePattern>${IOTDB_HOME}/logs/log-query-frequency-%d{yyyy-MM-dd}.%i.log.gz</fileNamePattern>
- <minIndex>1</minIndex>
- <maxIndex>5</maxIndex>
- </rollingPolicy>
- <triggeringPolicy
class="ch.qos.logback.core.rolling.SizeBasedTriggeringPolicy">
+ <rollingPolicy
class="ch.qos.logback.core.rolling.SizeAndTimeBasedRollingPolicy">
+
<fileNamePattern>${IOTDB_HOME}/logs/log-query-frequency-%d{yyyyMMdd-HH}.%i.log.gz</fileNamePattern>
<maxFileSize>10MB</maxFileSize>
- </triggeringPolicy>
+ <maxHistory>168</maxHistory>
+ <totalSizeCap>512MB</totalSizeCap>
+ </rollingPolicy>
<append>true</append>
<encoder class="ch.qos.logback.classic.encoder.PatternLayoutEncoder">
<pattern>%d [%t] %-5p %C:%L - %m %n</pattern>
