HDFS-7444. convertToBlockUnderConstruction should preserve BlockCollection. Contributed by Haohui Mai.
This commit is contained in:
parent
058af60c56
commit
f5b1631179
@ -498,6 +498,9 @@ Release 2.7.0 - UNRELEASED
|
||||
HDFS-7097. Allow block reports to be processed during checkpointing on
|
||||
standby name node. (kihwal via wang)
|
||||
|
||||
HDFS-7444. convertToBlockUnderConstruction should preserve BlockCollection.
|
||||
(wheat9)
|
||||
|
||||
Release 2.6.1 - UNRELEASED
|
||||
|
||||
INCOMPATIBLE CHANGES
|
||||
|
@ -366,13 +366,16 @@ public boolean isComplete() {
|
||||
public BlockInfoUnderConstruction convertToBlockUnderConstruction(
|
||||
BlockUCState s, DatanodeStorageInfo[] targets) {
|
||||
if(isComplete()) {
|
||||
return new BlockInfoUnderConstruction(this,
|
||||
BlockInfoUnderConstruction ucBlock = new BlockInfoUnderConstruction(this,
|
||||
getBlockCollection().getBlockReplication(), s, targets);
|
||||
ucBlock.setBlockCollection(getBlockCollection());
|
||||
return ucBlock;
|
||||
}
|
||||
// the block is already under construction
|
||||
BlockInfoUnderConstruction ucBlock = (BlockInfoUnderConstruction)this;
|
||||
ucBlock.setBlockUCState(s);
|
||||
ucBlock.setExpectedLocations(targets);
|
||||
ucBlock.setBlockCollection(getBlockCollection());
|
||||
return ucBlock;
|
||||
}
|
||||
|
||||
|
@ -234,7 +234,6 @@ public BlockInfoUnderConstruction setLastBlock(BlockInfo lastBlock,
|
||||
BlockInfoUnderConstruction ucBlock =
|
||||
lastBlock.convertToBlockUnderConstruction(
|
||||
BlockUCState.UNDER_CONSTRUCTION, locations);
|
||||
ucBlock.setBlockCollection(this);
|
||||
setBlock(numBlocks() - 1, ucBlock);
|
||||
return ucBlock;
|
||||
}
|
||||
|
@ -1226,6 +1226,15 @@ public void testAddStoredBlockDoesNotCauseSkippedReplication()
|
||||
final BlockInfoUnderConstruction ucBlock =
|
||||
info.convertToBlockUnderConstruction(BlockUCState.UNDER_CONSTRUCTION,
|
||||
storageAry);
|
||||
DatanodeStorageInfo storage = mock(DatanodeStorageInfo.class);
|
||||
DatanodeDescriptor dn = mock(DatanodeDescriptor.class);
|
||||
when(dn.isDecommissioned()).thenReturn(true);
|
||||
when(storage.getState()).thenReturn(DatanodeStorage.State.NORMAL);
|
||||
when(storage.getDatanodeDescriptor()).thenReturn(dn);
|
||||
when(storage.removeBlock(any(BlockInfo.class))).thenReturn(true);
|
||||
when(storage.addBlock(any(BlockInfo.class))).thenReturn(true);
|
||||
ucBlock.addStorage(storage);
|
||||
|
||||
when(mbc.setLastBlock((BlockInfo) any(), (DatanodeStorageInfo[]) any()))
|
||||
.thenReturn(ucBlock);
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user