Repository: hadoop Updated Branches: refs/heads/branch-2 2a01c01af -> 8c643e3bf
YARN-3747. TestLocalDirsHandlerService should delete the created test directory logDir2. Contributed by David Moore. (cherry picked from commit 126321eded7dc38c1eef2cfde9365404c924a5cb) Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/8c643e3b Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/8c643e3b Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/8c643e3b Branch: refs/heads/branch-2 Commit: 8c643e3bf9e0a70229aee79fb5244a19b32fef00 Parents: 2a01c01 Author: Devaraj K <deva...@apache.org> Authored: Mon Jun 8 15:32:13 2015 +0530 Committer: Devaraj K <deva...@apache.org> Committed: Mon Jun 8 15:33:38 2015 +0530 ---------------------------------------------------------------------- hadoop-yarn-project/CHANGES.txt | 3 +++ .../yarn/server/nodemanager/TestLocalDirsHandlerService.java | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hadoop/blob/8c643e3b/hadoop-yarn-project/CHANGES.txt ---------------------------------------------------------------------- diff --git a/hadoop-yarn-project/CHANGES.txt b/hadoop-yarn-project/CHANGES.txt index e0272b5..05cab3d 100644 --- a/hadoop-yarn-project/CHANGES.txt +++ b/hadoop-yarn-project/CHANGES.txt @@ -456,6 +456,9 @@ Release 2.8.0 - UNRELEASED YARN-3780. Should use equals when compare Resource in RMNodeImpl#ReconnectNodeTransition. (zhihai xu via devaraj) + YARN-3747. TestLocalDirsHandlerService should delete the created test directory logDir2. + (David Moore via devaraj) + Release 2.7.1 - UNRELEASED INCOMPATIBLE CHANGES http://git-wip-us.apache.org/repos/asf/hadoop/blob/8c643e3b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/test/java/org/apache/hadoop/yarn/server/nodemanager/TestLocalDirsHandlerService.java ---------------------------------------------------------------------- diff --git a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/test/java/org/apache/hadoop/yarn/server/nodemanager/TestLocalDirsHandlerService.java b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/test/java/org/apache/hadoop/yarn/server/nodemanager/TestLocalDirsHandlerService.java index a045e62..c61d1f0 100644 --- a/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/test/java/org/apache/hadoop/yarn/server/nodemanager/TestLocalDirsHandlerService.java +++ b/hadoop-yarn-project/hadoop-yarn/hadoop-yarn-server/hadoop-yarn-server-nodemanager/src/test/java/org/apache/hadoop/yarn/server/nodemanager/TestLocalDirsHandlerService.java @@ -144,7 +144,7 @@ public class TestLocalDirsHandlerService { FileUtils.deleteDirectory(new File(localDir1)); FileUtils.deleteDirectory(new File(localDir2)); FileUtils.deleteDirectory(new File(logDir1)); - FileUtils.deleteDirectory(new File(logDir1)); + FileUtils.deleteDirectory(new File(logDir2)); dirSvc.close(); } }
