From 852033ca62d3bd453dff715d85ca61c35d55c47c Mon Sep 17 00:00:00 2001 From: Akira Ajisaka Date: Fri, 8 Jan 2016 01:12:46 +0900 Subject: [PATCH] YARN-4544. All the log messages about rolling monitoring interval are shown with WARN level. Contributed by Takashi Ohnishi. (cherry picked from commit 52b77577c44538c26fb9d0144f0b280be3593a38) (cherry picked from commit 3905435d3d592b980425169bf1355d3d2b5c616f) --- hadoop-yarn-project/CHANGES.txt | 3 +++ .../logaggregation/AppLogAggregatorImpl.java | 6 +++--- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/hadoop-yarn-project/CHANGES.txt b/hadoop-yarn-project/CHANGES.txt index 22b96e545f8..55f27ae3558 100644 --- a/hadoop-yarn-project/CHANGES.txt +++ b/hadoop-yarn-project/CHANGES.txt @@ -565,6 +565,9 @@ Release 2.8.0 - UNRELEASED YARN-4098. Document ApplicationPriority feature. (Rohith Sharma K S via jianhe) + YARN-4544. All the log messages about rolling monitoring interval are + shown with WARN level. (Takashi Ohnishi via aajisaka) + OPTIMIZATIONS YARN-3339. TestDockerContainerExecutor should pull a single image and not diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/main/java/org/apache/hadoop/yarn/server/nodemanager/containermanager/logaggregation/AppLogAggregatorImpl.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/main/java/org/apache/hadoop/yarn/server/nodemanager/containermanager/logaggregation/AppLogAggregatorImpl.java index a573549f286..82a1ad41ac8 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/main/java/org/apache/hadoop/yarn/server/nodemanager/containermanager/logaggregation/AppLogAggregatorImpl.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/main/java/org/apache/hadoop/yarn/server/nodemanager/containermanager/logaggregation/AppLogAggregatorImpl.java @@ -189,12 +189,12 @@ public class AppLogAggregatorImpl implements AppLogAggregator { } } else { if (configuredRollingMonitorInterval <= 0) { - LOG.warn("rollingMonitorInterval is set as " + LOG.info("rollingMonitorInterval is set as " + configuredRollingMonitorInterval + ". " - + "The log rolling mornitoring interval is disabled. " + + "The log rolling monitoring interval is disabled. " + "The logs will be aggregated after this application is finished."); } else { - LOG.warn("rollingMonitorInterval is set as " + LOG.info("rollingMonitorInterval is set as " + configuredRollingMonitorInterval + ". " + "The logs will be aggregated every " + configuredRollingMonitorInterval + " seconds");