Repository: hadoop Updated Branches: refs/heads/branch-2 14afa5d53 -> 15b1800b1
YARN-3832. Resource Localization fails on a cluster due to existing cache directories. Contributed by Brahma Reddy Battula (cherry picked from commit 8d58512d6e6d9fe93784a9de2af0056bcc316d96) Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/15b1800b Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/15b1800b Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/15b1800b Branch: refs/heads/branch-2 Commit: 15b1800b1289d239cbebc5cfd66cfe156d45a2d3 Parents: 14afa5d Author: Jason Lowe <[email protected]> Authored: Wed Jun 24 16:37:39 2015 +0000 Committer: Jason Lowe <[email protected]> Committed: Wed Jun 24 16:38:22 2015 +0000 ---------------------------------------------------------------------- hadoop-yarn-project/CHANGES.txt | 3 +++ .../containermanager/localizer/ResourceLocalizationService.java | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hadoop/blob/15b1800b/hadoop-yarn-project/CHANGES.txt ---------------------------------------------------------------------- diff --git a/hadoop-yarn-project/CHANGES.txt b/hadoop-yarn-project/CHANGES.txt index 52ee3d4..cba2764 100644 --- a/hadoop-yarn-project/CHANGES.txt +++ b/hadoop-yarn-project/CHANGES.txt @@ -658,6 +658,9 @@ Release 2.7.1 - UNRELEASED YARN-3809. Failed to launch new attempts because ApplicationMasterLauncher's threads all hang (Jun Gong via jlowe) + YARN-3832. Resource Localization fails on a cluster due to existing cache + directories (Brahma Reddy Battula via jlowe) + Release 2.7.0 - 2015-04-20 INCOMPATIBLE CHANGES http://git-wip-us.apache.org/repos/asf/hadoop/blob/15b1800b/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 d6e0903..b417c5e 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 @@ -1340,7 +1340,7 @@ public class ResourceLocalizationService extends CompositeService } private void cleanUpLocalDirs(FileContext lfs, DeletionService del) { - for (String localDir : dirsHandler.getLocalDirs()) { + for (String localDir : dirsHandler.getLocalDirsForCleanup()) { cleanUpLocalDir(lfs, del, localDir); } }
