database/doris
2
0
Fork 0
Code Issues Pull Requests Actions 3 Packages Projects Releases Wiki Activity

[fix](fe-log) add position info in async mode #39419 (#39571)

Browse Source 
pick part of #39419
This commit is contained in:
Mingyu Chen
2024-08-20 22:01:34 +08:00
committed by GitHub
parent a4deefea5d
commit dfd21bd2a0
2 changed files with 14 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
fe/fe-common/src/main/java/org/apache/doris/common/Config.java
View File

@ -70,13 +70,13 @@ public class Config extends ConfigBase {
@ConfField(description = {"FE 日志的级别", "The level of FE log"}, options = {"INFO", "WARN", "ERROR", "FATAL"})
public static String sys_log_level = "INFO";
@ConfField(description = {"FE 日志的输出模式，其中 NORMAL 为默认的输出模式，日志同步输出且包含位置信息，"
+ "BRIEF 模式是日志同步输出但不包含位置信息，ASYNC 模式是日志异步输出且不包含位置信息，三种日志输出模式的性能依次递增",
"The output mode of FE log, and NORMAL mode is the default output mode, which means the logs are "
+ "synchronized and contain location information. BRIEF mode is synchronized and does not contain"
+ " location information. ASYNC mode is asynchronous and does not contain location information."
+ " The performance of the three log output modes increases in sequence"},
options = {"NORMAL", "BRIEF", "ASYNC"})
@ConfField(description = {"FE 日志的输出模式，其中 NORMAL 模式是日志同步输出且包含位置信息；ASYNC 模式为默认模式，日志异步输出"
+ "且包含位置信息；BRIEF 是日志异步输出但不包含位置信息，三种日志输出模式的性能依次递增",
"The output mode of FE log. NORMAL mode is synchronous output with location information; "
+ "ASYNC mode is the default mode, asynchronous output with location information; "
+ "BRIEF is asynchronous output without location information. "
+ "The performance of the three log output modes increases in turn"},
options = {"NORMAL", "ASYNC", "BRIEF"})
public static String sys_log_mode = "NORMAL";
@ConfField(description = {"FE 日志文件的最大数量。超过这个数量后，最老的日志文件会被删除",

9
fe/fe-core/src/main/java/org/apache/doris/common/Log4jConfig.java
View File

@ -298,8 +298,13 @@ public class Log4jConfig extends XmlConfiguration {
properties.put("warn_sys_accumulated_file_size", String.valueOf(Config.warn_sys_accumulated_file_size));
properties.put("audit_sys_accumulated_file_size", String.valueOf(Config.audit_sys_accumulated_file_size));
properties.put("include_location_flag", sysLogMode.equalsIgnoreCase("NORMAL") ? "true" : "false");
properties.put("immediate_flush_flag", sysLogMode.equalsIgnoreCase("ASYNC") ? "false" : "true");
// BRIEF: async, no location
// ASYNC: async, with location
// NORMAL: sync, with location
boolean includeLocation = !sysLogMode.equalsIgnoreCase("BRIEF");
boolean immediateFlush = sysLogMode.equalsIgnoreCase("NORMAL");
properties.put("include_location_flag", Boolean.toString(includeLocation));
properties.put("immediate_flush_flag", Boolean.toString(immediateFlush));
properties.put("audit_file_postfix", compressAuditLog ? ".gz" : "");
strSub = new StrSubstitutor(new Interpolator(properties));