Repository: hadoop Updated Branches: refs/heads/branch-2 187e081d5 -> 9cbe9bcba
YARN-3237. AppLogAggregatorImpl fails to log error cause. Contributed by Rushabh S Shah (cherry picked from commit f56c65bb3eb9436b67de2df63098e26589e70e56) Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/9cbe9bcb Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/9cbe9bcb Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/9cbe9bcb Branch: refs/heads/branch-2 Commit: 9cbe9bcbaa33825a866bdc8a9bf92f270723d423 Parents: 187e081 Author: Xuan <[email protected]> Authored: Fri Feb 20 14:02:40 2015 -0800 Committer: Xuan <[email protected]> Committed: Fri Feb 20 14:03:46 2015 -0800 ---------------------------------------------------------------------- hadoop-yarn-project/CHANGES.txt | 3 +++ .../containermanager/logaggregation/AppLogAggregatorImpl.java | 4 ++-- 2 files changed, 5 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hadoop/blob/9cbe9bcb/hadoop-yarn-project/CHANGES.txt ---------------------------------------------------------------------- diff --git a/hadoop-yarn-project/CHANGES.txt b/hadoop-yarn-project/CHANGES.txt index 3903631..28530bb 100644 --- a/hadoop-yarn-project/CHANGES.txt +++ b/hadoop-yarn-project/CHANGES.txt @@ -276,6 +276,9 @@ Release 2.7.0 - UNRELEASED YARN-3230. Clarify application states on the web UI. (Jian He via wangda) + YARN-3237. AppLogAggregatorImpl fails to log error cause. + (Rushabh S Shah via xgong) + OPTIMIZATIONS YARN-2990. FairScheduler's delay-scheduling always waits for node-local and http://git-wip-us.apache.org/repos/asf/hadoop/blob/9cbe9bcb/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 8eb00f4..787422b 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 @@ -248,7 +248,7 @@ public class AppLogAggregatorImpl implements AppLogAggregator { } catch (IOException e1) { LOG.error("Cannot create writer for app " + this.applicationId - + ". Skip log upload this time. "); + + ". Skip log upload this time. ", e1); return; } @@ -549,7 +549,7 @@ public class AppLogAggregatorImpl implements AppLogAggregator { writer.append(logKey, logValue); } catch (Exception e) { LOG.error("Couldn't upload logs for " + containerId - + ". Skipping this container."); + + ". Skipping this container.", e); return new HashSet<Path>(); } this.uploadedFileMeta.addAll(logValue
