Repository: hadoop Updated Branches: refs/heads/YARN-2928 827633ee9 -> e19566a66
YARN-3505 addendum: fix an issue in previous patch. Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/aacec998 Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/aacec998 Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/aacec998 Branch: refs/heads/YARN-2928 Commit: aacec9983b369ca1d1225f0b69b2b455deec677b Parents: 1157c75 Author: Junping Du <[email protected]> Authored: Fri May 15 06:39:39 2015 -0700 Committer: Zhijie Shen <[email protected]> Committed: Fri May 22 11:46:59 2015 -0700 ---------------------------------------------------------------------- .../containermanager/logaggregation/AppLogAggregatorImpl.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hadoop/blob/aacec998/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 dd2ab25..81be813 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 @@ -359,7 +359,7 @@ public class AppLogAggregatorImpl implements AppLogAggregator { finalReport.setApplicationId(appId); finalReport.setLogAggregationStatus(renameTemporaryLogFileFailed ? LogAggregationStatus.FAILED : LogAggregationStatus.SUCCEEDED); - this.context.getLogAggregationStatusForApps().add(report); + this.context.getLogAggregationStatusForApps().add(finalReport); } } finally { if (writer != null) {
