Repository: hadoop Updated Branches: refs/heads/HDFS-7285 3c36df154 -> bf3c28a89
HDFS-8428. Erasure Coding: Fix the NullPointerException when deleting file. Contributed by Yi Liu. Project: http://git-wip-us.apache.org/repos/asf/hadoop/repo Commit: http://git-wip-us.apache.org/repos/asf/hadoop/commit/bf3c28a8 Tree: http://git-wip-us.apache.org/repos/asf/hadoop/tree/bf3c28a8 Diff: http://git-wip-us.apache.org/repos/asf/hadoop/diff/bf3c28a8 Branch: refs/heads/HDFS-7285 Commit: bf3c28a89c68b605579f95d1ea001bf4a44899b1 Parents: 3c36df1 Author: Zhe Zhang <zhezh...@cloudera.com> Authored: Tue May 19 17:25:27 2015 -0700 Committer: Zhe Zhang <zhezh...@cloudera.com> Committed: Tue May 19 17:25:27 2015 -0700 ---------------------------------------------------------------------- hadoop-hdfs-project/hadoop-hdfs/CHANGES-HDFS-EC-7285.txt | 9 ++++++--- .../hadoop/hdfs/server/blockmanagement/BlockManager.java | 2 +- 2 files changed, 7 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hadoop/blob/bf3c28a8/hadoop-hdfs-project/hadoop-hdfs/CHANGES-HDFS-EC-7285.txt ---------------------------------------------------------------------- diff --git a/hadoop-hdfs-project/hadoop-hdfs/CHANGES-HDFS-EC-7285.txt b/hadoop-hdfs-project/hadoop-hdfs/CHANGES-HDFS-EC-7285.txt index d6c9dba..48bc9d6 100755 --- a/hadoop-hdfs-project/hadoop-hdfs/CHANGES-HDFS-EC-7285.txt +++ b/hadoop-hdfs-project/hadoop-hdfs/CHANGES-HDFS-EC-7285.txt @@ -59,7 +59,7 @@ HDFS-8023. Erasure Coding: retrieve eraure coding schema for a file from NameNode (vinayakumarb) - + HDFS-8074. Define a system-wide default EC schema. (Kai Zheng) HDFS-8077. Erasure coding: fix bugs in EC zone and symlinks. @@ -110,7 +110,7 @@ HDFS-8216. TestDFSStripedOutputStream should use BlockReaderTestUtil to create BlockReader. (szetszwo via Zhe Zhang) - + HDFS-8212. DistributedFileSystem.createErasureCodingZone should pass schema in FileSystemLinkResolver. (szetszwo via Zhe Zhang) @@ -172,7 +172,7 @@ HDFS-8324. Add trace info to DFSClient#getErasureCodingZoneInfo(..) (vinayakumarb via umamahesh) - + HDFS-7672. Handle write failure for stripping blocks and refactor the existing code in DFSStripedOutputStream and StripedDataStreamer. (szetszwo) @@ -235,3 +235,6 @@ (Rakesh R via waltersu4549) HDFS-8375. Add cellSize as an XAttr to ECZone. ( Vinayakumar B via zhz). + + HDFS-8428. Erasure Coding: Fix the NullPointerException when deleting file. + (Yi Liu via zhz). http://git-wip-us.apache.org/repos/asf/hadoop/blob/bf3c28a8/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/blockmanagement/BlockManager.java ---------------------------------------------------------------------- diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/blockmanagement/BlockManager.java b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/blockmanagement/BlockManager.java index de3b50f..f67de65 100644 --- a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/blockmanagement/BlockManager.java +++ b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/blockmanagement/BlockManager.java @@ -3389,7 +3389,7 @@ public class BlockManager { for (ReceivedDeletedBlockInfo rdbi : srdb.getBlocks()) { switch (rdbi.getStatus()) { case DELETED_BLOCK: - removeStoredBlock(storageInfo, getStoredBlock(rdbi.getBlock()), node); + removeStoredBlock(storageInfo, rdbi.getBlock(), node); deleted++; break; case RECEIVED_BLOCK:
