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

HDFS-7936. Erasure coding: resolving conflicts when merging with HDFS-7903, HDFS-7435, HDFS-7930, HDFS-7960 (this commit is for HDFS-7960)

This commit is contained in:
Zhe Zhang 2015-03-24 11:39:36 -07:00 committed by Zhe Zhang
parent d0d75a8339
commit ea2e60fbcc
3 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/blockmanagement/BlockManager.java
View File

@ -1996,10 +1996,10 @@ public class BlockManager {
"longer exists on the DataNode.", "longer exists on the DataNode.",
Long.toHexString(context.getReportId()), zombie.getStorageID()); Long.toHexString(context.getReportId()), zombie.getStorageID());
assert(namesystem.hasWriteLock()); assert(namesystem.hasWriteLock());
Iterator<BlockInfoContiguous> iter = zombie.getBlockIterator(); Iterator<BlockInfo> iter = zombie.getBlockIterator();
int prevBlocks = zombie.numBlocks(); int prevBlocks = zombie.numBlocks();
while (iter.hasNext()) { while (iter.hasNext()) {
BlockInfoContiguous block = iter.next(); BlockInfo block = iter.next();
// We assume that a block can be on only one storage in a DataNode. // We assume that a block can be on only one storage in a DataNode.
// That's why we pass in the DatanodeDescriptor rather than the // That's why we pass in the DatanodeDescriptor rather than the
// DatanodeStorageInfo. // DatanodeStorageInfo.

5
hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/blockmanagement/TestNameNodePrunesMissingStorages.java
View File

@ -185,9 +185,12 @@ public class TestNameNodePrunesMissingStorages {
String datanodeUuid; String datanodeUuid;
// Find the first storage which this block is in. // Find the first storage which this block is in.
try { try {
BlockInfo storedBlock =
cluster.getNamesystem().getBlockManager().
getStoredBlock(block.getLocalBlock());
Iterator<DatanodeStorageInfo> storageInfoIter = Iterator<DatanodeStorageInfo> storageInfoIter =
cluster.getNamesystem().getBlockManager(). cluster.getNamesystem().getBlockManager().
getStorages(block.getLocalBlock()).iterator(); blocksMap.getStorages(storedBlock).iterator();
assertTrue(storageInfoIter.hasNext()); assertTrue(storageInfoIter.hasNext());
DatanodeStorageInfo info = storageInfoIter.next(); DatanodeStorageInfo info = storageInfoIter.next();
storageIdToRemove = info.getStorageID(); storageIdToRemove = info.getStorageID();

2
hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/server/namenode/TestAddStripedBlocks.java
View File

@ -269,7 +269,7 @@ public class TestAddStripedBlocks {
StorageBlockReport[] reports = {new StorageBlockReport(storage, StorageBlockReport[] reports = {new StorageBlockReport(storage,
bll)}; bll)};
cluster.getNameNodeRpc().blockReport(dn.getDNRegistrationForBP(bpId), cluster.getNameNodeRpc().blockReport(dn.getDNRegistrationForBP(bpId),
bpId, reports); bpId, reports, null);
} }
BlockInfoStripedUnderConstruction ucBlock = BlockInfoStripedUnderConstruction ucBlock =