HDFS-16480. Fix typo: indicies -> indices (#4020)
This commit is contained in:
parent
b2f541a749
commit
5eab9719cb
|
@ -30,8 +30,8 @@ import java.util.Map;
|
||||||
import java.util.Set;
|
import java.util.Set;
|
||||||
|
|
||||||
class ErasureCodingWork extends BlockReconstructionWork {
|
class ErasureCodingWork extends BlockReconstructionWork {
|
||||||
private final byte[] liveBlockIndicies;
|
private final byte[] liveBlockIndices;
|
||||||
private final byte[] liveBusyBlockIndicies;
|
private final byte[] liveBusyBlockIndices;
|
||||||
private final String blockPoolId;
|
private final String blockPoolId;
|
||||||
|
|
||||||
public ErasureCodingWork(String blockPoolId, BlockInfo block,
|
public ErasureCodingWork(String blockPoolId, BlockInfo block,
|
||||||
|
@ -40,18 +40,18 @@ class ErasureCodingWork extends BlockReconstructionWork {
|
||||||
List<DatanodeDescriptor> containingNodes,
|
List<DatanodeDescriptor> containingNodes,
|
||||||
List<DatanodeStorageInfo> liveReplicaStorages,
|
List<DatanodeStorageInfo> liveReplicaStorages,
|
||||||
int additionalReplRequired, int priority,
|
int additionalReplRequired, int priority,
|
||||||
byte[] liveBlockIndicies, byte[] liveBusyBlockIndicies) {
|
byte[] liveBlockIndices, byte[] liveBusyBlockIndices) {
|
||||||
super(block, bc, srcNodes, containingNodes,
|
super(block, bc, srcNodes, containingNodes,
|
||||||
liveReplicaStorages, additionalReplRequired, priority);
|
liveReplicaStorages, additionalReplRequired, priority);
|
||||||
this.blockPoolId = blockPoolId;
|
this.blockPoolId = blockPoolId;
|
||||||
this.liveBlockIndicies = liveBlockIndicies;
|
this.liveBlockIndices = liveBlockIndices;
|
||||||
this.liveBusyBlockIndicies = liveBusyBlockIndicies;
|
this.liveBusyBlockIndices = liveBusyBlockIndices;
|
||||||
LOG.debug("Creating an ErasureCodingWork to {} reconstruct ",
|
LOG.debug("Creating an ErasureCodingWork to {} reconstruct ",
|
||||||
block);
|
block);
|
||||||
}
|
}
|
||||||
|
|
||||||
byte[] getLiveBlockIndicies() {
|
byte[] getLiveBlockIndices() {
|
||||||
return liveBlockIndicies;
|
return liveBlockIndices;
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
|
@ -72,15 +72,15 @@ class ErasureCodingWork extends BlockReconstructionWork {
|
||||||
*/
|
*/
|
||||||
private boolean hasAllInternalBlocks() {
|
private boolean hasAllInternalBlocks() {
|
||||||
final BlockInfoStriped block = (BlockInfoStriped) getBlock();
|
final BlockInfoStriped block = (BlockInfoStriped) getBlock();
|
||||||
if (liveBlockIndicies.length
|
if (liveBlockIndices.length
|
||||||
+ liveBusyBlockIndicies.length < block.getRealTotalBlockNum()) {
|
+ liveBusyBlockIndices.length < block.getRealTotalBlockNum()) {
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
BitSet bitSet = new BitSet(block.getTotalBlockNum());
|
BitSet bitSet = new BitSet(block.getTotalBlockNum());
|
||||||
for (byte index : liveBlockIndicies) {
|
for (byte index : liveBlockIndices) {
|
||||||
bitSet.set(index);
|
bitSet.set(index);
|
||||||
}
|
}
|
||||||
for (byte busyIndex: liveBusyBlockIndicies) {
|
for (byte busyIndex: liveBusyBlockIndices) {
|
||||||
bitSet.set(busyIndex);
|
bitSet.set(busyIndex);
|
||||||
}
|
}
|
||||||
for (int i = 0; i < block.getRealDataBlockNum(); i++) {
|
for (int i = 0; i < block.getRealDataBlockNum(); i++) {
|
||||||
|
@ -147,14 +147,14 @@ class ErasureCodingWork extends BlockReconstructionWork {
|
||||||
} else {
|
} else {
|
||||||
targets[0].getDatanodeDescriptor().addBlockToBeErasureCoded(
|
targets[0].getDatanodeDescriptor().addBlockToBeErasureCoded(
|
||||||
new ExtendedBlock(blockPoolId, stripedBlk), getSrcNodes(), targets,
|
new ExtendedBlock(blockPoolId, stripedBlk), getSrcNodes(), targets,
|
||||||
getLiveBlockIndicies(), stripedBlk.getErasureCodingPolicy());
|
getLiveBlockIndices(), stripedBlk.getErasureCodingPolicy());
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
private void createReplicationWork(int sourceIndex,
|
private void createReplicationWork(int sourceIndex,
|
||||||
DatanodeStorageInfo target) {
|
DatanodeStorageInfo target) {
|
||||||
BlockInfoStriped stripedBlk = (BlockInfoStriped) getBlock();
|
BlockInfoStriped stripedBlk = (BlockInfoStriped) getBlock();
|
||||||
final byte blockIndex = liveBlockIndicies[sourceIndex];
|
final byte blockIndex = liveBlockIndices[sourceIndex];
|
||||||
final DatanodeDescriptor source = getSrcNodes()[sourceIndex];
|
final DatanodeDescriptor source = getSrcNodes()[sourceIndex];
|
||||||
final long internBlkLen = StripedBlockUtil.getInternalBlockLength(
|
final long internBlkLen = StripedBlockUtil.getInternalBlockLength(
|
||||||
stripedBlk.getNumBytes(), stripedBlk.getCellSize(),
|
stripedBlk.getNumBytes(), stripedBlk.getCellSize(),
|
||||||
|
@ -173,7 +173,7 @@ class ErasureCodingWork extends BlockReconstructionWork {
|
||||||
BitSet bitSet = new BitSet(block.getRealTotalBlockNum());
|
BitSet bitSet = new BitSet(block.getRealTotalBlockNum());
|
||||||
for (int i = 0; i < getSrcNodes().length; i++) {
|
for (int i = 0; i < getSrcNodes().length; i++) {
|
||||||
if (getSrcNodes()[i].isInService()) {
|
if (getSrcNodes()[i].isInService()) {
|
||||||
bitSet.set(liveBlockIndicies[i]);
|
bitSet.set(liveBlockIndices[i]);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
// If the block is on the node which is decommissioning or
|
// If the block is on the node which is decommissioning or
|
||||||
|
@ -184,7 +184,7 @@ class ErasureCodingWork extends BlockReconstructionWork {
|
||||||
if ((getSrcNodes()[i].isDecommissionInProgress() ||
|
if ((getSrcNodes()[i].isDecommissionInProgress() ||
|
||||||
(getSrcNodes()[i].isEnteringMaintenance() &&
|
(getSrcNodes()[i].isEnteringMaintenance() &&
|
||||||
getSrcNodes()[i].isAlive())) &&
|
getSrcNodes()[i].isAlive())) &&
|
||||||
!bitSet.get(liveBlockIndicies[i])) {
|
!bitSet.get(liveBlockIndices[i])) {
|
||||||
srcIndices.add(i);
|
srcIndices.add(i);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -1068,7 +1068,7 @@ public class MiniDFSCluster implements AutoCloseable {
|
||||||
* Do the rest of the NN configuration for things like shared edits,
|
* Do the rest of the NN configuration for things like shared edits,
|
||||||
* as well as directory formatting, etc. for a single nameservice
|
* as well as directory formatting, etc. for a single nameservice
|
||||||
* @param nnCounter the count of the number of namenodes already configured/started. Also,
|
* @param nnCounter the count of the number of namenodes already configured/started. Also,
|
||||||
* acts as the <i>index</i> to the next NN to start (since indicies start at 0).
|
* acts as the <i>index</i> to the next NN to start (since indices start at 0).
|
||||||
* @throws IOException
|
* @throws IOException
|
||||||
*/
|
*/
|
||||||
private void configureNameService(MiniDFSNNTopology.NSConf nameservice, int nsCounter,
|
private void configureNameService(MiniDFSNNTopology.NSConf nameservice, int nsCounter,
|
||||||
|
|
Loading…
Reference in New Issue