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 a344eb7 [IOTDB-1278]limit the class name length <=25 in logback and
reduce thread pool name length (#2966)
a344eb7 is described below
commit a344eb7588ed74366716083c88aff44ce7e9364a
Author: Xiangdong Huang <[email protected]>
AuthorDate: Sat Apr 3 09:34:40 2021 +0800
[IOTDB-1278]limit the class name length <=25 in logback and reduce thread
pool name length (#2966)
---
server/src/assembly/resources/conf/logback.xml | 26 +++++++-------
.../iotdb/db/concurrent/IoTThreadFactory.java | 3 +-
.../org/apache/iotdb/db/concurrent/ThreadName.java | 40 +++++++++++-----------
3 files changed, 34 insertions(+), 35 deletions(-)
diff --git a/server/src/assembly/resources/conf/logback.xml
b/server/src/assembly/resources/conf/logback.xml
index c7e58a0..7abefca 100644
--- a/server/src/assembly/resources/conf/logback.xml
+++ b/server/src/assembly/resources/conf/logback.xml
@@ -33,7 +33,7 @@
</rollingPolicy>
<append>true</append>
<encoder class="ch.qos.logback.classic.encoder.PatternLayoutEncoder">
- <pattern>%d [%t] %-5p %C:%L - %m %n</pattern>
+ <pattern>%d [%t] %-5p %C{25}:%L - %m %n</pattern>
<charset>utf-8</charset>
</encoder>
<filter class="ch.qos.logback.classic.filter.LevelFilter">
@@ -52,7 +52,7 @@
</rollingPolicy>
<append>true</append>
<encoder class="ch.qos.logback.classic.encoder.PatternLayoutEncoder">
- <pattern>%d [%t] %-5p %C:%L - %m %n</pattern>
+ <pattern>%d [%t] %-5p %C{25}:%L - %m %n</pattern>
<charset>utf-8</charset>
</encoder>
<filter class="ch.qos.logback.classic.filter.LevelFilter">
@@ -71,7 +71,7 @@
</rollingPolicy>
<append>true</append>
<encoder class="ch.qos.logback.classic.encoder.PatternLayoutEncoder">
- <pattern>%d [%t] %-5p %C:%L - %m %n</pattern>
+ <pattern>%d [%t] %-5p %C{25}:%L - %m %n</pattern>
<charset>utf-8</charset>
</encoder>
<filter class="ch.qos.logback.classic.filter.LevelFilter">
@@ -90,7 +90,7 @@
</rollingPolicy>
<append>true</append>
<encoder class="ch.qos.logback.classic.encoder.PatternLayoutEncoder">
- <pattern>%d [%t] %-5p %C:%L - %m %n</pattern>
+ <pattern>%d [%t] %-5p %C{25}:%L - %m %n</pattern>
<charset>utf-8</charset>
</encoder>
<filter class="ch.qos.logback.classic.filter.LevelFilter">
@@ -109,7 +109,7 @@
</rollingPolicy>
<append>true</append>
<encoder class="ch.qos.logback.classic.encoder.PatternLayoutEncoder">
- <pattern>%d [%t] %-5p %C:%L - %m %n</pattern>
+ <pattern>%d [%t] %-5p %C{25}:%L - %m %n</pattern>
<charset>utf-8</charset>
</encoder>
<filter class="ch.qos.logback.classic.filter.LevelFilter">
@@ -121,7 +121,7 @@
<appender class="ch.qos.logback.core.ConsoleAppender" name="stdout">
<Target>System.out</Target>
<encoder>
- <pattern>%d [%t] %-5p %C:%L - %m %n</pattern>
+ <pattern>%d [%t] %-5p %C{25}:%L - %m %n</pattern>
<charset>utf-8</charset>
</encoder>
<filter class="ch.qos.logback.classic.filter.ThresholdFilter">
@@ -139,7 +139,7 @@
</rollingPolicy>
<append>true</append>
<encoder class="ch.qos.logback.classic.encoder.PatternLayoutEncoder">
- <pattern>%d [%t] %-5p %C:%L - %m %n</pattern>
+ <pattern>%d [%t] %-5p %C{25}:%L - %m %n</pattern>
<charset>utf-8</charset>
</encoder>
<filter class="ch.qos.logback.classic.filter.ThresholdFilter">
@@ -156,7 +156,7 @@
</rollingPolicy>
<append>true</append>
<encoder class="ch.qos.logback.classic.encoder.PatternLayoutEncoder">
- <pattern>%d [%t] %-5p %C:%L - %m %n</pattern>
+ <pattern>%d [%t] %-5p %C{25}:%L - %m %n</pattern>
<charset>utf-8</charset>
</encoder>
<filter class="ch.qos.logback.classic.filter.ThresholdFilter">
@@ -173,7 +173,7 @@
</rollingPolicy>
<append>true</append>
<encoder class="ch.qos.logback.classic.encoder.PatternLayoutEncoder">
- <pattern>%d [%t] %-5p %C:%L - %m %n</pattern>
+ <pattern>%d [%t] %-5p %C{25}:%L - %m %n</pattern>
<charset>utf-8</charset>
</encoder>
<filter class="ch.qos.logback.classic.filter.ThresholdFilter">
@@ -190,7 +190,7 @@
</rollingPolicy>
<append>true</append>
<encoder class="ch.qos.logback.classic.encoder.PatternLayoutEncoder">
- <pattern>%d [%t] %-5p %C:%L - %m %n</pattern>
+ <pattern>%d [%t] %-5p %C{25}:%L - %m %n</pattern>
<charset>utf-8</charset>
</encoder>
<filter class="ch.qos.logback.classic.filter.ThresholdFilter">
@@ -207,7 +207,7 @@
</rollingPolicy>
<append>true</append>
<encoder class="ch.qos.logback.classic.encoder.PatternLayoutEncoder">
- <pattern>%d [%t] %-5p %C:%L - %m %n</pattern>
+ <pattern>%d [%t] %-5p %C{25}:%L - %m %n</pattern>
<charset>utf-8</charset>
</encoder>
<filter class="ch.qos.logback.classic.filter.ThresholdFilter">
@@ -224,7 +224,7 @@
</rollingPolicy>
<append>true</append>
<encoder class="ch.qos.logback.classic.encoder.PatternLayoutEncoder">
- <pattern>%d [%t] %-5p %C:%L - %m %n</pattern>
+ <pattern>%d [%t] %-5p %C{25}:%L - %m %n</pattern>
<charset>utf-8</charset>
</encoder>
<filter class="ch.qos.logback.classic.filter.ThresholdFilter">
@@ -241,7 +241,7 @@
</rollingPolicy>
<append>true</append>
<encoder class="ch.qos.logback.classic.encoder.PatternLayoutEncoder">
- <pattern>%d [%t] %-5p %C:%L - %m %n</pattern>
+ <pattern>%d [%t] %-5p %C{25}:%L - %m %n</pattern>
<charset>utf-8</charset>
</encoder>
<filter class="ch.qos.logback.classic.filter.ThresholdFilter">
diff --git
a/server/src/main/java/org/apache/iotdb/db/concurrent/IoTThreadFactory.java
b/server/src/main/java/org/apache/iotdb/db/concurrent/IoTThreadFactory.java
index 98505c3..d2bce7e 100644
--- a/server/src/main/java/org/apache/iotdb/db/concurrent/IoTThreadFactory.java
+++ b/server/src/main/java/org/apache/iotdb/db/concurrent/IoTThreadFactory.java
@@ -34,8 +34,7 @@ public class IoTThreadFactory implements ThreadFactory {
SecurityManager s = System.getSecurityManager();
group = (s != null) ? s.getThreadGroup() :
Thread.currentThread().getThreadGroup();
// thread pool name format : pool-number-IoTDB-poolName-thread-
- this.namePrefix =
- "pool-" + poolNumber.getAndIncrement() + "-IoTDB" + "-" + poolName +
"-thread-";
+ this.namePrefix = "pool-" + poolNumber.getAndIncrement() + "-IoTDB-" +
poolName + "-";
}
public IoTThreadFactory(String poolName, Thread.UncaughtExceptionHandler
handler) {
diff --git
a/server/src/main/java/org/apache/iotdb/db/concurrent/ThreadName.java
b/server/src/main/java/org/apache/iotdb/db/concurrent/ThreadName.java
index c2ea604..5f83c12 100644
--- a/server/src/main/java/org/apache/iotdb/db/concurrent/ThreadName.java
+++ b/server/src/main/java/org/apache/iotdb/db/concurrent/ThreadName.java
@@ -20,30 +20,30 @@ package org.apache.iotdb.db.concurrent;
public enum ThreadName {
METRICS_SERVICE("Metrics-ServerServiceImpl"),
- RPC_SERVICE("RPC-ServerServiceImpl"),
+ RPC_SERVICE("RPC"),
RPC_CLIENT("RPC-Client"),
- MERGE_SERVICE("Merge-ServerServiceImpl"),
- CLOSE_MERGE_SERVICE("Close-Merge-ServerServiceImpl"),
- CLOSE_MERGE_DAEMON("Close-Merge-Daemon-Thread"),
- CLOSE_DAEMON("Close-Daemon-Thread"),
- MERGE_DAEMON("Merge-Daemon-Thread"),
- MEMORY_MONITOR("IoTDB-MemMonitor-Thread"),
- MEMORY_STATISTICS("IoTDB-MemStatistic-Thread"),
- FLUSH_PARTIAL_POLICY("IoTDB-FlushPartialPolicy-Thread"),
- FORCE_FLUSH_ALL_POLICY("IoTDB-ForceFlushAllPolicy-Thread"),
- STAT_MONITOR("StatMonitor-ServerServiceImpl"),
- FLUSH_SERVICE("Flush-ServerServiceImpl"),
- FLUSH_SUB_TASK_SERVICE("Flush-SubTask-ServerServiceImpl"),
- COMPACTION_SERVICE("Compaction-ServerServiceImpl"),
- WAL_DAEMON("IoTDB-MultiFileLogNodeManager-Sync-Thread"),
- WAL_FORCE_DAEMON("IoTDB-MultiFileLogNodeManager-Force-Thread"),
- INDEX_SERVICE("Index-ServerServiceImpl"),
+ MERGE_SERVICE("Merge"),
+ CLOSE_MERGE_SERVICE("Close-Merge"),
+ CLOSE_MERGE_DAEMON("Close-Merge-Daemon"),
+ CLOSE_DAEMON("Close-Daemon"),
+ MERGE_DAEMON("Merge-Daemon"),
+ MEMORY_MONITOR("MemMonitor"),
+ MEMORY_STATISTICS("MemStatistic"),
+ FLUSH_PARTIAL_POLICY("FlushPartialPolicy"),
+ FORCE_FLUSH_ALL_POLICY("ForceFlushAllPolicy"),
+ STAT_MONITOR("StatMonitor"),
+ FLUSH_SERVICE("Flush"),
+ FLUSH_SUB_TASK_SERVICE("Flush-SubTask"),
+ COMPACTION_SERVICE("Compaction"),
+ WAL_DAEMON("WAL-Sync"),
+ WAL_FORCE_DAEMON("WAL-Force"),
+ INDEX_SERVICE("Index"),
SYNC_CLIENT("Sync-Client"),
- SYNC_SERVER("Sync-Server"),
+ SYNC_SERVER("Sync"),
SYNC_MONITOR("Sync-Monitor"),
- LOAD_TSFILE("Load TsFile"),
+ LOAD_TSFILE("Load-TsFile"),
TIME_COST_STATISTIC("TIME_COST_STATISTIC"),
- QUERY_SERVICE("Query-ServerServiceImpl");
+ QUERY_SERVICE("Query");
private String name;
