You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@iotdb.apache.org by ha...@apache.org on 2022/10/20 09:59:35 UTC
[iotdb] 03/04: finish
This is an automated email from the ASF dual-hosted git repository.
haonan pushed a commit to branch pkg
in repository https://gitbox.apache.org/repos/asf/iotdb.git
commit 9b4c29ad24a3b1a3dfbd3bf96a2bbf3a63ee1c44
Author: HTHou <hh...@outlook.com>
AuthorDate: Thu Oct 20 17:53:39 2022 +0800
finish
---
.../conf/{logback.xml => logback-confignode.xml} | 20 ++++-----
.../assembly/resources/sbin/start-confignode.bat | 2 +-
.../assembly/resources/sbin/start-confignode.sh | 2 +-
.../org/apache/iotdb/it/env/ConfigNodeWrapper.java | 2 +-
server/src/assembly/resources/conf/logback.xml | 52 +++++++++++-----------
5 files changed, 39 insertions(+), 39 deletions(-)
diff --git a/confignode/src/assembly/resources/conf/logback.xml b/confignode/src/assembly/resources/conf/logback-confignode.xml
similarity index 86%
rename from confignode/src/assembly/resources/conf/logback.xml
rename to confignode/src/assembly/resources/conf/logback-confignode.xml
index 28d214b2a4..5c9d765772 100644
--- a/confignode/src/assembly/resources/conf/logback.xml
+++ b/confignode/src/assembly/resources/conf/logback-confignode.xml
@@ -24,9 +24,9 @@
<!-- prevent logback from outputting its own status at the start of every log -->
<statusListener class="ch.qos.logback.core.status.NopStatusListener"/>
<appender class="ch.qos.logback.core.rolling.RollingFileAppender" name="FILEERROR">
- <file>${CONFIGNODE_HOME}/logs/log_error.log</file>
+ <file>${CONFIGNODE_HOME}/logs/log_confignode_error.log</file>
<rollingPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedRollingPolicy">
- <fileNamePattern>${CONFIGNODE_HOME}/logs/log-error-%d{yyyyMMdd}.%i.log.gz</fileNamePattern>
+ <fileNamePattern>${CONFIGNODE_HOME}/logs/log-confignode-error-%d{yyyyMMdd}.%i.log.gz</fileNamePattern>
<maxFileSize>10MB</maxFileSize>
<maxHistory>168</maxHistory>
<totalSizeCap>512MB</totalSizeCap>
@@ -43,9 +43,9 @@
</filter>
</appender>
<appender class="ch.qos.logback.core.rolling.RollingFileAppender" name="FILEWARN">
- <file>${CONFIGNODE_HOME}/logs/log_warn.log</file>
+ <file>${CONFIGNODE_HOME}/logs/log_confignode_warn.log</file>
<rollingPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedRollingPolicy">
- <fileNamePattern>${CONFIGNODE_HOME}/logs/log-warn-%d{yyyyMMdd}.%i.log.gz</fileNamePattern>
+ <fileNamePattern>${CONFIGNODE_HOME}/logs/log-confignode-warn-%d{yyyyMMdd}.%i.log.gz</fileNamePattern>
<maxFileSize>10MB</maxFileSize>
<maxHistory>168</maxHistory>
<totalSizeCap>512MB</totalSizeCap>
@@ -62,9 +62,9 @@
</filter>
</appender>
<appender class="ch.qos.logback.core.rolling.RollingFileAppender" name="FILEINFO">
- <file>${CONFIGNODE_HOME}/logs/log_info.log</file>
+ <file>${CONFIGNODE_HOME}/logs/log_confignode_info.log</file>
<rollingPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedRollingPolicy">
- <fileNamePattern>${CONFIGNODE_HOME}/logs/log-info-%d{yyyyMMdd}.%i.log.gz</fileNamePattern>
+ <fileNamePattern>${CONFIGNODE_HOME}/logs/log-confignode-info-%d{yyyyMMdd}.%i.log.gz</fileNamePattern>
<maxFileSize>50MB</maxFileSize>
<maxHistory>168</maxHistory>
<totalSizeCap>5GB</totalSizeCap>
@@ -81,9 +81,9 @@
</filter>
</appender>
<appender class="ch.qos.logback.core.rolling.RollingFileAppender" name="FILEDEBUG">
- <file>${CONFIGNODE_HOME}/logs/log_debug.log</file>
+ <file>${CONFIGNODE_HOME}/logs/log_confignode_debug.log</file>
<rollingPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedRollingPolicy">
- <fileNamePattern>${CONFIGNODE_HOME}/logs/log-debug-%d{yyyyMMdd}.%i.log.gz</fileNamePattern>
+ <fileNamePattern>${CONFIGNODE_HOME}/logs/log-confignode-debug-%d{yyyyMMdd}.%i.log.gz</fileNamePattern>
<maxFileSize>50MB</maxFileSize>
<maxHistory>168</maxHistory>
<totalSizeCap>5GB</totalSizeCap>
@@ -111,9 +111,9 @@
</appender>
<!-- 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>${CONFIGNODE_HOME}/logs/log_all.log</file>
+ <file>${CONFIGNODE_HOME}/logs/log_confignode_all.log</file>
<rollingPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedRollingPolicy">
- <fileNamePattern>${CONFIGNODE_HOME}/logs/log-all-%d{yyyyMMdd}.%i.log.gz</fileNamePattern>
+ <fileNamePattern>${CONFIGNODE_HOME}/logs/log-confignode-all-%d{yyyyMMdd}.%i.log.gz</fileNamePattern>
<maxFileSize>50MB</maxFileSize>
<maxHistory>168</maxHistory>
<totalSizeCap>5GB</totalSizeCap>
diff --git a/confignode/src/assembly/resources/sbin/start-confignode.bat b/confignode/src/assembly/resources/sbin/start-confignode.bat
index 918c0b997e..fff33a75b7 100644
--- a/confignode/src/assembly/resources/sbin/start-confignode.bat
+++ b/confignode/src/assembly/resources/sbin/start-confignode.bat
@@ -85,7 +85,7 @@ if NOT DEFINED JAVA_HOME goto :err
@REM -----------------------------------------------------------------------------
@REM JVM Opts we'll use in legacy run or installation
set JAVA_OPTS=-ea^
- -Dlogback.configurationFile="%CONFIGNODE_CONF%\logback.xml"^
+ -Dlogback.configurationFile="%CONFIGNODE_CONF%\logback-confignode.xml"^
-DCONFIGNODE_HOME="%CONFIGNODE_HOME%"^
-DCONFIGNODE_CONF="%CONFIGNODE_CONF%"^
-Dsun.jnu.encoding=UTF-8^
diff --git a/confignode/src/assembly/resources/sbin/start-confignode.sh b/confignode/src/assembly/resources/sbin/start-confignode.sh
index eec139dab4..85d0c61e3c 100644
--- a/confignode/src/assembly/resources/sbin/start-confignode.sh
+++ b/confignode/src/assembly/resources/sbin/start-confignode.sh
@@ -70,7 +70,7 @@ classname=org.apache.iotdb.confignode.service.ConfigNode
launch_service() {
class="$1"
- confignode_parms="-Dlogback.configurationFile=${CONFIGNODE_CONF}/logback.xml"
+ confignode_parms="-Dlogback.configurationFile=${CONFIGNODE_CONF}/logback-confignode.xml"
confignode_parms="$confignode_parms -DCONFIGNODE_HOME=${CONFIGNODE_HOME}"
confignode_parms="$confignode_parms -DCONFIGNODE_CONF=${CONFIGNODE_CONF}"
exec "$JAVA" $illegal_access_params $confignode_parms $CONFIGNODE_JMX_OPTS -cp "$CLASSPATH" "$class" $CONF_PARAMS
diff --git a/integration-test/src/main/java/org/apache/iotdb/it/env/ConfigNodeWrapper.java b/integration-test/src/main/java/org/apache/iotdb/it/env/ConfigNodeWrapper.java
index 5b6053227d..f0c973e94a 100644
--- a/integration-test/src/main/java/org/apache/iotdb/it/env/ConfigNodeWrapper.java
+++ b/integration-test/src/main/java/org/apache/iotdb/it/env/ConfigNodeWrapper.java
@@ -86,7 +86,7 @@ public class ConfigNodeWrapper extends AbstractNodeWrapper {
final String confDir = workDir + File.separator + "conf";
params.addAll(
Arrays.asList(
- "-Dlogback.configurationFile=" + confDir + File.separator + "logback.xml",
+ "-Dlogback.configurationFile=" + confDir + File.separator + "logback-confignode.xml",
"-DCONFIGNODE_HOME=" + workDir,
"-DCONFIGNODE_CONF=" + confDir,
"org.apache.iotdb.confignode.service.ConfigNode",
diff --git a/server/src/assembly/resources/conf/logback.xml b/server/src/assembly/resources/conf/logback.xml
index 286e99cc38..4f7373e1c2 100644
--- a/server/src/assembly/resources/conf/logback.xml
+++ b/server/src/assembly/resources/conf/logback.xml
@@ -24,9 +24,9 @@
<!-- prevent logback from outputting its own status at the start of every log -->
<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>
+ <file>${IOTDB_HOME}/logs/log_datanode_error.log</file>
<rollingPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedRollingPolicy">
- <fileNamePattern>${IOTDB_HOME}/logs/log-error-%d{yyyyMMdd}.%i.log.gz</fileNamePattern>
+ <fileNamePattern>${IOTDB_HOME}/logs/log-datanode-error-%d{yyyyMMdd}.%i.log.gz</fileNamePattern>
<maxFileSize>10MB</maxFileSize>
<maxHistory>168</maxHistory>
<totalSizeCap>512MB</totalSizeCap>
@@ -43,9 +43,9 @@
</filter>
</appender>
<appender class="ch.qos.logback.core.rolling.RollingFileAppender" name="FILEWARN">
- <file>${IOTDB_HOME}/logs/log_warn.log</file>
+ <file>${IOTDB_HOME}/logs/log_datanode_warn.log</file>
<rollingPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedRollingPolicy">
- <fileNamePattern>${IOTDB_HOME}/logs/log-warn-%d{yyyyMMdd}.%i.log.gz</fileNamePattern>
+ <fileNamePattern>${IOTDB_HOME}/logs/log-datanode-warn-%d{yyyyMMdd}.%i.log.gz</fileNamePattern>
<maxFileSize>10MB</maxFileSize>
<maxHistory>168</maxHistory>
<totalSizeCap>512MB</totalSizeCap>
@@ -62,9 +62,9 @@
</filter>
</appender>
<appender class="ch.qos.logback.core.rolling.RollingFileAppender" name="FILEINFO">
- <file>${IOTDB_HOME}/logs/log_info.log</file>
+ <file>${IOTDB_HOME}/logs/log_datanode_info.log</file>
<rollingPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedRollingPolicy">
- <fileNamePattern>${IOTDB_HOME}/logs/log-info-%d{yyyyMMdd}.%i.log.gz</fileNamePattern>
+ <fileNamePattern>${IOTDB_HOME}/logs/log-datanode-info-%d{yyyyMMdd}.%i.log.gz</fileNamePattern>
<maxFileSize>50MB</maxFileSize>
<maxHistory>168</maxHistory>
<totalSizeCap>5GB</totalSizeCap>
@@ -81,9 +81,9 @@
</filter>
</appender>
<appender class="ch.qos.logback.core.rolling.RollingFileAppender" name="FILEDEBUG">
- <file>${IOTDB_HOME}/logs/log_debug.log</file>
+ <file>${IOTDB_HOME}/logs/log_datanode_debug.log</file>
<rollingPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedRollingPolicy">
- <fileNamePattern>${IOTDB_HOME}/logs/log-debug-%d{yyyyMMdd}.%i.log.gz</fileNamePattern>
+ <fileNamePattern>${IOTDB_HOME}/logs/log-datanode-debug-%d{yyyyMMdd}.%i.log.gz</fileNamePattern>
<maxFileSize>50MB</maxFileSize>
<maxHistory>168</maxHistory>
<totalSizeCap>5GB</totalSizeCap>
@@ -100,9 +100,9 @@
</filter>
</appender>
<appender class="ch.qos.logback.core.rolling.RollingFileAppender" name="FILETRACE">
- <file>${IOTDB_HOME}/logs/log_trace.log</file>
+ <file>${IOTDB_HOME}/logs/log_datanode_trace.log</file>
<rollingPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedRollingPolicy">
- <fileNamePattern>${IOTDB_HOME}/logs/log-trace-%d{yyyyMMdd}.%i.log.gz</fileNamePattern>
+ <fileNamePattern>${IOTDB_HOME}/logs/log-datanode-trace-%d{yyyyMMdd}.%i.log.gz</fileNamePattern>
<maxFileSize>50MB</maxFileSize>
<maxHistory>168</maxHistory>
<totalSizeCap>5GB</totalSizeCap>
@@ -130,9 +130,9 @@
</appender>
<!-- 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>
+ <file>${IOTDB_HOME}/logs/log_datanode_all.log</file>
<rollingPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedRollingPolicy">
- <fileNamePattern>${IOTDB_HOME}/logs/log-all-%d{yyyyMMdd}.%i.log.gz</fileNamePattern>
+ <fileNamePattern>${IOTDB_HOME}/logs/log-datanode-all-%d{yyyyMMdd}.%i.log.gz</fileNamePattern>
<maxFileSize>50MB</maxFileSize>
<maxHistory>168</maxHistory>
<totalSizeCap>5GB</totalSizeCap>
@@ -147,9 +147,9 @@
</filter>
</appender>
<appender class="ch.qos.logback.core.rolling.RollingFileAppender" name="FILE_COST_MEASURE">
- <file>${IOTDB_HOME}/logs/log_measure.log</file>
+ <file>${IOTDB_HOME}/logs/log_datanode_measure.log</file>
<rollingPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedRollingPolicy">
- <fileNamePattern>${IOTDB_HOME}/logs/log-measure-%d{yyyyMMdd}.%i.log.gz</fileNamePattern>
+ <fileNamePattern>${IOTDB_HOME}/logs/log-datanode-measure-%d{yyyyMMdd}.%i.log.gz</fileNamePattern>
<maxFileSize>10MB</maxFileSize>
<maxHistory>168</maxHistory>
<totalSizeCap>512MB</totalSizeCap>
@@ -164,9 +164,9 @@
</filter>
</appender>
<appender class="ch.qos.logback.core.rolling.RollingFileAppender" name="SYNC">
- <file>${IOTDB_HOME}/logs/log_sync.log</file>
+ <file>${IOTDB_HOME}/logs/log_datanode_sync.log</file>
<rollingPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedRollingPolicy">
- <fileNamePattern>${IOTDB_HOME}/logs/log-sync-%d{yyyyMMdd}.%i.log.gz</fileNamePattern>
+ <fileNamePattern>${IOTDB_HOME}/logs/log-datanode-sync-%d{yyyyMMdd}.%i.log.gz</fileNamePattern>
<maxFileSize>10MB</maxFileSize>
<maxHistory>168</maxHistory>
<totalSizeCap>512MB</totalSizeCap>
@@ -181,9 +181,9 @@
</filter>
</appender>
<appender class="ch.qos.logback.core.rolling.RollingFileAppender" name="AUDIT">
- <file>${IOTDB_HOME}/logs/log_audit.log</file>
+ <file>${IOTDB_HOME}/logs/log_datanode_audit.log</file>
<rollingPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedRollingPolicy">
- <fileNamePattern>${IOTDB_HOME}/logs/log-audit-%d{yyyyMMdd}.%i.log.gz</fileNamePattern>
+ <fileNamePattern>${IOTDB_HOME}/logs/log-datanode-audit-%d{yyyyMMdd}.%i.log.gz</fileNamePattern>
<maxFileSize>10MB</maxFileSize>
<maxHistory>168</maxHistory>
<totalSizeCap>512MB</totalSizeCap>
@@ -198,9 +198,9 @@
</filter>
</appender>
<appender class="ch.qos.logback.core.rolling.RollingFileAppender" name="QUERY_DEBUG">
- <file>${IOTDB_HOME}/logs/log_query_debug.log</file>
+ <file>${IOTDB_HOME}/logs/log_datanode_query_debug.log</file>
<rollingPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedRollingPolicy">
- <fileNamePattern>${IOTDB_HOME}/logs/log-query-debug-%d{yyyyMMdd}.%i.log.gz</fileNamePattern>
+ <fileNamePattern>${IOTDB_HOME}/logs/log-datanode-query-debug-%d{yyyyMMdd}.%i.log.gz</fileNamePattern>
<maxFileSize>10MB</maxFileSize>
<maxHistory>168</maxHistory>
<totalSizeCap>512MB</totalSizeCap>
@@ -215,9 +215,9 @@
</filter>
</appender>
<appender class="ch.qos.logback.core.rolling.RollingFileAppender" name="SLOW_SQL">
- <file>${IOTDB_HOME}/logs/log_slow_sql.log</file>
+ <file>${IOTDB_HOME}/logs/log_datanode_slow_sql.log</file>
<rollingPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedRollingPolicy">
- <fileNamePattern>${IOTDB_HOME}/logs/log-slow-sql-%d{yyyyMMdd}.%i.log.gz</fileNamePattern>
+ <fileNamePattern>${IOTDB_HOME}/logs/log-datanode-slow-sql-%d{yyyyMMdd}.%i.log.gz</fileNamePattern>
<maxFileSize>10MB</maxFileSize>
<maxHistory>168</maxHistory>
<totalSizeCap>512MB</totalSizeCap>
@@ -232,9 +232,9 @@
</filter>
</appender>
<appender class="ch.qos.logback.core.rolling.RollingFileAppender" name="QUERY_FREQUENCY">
- <file>${IOTDB_HOME}/logs/log_query_frequency.log</file>
+ <file>${IOTDB_HOME}/logs/log_datanode_query_frequency.log</file>
<rollingPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedRollingPolicy">
- <fileNamePattern>${IOTDB_HOME}/logs/log-query-frequency-%d{yyyyMMdd}.%i.log.gz</fileNamePattern>
+ <fileNamePattern>${IOTDB_HOME}/logs/log-datanode-query-frequency-%d{yyyyMMdd}.%i.log.gz</fileNamePattern>
<maxFileSize>10MB</maxFileSize>
<maxHistory>168</maxHistory>
<totalSizeCap>512MB</totalSizeCap>
@@ -249,9 +249,9 @@
</filter>
</appender>
<appender class="ch.qos.logback.core.rolling.RollingFileAppender" name="COMPACTION">
- <file>${IOTDB_HOME}/logs/log_compaction.log</file>
+ <file>${IOTDB_HOME}/logs/log_datanode_compaction.log</file>
<rollingPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedRollingPolicy">
- <fileNamePattern>${IOTDB_HOME}/logs/log-compaction-%d{yyyyMMdd}.%i.log.gz</fileNamePattern>
+ <fileNamePattern>${IOTDB_HOME}/logs/log-datanode-compaction-%d{yyyyMMdd}.%i.log.gz</fileNamePattern>
<maxFileSize>10MB</maxFileSize>
<maxHistory>168</maxHistory>
<totalSizeCap>512MB</totalSizeCap>