You are viewing a plain text version of this content. The canonical link for it is here.
Posted to common-commits@hadoop.apache.org by ki...@apache.org on 2016/02/17 16:19:28 UTC
hadoop git commit: HDFS-8845. DiskChecker should not traverse the
entire tree (Chang Li via Colin P. McCabe)
Repository: hadoop
Updated Branches:
refs/heads/branch-2.7 a9c1bb424 -> a4492dc6a
HDFS-8845. DiskChecker should not traverse the entire tree (Chang Li via Colin P. McCabe)
(cherry picked from commit ec183faadcf7edaf432aca3b25d24215d505c2ec)
Conflicts:
hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo
Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/a4492dc6
Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/a4492dc6
Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/a4492dc6
Branch: refs/heads/branch-2.7
Commit: a4492dc6ac67d1234853fb3731c6d1a7bce0e409
Parents: a9c1bb4
Author: Kihwal Lee <ki...@apache.org>
Authored: Wed Feb 17 09:18:55 2016 -0600
Committer: Kihwal Lee <ki...@apache.org>
Committed: Wed Feb 17 09:18:55 2016 -0600
----------------------------------------------------------------------
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/a4492dc6/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 30d1d23..ff9a371 100644
--- a/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
+++ b/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt
@@ -32,6 +32,9 @@ Release 2.7.3 - UNRELEASED
OPTIMIZATIONS
+ HDFS-8845. DiskChecker should not traverse the entire tree (Chang Li via
+ Colin P. McCabe)
+
BUG FIXES
HDFS-9289. Make DataStreamer#block thread safe and verify genStamp in
http://git-wip-us.apache.org/repos/asf/hadoop/blob/a4492dc6/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 f372495..ce90298 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
@@ -301,7 +301,7 @@ class BlockPoolSlice {
}
void checkDirs() throws DiskErrorException {
- DiskChecker.checkDirs(finalizedDir);
+ DiskChecker.checkDir(finalizedDir);
DiskChecker.checkDir(tmpDir);
DiskChecker.checkDir(rbwDir);
}