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

HDFS-16480. Fix typo: indicies -> indices (#4020)

This commit is contained in:
SevenAddSix 2022-02-28 21:12:18 +08:00 committed by GitHub
parent b2f541a749
commit 5eab9719cb
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 16 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/blockmanagement/ErasureCodingWork.java
View File

@ -30,8 +30,8 @@ import java.util.Map;
import java.util.Set;
class ErasureCodingWork extends BlockReconstructionWork {
private final byte[] liveBlockIndicies;
private final byte[] liveBusyBlockIndicies;
private final byte[] liveBlockIndices;
private final byte[] liveBusyBlockIndices;
private final String blockPoolId;
public ErasureCodingWork(String blockPoolId, BlockInfo block,
@ -40,18 +40,18 @@ class ErasureCodingWork extends BlockReconstructionWork {
List<DatanodeDescriptor> containingNodes,
List<DatanodeStorageInfo> liveReplicaStorages,
int additionalReplRequired, int priority,
byte[] liveBlockIndicies, byte[] liveBusyBlockIndicies) {
byte[] liveBlockIndices, byte[] liveBusyBlockIndices) {
super(block, bc, srcNodes, containingNodes,
liveReplicaStorages, additionalReplRequired, priority);
this.blockPoolId = blockPoolId;
this.liveBlockIndicies = liveBlockIndicies;
this.liveBusyBlockIndicies = liveBusyBlockIndicies;
this.liveBlockIndices = liveBlockIndices;
this.liveBusyBlockIndices = liveBusyBlockIndices;
LOG.debug("Creating an ErasureCodingWork to {} reconstruct ",
block);
}
byte[] getLiveBlockIndicies() {
return liveBlockIndicies;
byte[] getLiveBlockIndices() {
return liveBlockIndices;
}
@Override
@ -72,15 +72,15 @@ class ErasureCodingWork extends BlockReconstructionWork {
*/
private boolean hasAllInternalBlocks() {
final BlockInfoStriped block = (BlockInfoStriped) getBlock();
if (liveBlockIndicies.length
+ liveBusyBlockIndicies.length < block.getRealTotalBlockNum()) {
if (liveBlockIndices.length
+ liveBusyBlockIndices.length < block.getRealTotalBlockNum()) {
return false;
}
BitSet bitSet = new BitSet(block.getTotalBlockNum());
for (byte index : liveBlockIndicies) {
for (byte index : liveBlockIndices) {
bitSet.set(index);
}
for (byte busyIndex: liveBusyBlockIndicies) {
for (byte busyIndex: liveBusyBlockIndices) {
bitSet.set(busyIndex);
}
for (int i = 0; i < block.getRealDataBlockNum(); i++) {
@ -147,14 +147,14 @@ class ErasureCodingWork extends BlockReconstructionWork {
} else {
targets[0].getDatanodeDescriptor().addBlockToBeErasureCoded(
new ExtendedBlock(blockPoolId, stripedBlk), getSrcNodes(), targets,
getLiveBlockIndicies(), stripedBlk.getErasureCodingPolicy());
getLiveBlockIndices(), stripedBlk.getErasureCodingPolicy());
}
}
private void createReplicationWork(int sourceIndex,
DatanodeStorageInfo target) {
BlockInfoStriped stripedBlk = (BlockInfoStriped) getBlock();
final byte blockIndex = liveBlockIndicies[sourceIndex];
final byte blockIndex = liveBlockIndices[sourceIndex];
final DatanodeDescriptor source = getSrcNodes()[sourceIndex];
final long internBlkLen = StripedBlockUtil.getInternalBlockLength(
stripedBlk.getNumBytes(), stripedBlk.getCellSize(),
@ -173,7 +173,7 @@ class ErasureCodingWork extends BlockReconstructionWork {
BitSet bitSet = new BitSet(block.getRealTotalBlockNum());
for (int i = 0; i < getSrcNodes().length; i++) {
if (getSrcNodes()[i].isInService()) {
bitSet.set(liveBlockIndicies[i]);
bitSet.set(liveBlockIndices[i]);
}
}
// If the block is on the node which is decommissioning or
@ -184,7 +184,7 @@ class ErasureCodingWork extends BlockReconstructionWork {
if ((getSrcNodes()[i].isDecommissionInProgress() ||
(getSrcNodes()[i].isEnteringMaintenance() &&
getSrcNodes()[i].isAlive())) &&
!bitSet.get(liveBlockIndicies[i])) {
!bitSet.get(liveBlockIndices[i])) {
srcIndices.add(i);
}
}

2
hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/MiniDFSCluster.java
View File

@ -1068,7 +1068,7 @@ public class MiniDFSCluster implements AutoCloseable {
* Do the rest of the NN configuration for things like shared edits,
* as well as directory formatting, etc. for a single nameservice
* @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
*/
private void configureNameService(MiniDFSNNTopology.NSConf nameservice, int nsCounter,