Apache/hadoop
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Browse Source 
(cherry picked from commit 1524e2e6c52aba966cbbf1d8025ba165688ab9bb)
(cherry picked from commit 845d7611babac68a2b0caa6e4b8963f0c8332540)
This commit is contained in:
Wei-Chiu Chuang 2019-06-21 18:17:36 -07:00
parent f33bcbb687
commit 4507c2f3a5
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

@ -903,6 +903,11 @@ private ExtendedBlock getBlockToCopy(FsVolumeSpi.BlockIterator iter,
while (!iter.atEnd() && item.getErrorCount() < getMaxError(item)) {
try {
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) {
// A valid block is a finalized block, we iterate until we get