This is an automated email from the ASF dual-hosted git repository.
xkrogen pushed a commit to branch branch-3.3
in repository https://gitbox.apache.org/repos/asf/hadoop.git
The following commit(s) were added to refs/heads/branch-3.3 by this push:
new bfc916e7b02 HADOOP-18567. LogThrottlingHelper: properly trigger
dependent recorders in cases of infrequent logging (#5215)
bfc916e7b02 is described below
commit bfc916e7b02660ea81935704da173c99e7b96c1f
Author: Chengbing Liu <lcbabc12...@163.com>
AuthorDate: Sat Dec 17 01:15:11 2022 +0800
HADOOP-18567. LogThrottlingHelper: properly trigger dependent recorders in
cases of infrequent logging (#5215)
Signed-off-by: Erik Krogen <xkro...@apache.org>
Co-authored-by: Chengbing Liu <liuchengb...@qiyi.com>
(cherry picked from commit ca3526da9283500643479e784a779fb7898b6627)
---
.../java/org/apache/hadoop/log/LogThrottlingHelper.java | 16 +++++++++++++---
.../org/apache/hadoop/log/TestLogThrottlingHelper.java | 12 ++++++++++++
2 files changed, 25 insertions(+), 3 deletions(-)
diff --git
a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/log/LogThrottlingHelper.java
b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/log/LogThrottlingHelper.java
index e33d5988f7b..1cb8ecfcf55 100644
---
a/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/log/LogThrottlingHelper.java
+++
b/hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/log/LogThrottlingHelper.java
@@ -262,9 +262,15 @@ public class LogThrottlingHelper {
if (primaryRecorderName.equals(recorderName) &&
currentTimeMs - minLogPeriodMs >= lastLogTimestampMs) {
lastLogTimestampMs = currentTimeMs;
- for (LoggingAction log : currentLogs.values()) {
- log.setShouldLog();
- }
+ currentLogs.replaceAll((key, log) -> {
+ LoggingAction newLog = log;
+ if (log.hasLogged()) {
+ // create a fresh log since the old one has already been logged
+ newLog = new LoggingAction(log.getValueCount());
+ }
+ newLog.setShouldLog();
+ return newLog;
+ });
}
if (currentLog.shouldLog()) {
currentLog.setHasLogged();
@@ -357,6 +363,10 @@ public class LogThrottlingHelper {
hasLogged = true;
}
+ private int getValueCount() {
+ return stats.length;
+ }
+
private void recordValues(double... values) {
if (values.length != stats.length) {
throw new IllegalArgumentException("received " + values.length +
diff --git
a/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/log/TestLogThrottlingHelper.java
b/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/log/TestLogThrottlingHelper.java
index d0eeea3e513..6c627116f8c 100644
---
a/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/log/TestLogThrottlingHelper.java
+++
b/hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/log/TestLogThrottlingHelper.java
@@ -142,6 +142,18 @@ public class TestLogThrottlingHelper {
assertTrue(helper.record("bar", 0).shouldLog());
}
+ @Test
+ public void testInfrequentPrimaryAndDependentLoggers() {
+ helper = new LogThrottlingHelper(LOG_PERIOD, "foo", timer);
+
+ assertTrue(helper.record("foo", 0).shouldLog());
+ assertTrue(helper.record("bar", 0).shouldLog());
+
+ // Both should log once the period has elapsed
+ assertTrue(helper.record("foo", LOG_PERIOD).shouldLog());
+ assertTrue(helper.record("bar", LOG_PERIOD).shouldLog());
+ }
+
@Test
public void testMultipleLoggersWithValues() {
helper = new LogThrottlingHelper(LOG_PERIOD, "foo", timer);
---------------------------------------------------------------------
To unsubscribe, e-mail: common-commits-unsubscr...@hadoop.apache.org
For additional commands, e-mail: common-commits-h...@hadoop.apache.org
