big-data/hadoop
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

HDFS-8428. Erasure Coding: Fix the NullPointerException when deleting file. Contributed by Yi Liu.

Browse Source
This commit is contained in:
Zhe Zhang 2015-05-19 17:25:27 -07:00
parent 91c81fdc24
commit 47ef869fa7
2 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
hadoop-hdfs-project/hadoop-hdfs/CHANGES-HDFS-EC-7285.txt
View File

@ -59,7 +59,7 @@
HDFS-8023. Erasure Coding: retrieve eraure coding schema for a file from HDFS-8023. Erasure Coding: retrieve eraure coding schema for a file from
NameNode (vinayakumarb) NameNode (vinayakumarb)
HDFS-8074. Define a system-wide default EC schema. (Kai Zheng) HDFS-8074. Define a system-wide default EC schema. (Kai Zheng)
HDFS-8077. Erasure coding: fix bugs in EC zone and symlinks. HDFS-8077. Erasure coding: fix bugs in EC zone and symlinks.
@ -110,7 +110,7 @@
HDFS-8216. TestDFSStripedOutputStream should use BlockReaderTestUtil to HDFS-8216. TestDFSStripedOutputStream should use BlockReaderTestUtil to
create BlockReader. (szetszwo via Zhe Zhang) create BlockReader. (szetszwo via Zhe Zhang)
HDFS-8212. DistributedFileSystem.createErasureCodingZone should pass schema HDFS-8212. DistributedFileSystem.createErasureCodingZone should pass schema
in FileSystemLinkResolver. (szetszwo via Zhe Zhang) in FileSystemLinkResolver. (szetszwo via Zhe Zhang)
@ -172,7 +172,7 @@
HDFS-8324. Add trace info to DFSClient#getErasureCodingZoneInfo(..) (vinayakumarb via HDFS-8324. Add trace info to DFSClient#getErasureCodingZoneInfo(..) (vinayakumarb via
umamahesh) umamahesh)
HDFS-7672. Handle write failure for stripping blocks and refactor the HDFS-7672. Handle write failure for stripping blocks and refactor the
existing code in DFSStripedOutputStream and StripedDataStreamer. (szetszwo) existing code in DFSStripedOutputStream and StripedDataStreamer. (szetszwo)
@ -235,3 +235,6 @@
(Rakesh R via waltersu4549) (Rakesh R via waltersu4549)
HDFS-8375. Add cellSize as an XAttr to ECZone. ( Vinayakumar B via zhz). 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).

2
hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/blockmanagement/BlockManager.java
View File

@ -3396,7 +3396,7 @@ public void processIncrementalBlockReport(final DatanodeID nodeID,
for (ReceivedDeletedBlockInfo rdbi : srdb.getBlocks()) { for (ReceivedDeletedBlockInfo rdbi : srdb.getBlocks()) {
switch (rdbi.getStatus()) { switch (rdbi.getStatus()) {
case DELETED_BLOCK: case DELETED_BLOCK:
removeStoredBlock(storageInfo, getStoredBlock(rdbi.getBlock()), node); removeStoredBlock(storageInfo, rdbi.getBlock(), node);
deleted++; deleted++;
break; break;
case RECEIVED_BLOCK: case RECEIVED_BLOCK: