Repository: hadoop Updated Branches: refs/heads/branch-2.6.1 8549891cb -> 46e9926ce
HDFS-8486. Addendum patch to fix backporting bug. (cherry picked from commit 6c9e26609ceac5d16434cc7f4a1013e6faacd92f) Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/46e9926c Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/46e9926c Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/46e9926c Branch: refs/heads/branch-2.6.1 Commit: 46e9926ce3587badad26f24ccf9a7d19b75c2fa7 Parents: 8549891 Author: Arpit Agarwal <a...@apache.org> Authored: Fri Aug 21 11:19:57 2015 -0700 Committer: Vinod Kumar Vavilapalli <vino...@apache.org> Committed: Sun Aug 30 12:02:23 2015 -0700 ---------------------------------------------------------------------- .../main/java/org/apache/hadoop/hdfs/server/datanode/DataNode.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hadoop/blob/46e9926c/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/datanode/DataNode.java ---------------------------------------------------------------------- diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/datanode/DataNode.java b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/datanode/DataNode.java index badb845..ccc04b6 100644 --- a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/datanode/DataNode.java +++ b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/datanode/DataNode.java @@ -1282,7 +1282,7 @@ public class DataNode extends ReconfigurableBase checkDiskError(); data.addBlockPool(nsInfo.getBlockPoolID(), conf); - initDirectoryScanner(conf); + initPeriodicScanners(conf); } BPOfferService[] getAllBpOs() {
