This is an automated email from the ASF dual-hosted git repository.
nicholasjiang pushed a commit to branch branch-0.6
in repository https://gitbox.apache.org/repos/asf/celeborn.git
The following commit(s) were added to refs/heads/branch-0.6 by this push:
new d0e1ed567 [CELEBORN-2195] Align log4j2.xml and metrics.properties of
charts with templates
d0e1ed567 is described below
commit d0e1ed5676934558e47a7496373ecaf4ac7b681d
Author: SteNicholas <[email protected]>
AuthorDate: Tue Nov 4 15:54:45 2025 +0800
[CELEBORN-2195] Align log4j2.xml and metrics.properties of charts with
templates
### What changes were proposed in this pull request?
Align `log4j2.xml` and `metrics.properties` of charts with templates.
Follow up:
- https://github.com/apache/celeborn/pull/2895
- https://github.com/apache/celeborn/pull/3265
- https://github.com/apache/celeborn/pull/3346
### Why are the changes needed?
The `log4j2.xml` and `metrics.properties` of charts are inconsistent with
templates. We should align `log4j2.xml` and `metrics.properties` with conf
templates.
### Does this PR resolve a correctness bug?
No.
### Does this PR introduce _any_ user-facing change?
No.
### How was this patch tested?
CI.
Closes #3528 from SteNicholas/CELEBORN-2195.
Authored-by: SteNicholas <[email protected]>
Signed-off-by: SteNicholas <[email protected]>
(cherry picked from commit e81aa57e008819e0931fff27a97280baf4d0b6f7)
Signed-off-by: SteNicholas <[email protected]>
---
charts/celeborn/files/conf/log4j2.xml | 132 +++++++++++++++++---------
charts/celeborn/files/conf/metrics.properties | 2 +
2 files changed, 90 insertions(+), 44 deletions(-)
diff --git a/charts/celeborn/files/conf/log4j2.xml
b/charts/celeborn/files/conf/log4j2.xml
index f0860c5ef..68a304c3e 100644
--- a/charts/celeborn/files/conf/log4j2.xml
+++ b/charts/celeborn/files/conf/log4j2.xml
@@ -1,66 +1,100 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
- ~ Licensed to the Apache Software Foundation (ASF) under one or more
- ~ contributor license agreements. See the NOTICE file distributed with
- ~ this work for additional information regarding copyright ownership.
- ~ The ASF licenses this file to You under the Apache License, Version 2.0
- ~ (the "License"); you may not use this file except in compliance with
- ~ the License. You may obtain a copy of the License at
- ~
- ~ http://www.apache.org/licenses/LICENSE-2.0
- ~
- ~ Unless required by applicable law or agreed to in writing, software
- ~ distributed under the License is distributed on an "AS IS" BASIS,
- ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- ~ See the License for the specific language governing permissions and
- ~ limitations under the License.
- -->
+ ~ Licensed to the Apache Software Foundation (ASF) under one or more
+ ~ contributor license agreements. See the NOTICE file distributed with
+ ~ this work for additional information regarding copyright ownership.
+ ~ The ASF licenses this file to You under the Apache License, Version 2.0
+ ~ (the "License"); you may not use this file except in compliance with
+ ~ the License. You may obtain a copy of the License at
+ ~
+ ~ http://www.apache.org/licenses/LICENSE-2.0
+ ~
+ ~ Unless required by applicable law or agreed to in writing, software
+ ~ distributed under the License is distributed on an "AS IS" BASIS,
+ ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ ~ See the License for the specific language governing permissions and
+ ~ limitations under the License.
+ -->
+
<!--
- ~ Extra logging related to initialization of Log4j.
- ~ Set to debug or trace if log4j initialization is failing.
- -->
+ ~ Extra logging related to initialization of Log4j.
+ ~ Set to debug or trace if log4j initialization is failing.
+ -->
<Configuration status="INFO">
<Appenders>
<Console name="stdout" target="SYSTEM_OUT">
<!--
- ~ In the pattern layout configuration below, we specify an
explicit `%ex` conversion
- ~ pattern for logging Throwables. If this was omitted, then
(by default) Log4J would
- ~ implicitly add an `%xEx` conversion pattern which logs
stacktraces with additional
- ~ class packaging information. That extra information can
sometimes add a substantial
- ~ performance overhead, so we disable it in our default
logging config.
- -->
- <PatternLayout pattern="%d{yy/MM/dd HH:mm:ss,SSS} %p [%t] %c{1}:
%m%n%ex" />
+ ~ In the pattern layout configuration below, we specify an
explicit `%ex` conversion
+ ~ pattern for logging Throwables. If this was omitted, then (by
default) Log4J would
+ ~ implicitly add an `%xEx` conversion pattern which logs
stacktraces with additional
+ ~ class packaging information. That extra information can
sometimes add a substantial
+ ~ performance overhead, so we disable it in our default logging
config.
+ -->
+ <PatternLayout pattern="%d{yy/MM/dd HH:mm:ss,SSS} %p [%t] %c{1}:
%m%n%ex"/>
</Console>
<RollingRandomAccessFile name="file"
fileName="${env:CELEBORN_LOG_DIR}/celeborn.log"
- filePattern="${env:CELEBORN_LOG_DIR}/celeborn.log.%d-%i">
- <PatternLayout pattern="%d{yy/MM/dd HH:mm:ss,SSS} %p [%t] %c{1}:
%m%n%ex" />
+
filePattern="${env:CELEBORN_LOG_DIR}/celeborn.log.%d-%i">
+ <PatternLayout pattern="%d{yy/MM/dd HH:mm:ss,SSS} %p [%t] %c{1}:
%m%n%ex"/>
<Policies>
- <SizeBasedTriggeringPolicy size="200 MB" />
+ <SizeBasedTriggeringPolicy size="200 MB"/>
</Policies>
<DefaultRolloverStrategy max="7">
<Delete basePath="${env:CELEBORN_LOG_DIR}" maxDepth="1">
<IfFileName glob="celeborn.log*">
<IfAny>
- <IfAccumulatedFileSize exceeds="1 GB" />
- <IfAccumulatedFileCount exceeds="10" />
+ <IfAccumulatedFileSize exceeds="1 GB"/>
+ <IfAccumulatedFileCount exceeds="10"/>
</IfAny>
</IfFileName>
</Delete>
</DefaultRolloverStrategy>
</RollingRandomAccessFile>
- <RollingRandomAccessFile name="restAuditFile"
- fileName="${env:CELEBORN_LOG_DIR}/audit/rest-audit.log"
- filePattern="${env:CELEBORN_LOG_DIR}/audit/rest-audit.log.%d-%i">
- <PatternLayout pattern="%d{yy/MM/dd HH:mm:ss,SSS} %p [%t] %c{1}:
%m%n%ex" />
+ <RollingRandomAccessFile name="restAuditFile"
fileName="${env:CELEBORN_LOG_DIR}/audit/rest-audit.log"
+
filePattern="${env:CELEBORN_LOG_DIR}/audit/rest-audit.log.%d-%i">
+ <PatternLayout pattern="%d{yy/MM/dd HH:mm:ss,SSS} %p [%t] %c{1}:
%m%n%ex"/>
<Policies>
- <SizeBasedTriggeringPolicy size="200 MB" />
+ <SizeBasedTriggeringPolicy size="200 MB"/>
</Policies>
<DefaultRolloverStrategy max="7">
<Delete basePath="${env:CELEBORN_LOG_DIR}/audit" maxDepth="1">
<IfFileName glob="rest-audit.log*">
<IfAny>
- <IfAccumulatedFileSize exceeds="1 GB" />
- <IfAccumulatedFileCount exceeds="10" />
+ <IfAccumulatedFileSize exceeds="1 GB"/>
+ <IfAccumulatedFileCount exceeds="10"/>
+ </IfAny>
+ </IfFileName>
+ </Delete>
+ </DefaultRolloverStrategy>
+ </RollingRandomAccessFile>
+ <RollingRandomAccessFile name="shuffleAuditFile"
fileName="${env:CELEBORN_LOG_DIR}/audit/shuffle-audit.log"
+
filePattern="${env:CELEBORN_LOG_DIR}/audit/shuffle-audit.log.%d-%i">
+ <PatternLayout pattern="%d{yy/MM/dd HH:mm:ss,SSS} %p [%t] %c{1}:
%m%n%ex"/>
+ <Policies>
+ <SizeBasedTriggeringPolicy size="200 MB"/>
+ </Policies>
+ <DefaultRolloverStrategy max="7">
+ <Delete basePath="${env:CELEBORN_LOG_DIR}/audit" maxDepth="1">
+ <IfFileName glob="shuffle-audit.log*">
+ <IfAny>
+ <IfAccumulatedFileSize exceeds="1 GB"/>
+ <IfAccumulatedFileCount exceeds="10"/>
+ </IfAny>
+ </IfFileName>
+ </Delete>
+ </DefaultRolloverStrategy>
+ </RollingRandomAccessFile>
+ <RollingRandomAccessFile name="metricsAuditFile"
fileName="${env:CELEBORN_LOG_DIR}/audit/metrics-audit.log"
+
filePattern="${env:CELEBORN_LOG_DIR}/audit/metrics-audit.log.%d-%i">
+ <PatternLayout pattern="%d{yy/MM/dd HH:mm:ss,SSS} %p [%t] %c{1}:
%m%n%ex"/>
+ <Policies>
+ <SizeBasedTriggeringPolicy size="200 MB"/>
+ </Policies>
+ <DefaultRolloverStrategy max="7">
+ <Delete basePath="${env:CELEBORN_LOG_DIR}/audit" maxDepth="1">
+ <IfFileName glob="metrics-audit.log*">
+ <IfAny>
+ <IfAccumulatedFileSize exceeds="1 GB"/>
+ <IfAccumulatedFileCount exceeds="10"/>
</IfAny>
</IfFileName>
</Delete>
@@ -70,16 +104,26 @@
<Loggers>
<Root level="INFO">
- <AppenderRef ref="stdout" />
- <AppenderRef ref="file" />
+ <AppenderRef ref="stdout"/>
+ <AppenderRef ref="file"/>
</Root>
<Logger name="org.apache.hadoop.hdfs" level="WARN" additivity="false">
- <Appender-ref ref="stdout" level="WARN" />
- <Appender-ref ref="file" level="WARN" />
+ <Appender-ref ref="stdout" level="WARN"/>
+ <Appender-ref ref="file" level="WARN"/>
+ </Logger>
+ <Logger name="org.apache.ratis.server.RaftServerConfigKeys"
level="WARN" additivity="false">
+ <Appender-ref ref="stdout" level="WARN"/>
+ <Appender-ref ref="file" level="WARN"/>
+ </Logger>
+ <Logger name="org.apache.celeborn.server.common.http.RestAuditLogger"
level="INFO" additivity="false">
+ <Appender-ref ref="restAuditFile" level="INFO"/>
+ </Logger>
+ <Logger
name="org.apache.celeborn.service.deploy.master.audit.ShuffleAuditLogger"
level="INFO"
+ additivity="false">
+ <Appender-ref ref="shuffleAuditFile" level="INFO"/>
</Logger>
- <Logger name="org.apache.celeborn.server.common.http.RestAuditLogger"
level="INFO"
- additivity="false">
- <Appender-ref ref="restAuditFile" level="INFO" />
+ <Logger name="org.apache.celeborn.common.metrics.sink.LoggerSink"
level="INFO" additivity="false">
+ <Appender-ref ref="metricsAuditFile" level="INFO"/>
</Logger>
</Loggers>
</Configuration>
diff --git a/charts/celeborn/files/conf/metrics.properties
b/charts/celeborn/files/conf/metrics.properties
index 7c5630afd..e3b521369 100644
--- a/charts/celeborn/files/conf/metrics.properties
+++ b/charts/celeborn/files/conf/metrics.properties
@@ -16,3 +16,5 @@
#
*.sink.prometheusServlet.class=org.apache.celeborn.common.metrics.sink.PrometheusServlet
+*.sink.jsonServlet.class=org.apache.celeborn.common.metrics.sink.JsonServlet
+*.sink.loggerSink.class=org.apache.celeborn.common.metrics.sink.LoggerSink
