HDFS-14598. Findbugs warning caused by HDFS-12487.
Contributed by He Xiaoqiao. (cherry picked from commit041e7a7dee
) (cherry picked from commite7fce2104f
)
This commit is contained in:
parent
90b88db35d
commit
1bae5c7024
|
@ -906,24 +906,17 @@ public class DiskBalancer {
|
||||||
if(null == block){
|
if(null == block){
|
||||||
LOG.info("NextBlock call returned null.No valid block to copy. {}",
|
LOG.info("NextBlock call returned null.No valid block to copy. {}",
|
||||||
item.toJson());
|
item.toJson());
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
// A valid block is a finalized block, we iterate until we get
|
||||||
|
// finalized blocks
|
||||||
|
if (!this.dataset.isValidBlock(block)) {
|
||||||
|
continue;
|
||||||
|
}
|
||||||
|
// We don't look for the best, we just do first fit
|
||||||
|
if (isLessThanNeeded(block.getNumBytes(), item)) {
|
||||||
return block;
|
return block;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (block != null) {
|
|
||||||
// A valid block is a finalized block, we iterate until we get
|
|
||||||
// finalized blocks
|
|
||||||
if (!this.dataset.isValidBlock(block)) {
|
|
||||||
continue;
|
|
||||||
}
|
|
||||||
|
|
||||||
// We don't look for the best, we just do first fit
|
|
||||||
if (isLessThanNeeded(block.getNumBytes(), item)) {
|
|
||||||
return block;
|
|
||||||
}
|
|
||||||
} else {
|
|
||||||
LOG.info("There are no blocks in the blockPool {}", iter.getBlockPoolId());
|
|
||||||
}
|
|
||||||
|
|
||||||
} catch (IOException e) {
|
} catch (IOException e) {
|
||||||
item.incErrorCount();
|
item.incErrorCount();
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue