Return-Path: X-Original-To: apmail-hadoop-common-commits-archive@www.apache.org Delivered-To: apmail-hadoop-common-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 571B517F76 for ; Mon, 8 Jun 2015 10:06:18 +0000 (UTC) Received: (qmail 97226 invoked by uid 500); 8 Jun 2015 10:06:17 -0000 Delivered-To: apmail-hadoop-common-commits-archive@hadoop.apache.org Received: (qmail 97152 invoked by uid 500); 8 Jun 2015 10:06:17 -0000 Mailing-List: contact common-commits-help@hadoop.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: common-dev@hadoop.apache.org Delivered-To: mailing list common-commits@hadoop.apache.org Received: (qmail 97143 invoked by uid 99); 8 Jun 2015 10:06:17 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 08 Jun 2015 10:06:17 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 8495DDFF60; Mon, 8 Jun 2015 10:06:17 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: devaraj@apache.org To: common-commits@hadoop.apache.org Message-Id: <994ab98357c447edaaf9467333dd5b58@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: hadoop git commit: YARN-3747. TestLocalDirsHandlerService should delete the created test directory logDir2. Contributed by David Moore. Date: Mon, 8 Jun 2015 10:06:17 +0000 (UTC) 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 Authored: Mon Jun 8 15:32:13 2015 +0530 Committer: Devaraj K 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(); } }