You are viewing a plain text version of this content. The canonical link for it is here.
Posted to common-commits@hadoop.apache.org by ta...@apache.org on 2022/10/21 08:33:32 UTC
[hadoop] branch branch-3.3 updated: HDFS-16480. Fix typo: indicies -> indices (#4020)
This is an automated email from the ASF dual-hosted git repository.
tasanuma pushed a commit to branch branch-3.3
in repository https://gitbox.apache.org/repos/asf/hadoop.git
The following commit(s) were added to refs/heads/branch-3.3 by this push:
new 237814a9b36 HDFS-16480. Fix typo: indicies -> indices (#4020)
237814a9b36 is described below
commit 237814a9b36b93aba58122ce0cb42a210651a345
Author: SevenAddSix <qi...@foxmail.com>
AuthorDate: Mon Feb 28 21:12:18 2022 +0800
HDFS-16480. Fix typo: indicies -> indices (#4020)
(cherry picked from commit 5eab9719cbf6b9bddbdb4454a5f8e1ae12495492)
---
.../server/blockmanagement/ErasureCodingWork.java | 30 +++++++++++-----------
.../org/apache/hadoop/hdfs/MiniDFSCluster.java | 2 +-
2 files changed, 16 insertions(+), 16 deletions(-)
diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/blockmanagement/ErasureCodingWork.java b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/blockmanagement/ErasureCodingWork.java
index 8de3f381ddf..6158677654b 100644
--- a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/blockmanagement/ErasureCodingWork.java
+++ b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/blockmanagement/ErasureCodingWork.java
@@ -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);
}
}
diff --git a/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/MiniDFSCluster.java b/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/MiniDFSCluster.java
index 5a339022e78..d9550cdf70c 100644
--- a/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/MiniDFSCluster.java
+++ b/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/MiniDFSCluster.java
@@ -1077,7 +1077,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,
---------------------------------------------------------------------
To unsubscribe, e-mail: common-commits-unsubscribe@hadoop.apache.org
For additional commands, e-mail: common-commits-help@hadoop.apache.org