Repository: hadoop Updated Branches: refs/heads/branch-2 c980e34bc -> 93b29d962
YARN-3428. Debug log resources to be localized for a container. (kasha) (cherry picked from commit 2daa478a6420585dc13cea2111580ed5fe347bc1) Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/93b29d96 Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/93b29d96 Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/93b29d96 Branch: refs/heads/branch-2 Commit: 93b29d962d75ce8a491c11dfadf906400458b0d4 Parents: c980e34 Author: Karthik Kambatla <[email protected]> Authored: Tue Mar 31 17:34:40 2015 -0700 Committer: Karthik Kambatla <[email protected]> Committed: Tue Mar 31 17:35:11 2015 -0700 ---------------------------------------------------------------------- hadoop-yarn-project/CHANGES.txt | 2 ++ .../localizer/ResourceLocalizationService.java | 12 ++++++++++-- 2 files changed, 12 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hadoop/blob/93b29d96/hadoop-yarn-project/CHANGES.txt ---------------------------------------------------------------------- diff --git a/hadoop-yarn-project/CHANGES.txt b/hadoop-yarn-project/CHANGES.txt index 273a788..30c1826 100644 --- a/hadoop-yarn-project/CHANGES.txt +++ b/hadoop-yarn-project/CHANGES.txt @@ -41,6 +41,8 @@ Release 2.8.0 - UNRELEASED YARN-3258. FairScheduler: Need to add more logging to investigate allocations. (Anubhav Dhoot via ozawa) + YARN-3428. Debug log resources to be localized for a container. (kasha) + OPTIMIZATIONS YARN-3339. TestDockerContainerExecutor should pull a single image and not http://git-wip-us.apache.org/repos/asf/hadoop/blob/93b29d96/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/main/java/org/apache/hadoop/yarn/server/nodemanager/containermanager/localizer/ResourceLocalizationService.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/localizer/ResourceLocalizationService.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/main/java/org/apache/hadoop/yarn/server/nodemanager/containermanager/localizer/ResourceLocalizationService.java index dd50ead..4236392 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/main/java/org/apache/hadoop/yarn/server/nodemanager/containermanager/localizer/ResourceLocalizationService.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/main/java/org/apache/hadoop/yarn/server/nodemanager/containermanager/localizer/ResourceLocalizationService.java @@ -448,6 +448,10 @@ public class ResourceLocalizationService extends CompositeService .getApplicationId()); for (LocalResourceRequest req : e.getValue()) { tracker.handle(new ResourceRequestEvent(req, e.getKey(), ctxt)); + if (LOG.isDebugEnabled()) { + LOG.debug("Localizing " + req.getPath() + + " for container " + c.getContainerId()); + } } } } @@ -456,10 +460,14 @@ public class ResourceLocalizationService extends CompositeService ResourceRetentionSet retain = new ResourceRetentionSet(delService, cacheTargetSize); retain.addResources(publicRsrc); - LOG.debug("Resource cleanup (public) " + retain); + if (LOG.isDebugEnabled()) { + LOG.debug("Resource cleanup (public) " + retain); + } for (LocalResourcesTracker t : privateRsrc.values()) { retain.addResources(t); - LOG.debug("Resource cleanup " + t.getUser() + ":" + retain); + if (LOG.isDebugEnabled()) { + LOG.debug("Resource cleanup " + t.getUser() + ":" + retain); + } } //TODO Check if appRsrcs should also be added to the retention set. }
