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 2BEF411A1F for ; Tue, 23 Sep 2014 01:03:28 +0000 (UTC) Received: (qmail 22341 invoked by uid 500); 23 Sep 2014 01:03:26 -0000 Delivered-To: apmail-hadoop-common-commits-archive@hadoop.apache.org Received: (qmail 22102 invoked by uid 500); 23 Sep 2014 01:03:26 -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 22067 invoked by uid 99); 23 Sep 2014 01:03:26 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 23 Sep 2014 01:03:26 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id 5E4338A67E0; Tue, 23 Sep 2014 01:03:26 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: arp@apache.org To: common-commits@hadoop.apache.org Date: Tue, 23 Sep 2014 01:03:27 -0000 Message-Id: <07907cf2f6ca4c0d89608901f62d486e@git.apache.org> In-Reply-To: References: X-Mailer: ASF-Git Admin Mailer Subject: [02/17] git commit: HDFS-7109. TestDataStorage does not release file locks between tests. Contributed by Chris Nauroth. HDFS-7109. TestDataStorage does not release file locks between tests. Contributed by Chris Nauroth. Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/0795fe37 Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/0795fe37 Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/0795fe37 Branch: refs/heads/HDFS-6581 Commit: 0795fe3721cf86ed89d5e9058c977a1113247d08 Parents: 47491f9 Author: cnauroth Authored: Sat Sep 20 21:01:13 2014 -0700 Committer: cnauroth Committed: Sat Sep 20 21:01:13 2014 -0700 ---------------------------------------------------------------------- hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt | 3 +++ .../org/apache/hadoop/hdfs/server/datanode/TestDataStorage.java | 1 + 2 files changed, 4 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hadoop/blob/0795fe37/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt ---------------------------------------------------------------------- diff --git a/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt b/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt index dfdc21f..5a69d9d 100644 --- a/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt +++ b/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt @@ -908,6 +908,9 @@ Release 2.6.0 - UNRELEASED HDFS-7107. Avoid Findbugs warning for synchronization on AbstractNNFailoverProxyProvider#fallbackToSimpleAuth. (cnauroth) + HDFS-7109. TestDataStorage does not release file locks between tests. + (cnauroth) + Release 2.5.1 - 2014-09-05 INCOMPATIBLE CHANGES http://git-wip-us.apache.org/repos/asf/hadoop/blob/0795fe37/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/datanode/TestDataStorage.java ---------------------------------------------------------------------- diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/datanode/TestDataStorage.java b/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/datanode/TestDataStorage.java index 1d700e3..ed32243 100644 --- a/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/datanode/TestDataStorage.java +++ b/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/datanode/TestDataStorage.java @@ -63,6 +63,7 @@ public class TestDataStorage { @After public void tearDown() throws IOException { + storage.unlockAll(); FileUtil.fullyDelete(TEST_DIR); }