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 AC1AB18FC2 for ; Wed, 19 Aug 2015 22:01:27 +0000 (UTC) Received: (qmail 35070 invoked by uid 500); 19 Aug 2015 22:01:25 -0000 Delivered-To: apmail-hadoop-common-commits-archive@hadoop.apache.org Received: (qmail 34814 invoked by uid 500); 19 Aug 2015 22:01:25 -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 34431 invoked by uid 99); 19 Aug 2015 22:01:25 -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; Wed, 19 Aug 2015 22:01:25 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id D30C7E7D9E; Wed, 19 Aug 2015 22:01:24 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: wangda@apache.org To: common-commits@hadoop.apache.org Date: Wed, 19 Aug 2015 22:01:29 -0000 Message-Id: In-Reply-To: <64edd0eff51f4adebf52bb0cf8c1a297@git.apache.org> References: <64edd0eff51f4adebf52bb0cf8c1a297@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [06/30] hadoop git commit: HDFS-8845. DiskChecker should not traverse the entire tree (Chang Li via Colin P. McCabe) HDFS-8845. DiskChecker should not traverse the entire tree (Chang Li via Colin P. McCabe) Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/ec183faa Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/ec183faa Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/ec183faa Branch: refs/heads/YARN-1197 Commit: ec183faadcf7edaf432aca3b25d24215d505c2ec Parents: c77bd6a Author: Colin Patrick Mccabe Authored: Mon Aug 17 15:24:56 2015 -0700 Committer: Colin Patrick Mccabe Committed: Mon Aug 17 15:25:29 2015 -0700 ---------------------------------------------------------------------- hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt | 3 +++ .../hdfs/server/datanode/fsdataset/impl/BlockPoolSlice.java | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hadoop/blob/ec183faa/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 1452e4c..ef8e494 100644 --- a/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt +++ b/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt @@ -810,6 +810,9 @@ Release 2.8.0 - UNRELEASED HDFS-8792. BlockManager#postponedMisreplicatedBlocks should use a LightWeightHashSet to save memory (Yi Liu via Colin P. McCabe) + HDFS-8845. DiskChecker should not traverse the entire tree (Chang Li via + Colin P. McCabe) + BUG FIXES HDFS-7501. TransactionsSinceLastCheckpoint can be negative on SBNs. http://git-wip-us.apache.org/repos/asf/hadoop/blob/ec183faa/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/datanode/fsdataset/impl/BlockPoolSlice.java ---------------------------------------------------------------------- diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/datanode/fsdataset/impl/BlockPoolSlice.java b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/datanode/fsdataset/impl/BlockPoolSlice.java index d1f7c5f..a586a7c 100644 --- a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/datanode/fsdataset/impl/BlockPoolSlice.java +++ b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/datanode/fsdataset/impl/BlockPoolSlice.java @@ -303,7 +303,7 @@ class BlockPoolSlice { } void checkDirs() throws DiskErrorException { - DiskChecker.checkDirs(finalizedDir); + DiskChecker.checkDir(finalizedDir); DiskChecker.checkDir(tmpDir); DiskChecker.checkDir(rbwDir); }