From a4492dc6ac67d1234853fb3731c6d1a7bce0e409 Mon Sep 17 00:00:00 2001 From: Kihwal Lee Date: Wed, 17 Feb 2016 09:18:55 -0600 Subject: [PATCH] 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 --- hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt | 3 +++ .../hdfs/server/datanode/fsdataset/impl/BlockPoolSlice.java | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt b/hadoop-hdfs-project/hadoop-hdfs/CHANGES.txt index 30d1d2326c9..ff9a3713e74 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 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 f372495c460..ce90298df85 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); }