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

HDFS-10525. Fix NPE in CacheReplicationMonitor#rescanCachedBlockMap (Xiao Chen via cmccabe)

Browse Source 
(cherry picked from commit 2ca73445f5c2929d9c2ff4232dca58a63a0570a0)
(cherry picked from commit 8280e3bcc21adbbbb21e091bd4ec786bf3beb72b)
This commit is contained in:
Colin Patrick Mccabe 2016-06-15 22:47:01 -07:00
parent ef08eb9031
commit ea2e7321d6
1 changed files with 8 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/blockmanagement/CacheReplicationMonitor.java
View File

@ -502,6 +502,14 @@ private void rescanCachedBlockMap() {
CachedBlock cblock = it.next(); CachedBlock cblock = it.next();
BlockInfo blockInfo = blockManager. BlockInfo blockInfo = blockManager.
getStoredBlock(new Block(cblock.getBlockId())); getStoredBlock(new Block(cblock.getBlockId()));
if (blockInfo == null) {
// Cannot find this block on the NameNode, skip this block from
// capacity calculation. Later logic will handle this block.
LOG.debug("Block {}: cannot be found in block manager and hence"
+ " skipped from calculation for node {}.", cblock.getBlockId(),
dn.getDatanodeUuid());
continue;
}
if (blockInfo.getNumBytes() > remaining) { if (blockInfo.getNumBytes() > remaining) {
LOG.debug("Block {}: removing from PENDING_CACHED for node {} " LOG.debug("Block {}: removing from PENDING_CACHED for node {} "
+ "because it cannot fit in remaining cache size {}.", + "because it cannot fit in remaining cache size {}.",