You are viewing a plain text version of this content. The canonical link for it is here.
Posted to common-commits@hadoop.apache.org by jl...@apache.org on 2016/04/05 15:52:43 UTC
hadoop git commit: YARN-4773. Log aggregation performs extraneous
filesystem operations when rolling log aggregation is disabled. Contributed
by Jun Gong
Repository: hadoop
Updated Branches:
refs/heads/branch-2.7 fc0ffc48d -> 49428ab6b
YARN-4773. Log aggregation performs extraneous filesystem operations when rolling log aggregation is disabled. Contributed by Jun Gong
Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/49428ab6
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/49428ab6
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/49428ab6
Branch: refs/heads/branch-2.7
Commit: 49428ab6bb25c54755b841c720f3d8ab53313544
Parents: fc0ffc4
Author: Jason Lowe <jl...@apache.org>
Authored: Tue Apr 5 13:51:46 2016 +0000
Committer: Jason Lowe <jl...@apache.org>
Committed: Tue Apr 5 13:51:46 2016 +0000
----------------------------------------------------------------------
hadoop-yarn-project/CHANGES.txt | 3 +++
.../containermanager/logaggregation/AppLogAggregatorImpl.java | 2 +-
2 files changed, 4 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hadoop/blob/49428ab6/hadoop-yarn-project/CHANGES.txt
----------------------------------------------------------------------
diff --git a/hadoop-yarn-project/CHANGES.txt b/hadoop-yarn-project/CHANGES.txt
index d26d1d3..28677af 100644
--- a/hadoop-yarn-project/CHANGES.txt
+++ b/hadoop-yarn-project/CHANGES.txt
@@ -115,6 +115,9 @@ Release 2.7.3 - UNRELEASED
YARN-4183. Clarify the behavior of timeline service config properties
(Naganarasimha G R via sjlee)
+ YARN-4773. Log aggregation performs extraneous filesystem operations when
+ rolling log aggregation is disabled (Jun Gong via jlowe)
+
Release 2.7.2 - 2016-01-25
INCOMPATIBLE CHANGES
http://git-wip-us.apache.org/repos/asf/hadoop/blob/49428ab6/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
----------------------------------------------------------------------
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 0de4288..6cf9a78 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
@@ -284,7 +284,7 @@ public class AppLogAggregatorImpl implements AppLogAggregator {
// Before upload logs, make sure the number of existing logs
// is smaller than the configured NM log aggregation retention size.
- if (uploadedLogsInThisCycle) {
+ if (uploadedLogsInThisCycle && logAggregationInRolling) {
cleanOldLogs();
}