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

HDFS-12487. FsDatasetSpi.isValidBlock() lacks null pointer check inside and neither do the callers. Contributed by liumi.

Browse Source
This commit is contained in:
Wei-Chiu Chuang 2019-06-21 18:17:36 -07:00
parent 371452e260
commit 1524e2e6c5
1 changed files with 5 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/datanode/DiskBalancer.java
View File

@ -905,6 +905,11 @@ private ExtendedBlock getBlockToCopy(FsVolumeSpi.BlockIterator iter,
while (!iter.atEnd() && item.getErrorCount() < getMaxError(item)) { while (!iter.atEnd() && item.getErrorCount() < getMaxError(item)) {
try { try {
ExtendedBlock block = iter.nextBlock(); ExtendedBlock block = iter.nextBlock();
if(null == block){
LOG.info("NextBlock call returned null.No valid block to copy. {}",
item.toJson());
return block;
}
if (block != null) { if (block != null) {
// A valid block is a finalized block, we iterate until we get // A valid block is a finalized block, we iterate until we get