HDFS-7936. Erasure coding: resolving conflicts in the branch when merging (this commit is for conflicts from HDFS-6945). Contributed by Zhe Zhang.
This commit is contained in:
parent
98ea3ec0da
commit
578019d6a2
|
@ -3722,7 +3722,7 @@ public class BlockManager {
|
|||
private void removeFromExcessReplicateMap(Block block) {
|
||||
for (DatanodeStorageInfo info : blocksMap.getStorages(block)) {
|
||||
String uuid = info.getDatanodeDescriptor().getDatanodeUuid();
|
||||
LightWeightLinkedSet<Block> excessReplicas = excessReplicateMap.get(uuid);
|
||||
LightWeightLinkedSet<BlockInfo> excessReplicas = excessReplicateMap.get(uuid);
|
||||
if (excessReplicas != null) {
|
||||
if (excessReplicas.remove(block)) {
|
||||
excessBlocksCount.decrementAndGet();
|
||||
|
|
Loading…
Reference in New Issue