Repository: hadoop Updated Branches: refs/heads/branch-2 b9865cbf3 -> cc671349b
YARN-3505 addendum: fix an issue in previous patch. (cherry picked from commit 03a293aed6de101b0cae1a294f506903addcaa75) Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/cc671349 Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/cc671349 Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/cc671349 Branch: refs/heads/branch-2 Commit: cc671349bc1c56d597aedd244d939dc248353d8c Parents: b9865cb Author: Junping Du <[email protected]> Authored: Fri May 15 06:39:39 2015 -0700 Committer: Junping Du <[email protected]> Committed: Fri May 15 06:40:28 2015 -0700 ---------------------------------------------------------------------- .../containermanager/logaggregation/AppLogAggregatorImpl.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hadoop/blob/cc671349/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) {
