This is an automated email from the ASF dual-hosted git repository.
inigoiri pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/hadoop.git
The following commit(s) were added to refs/heads/trunk by this push:
new 9659d0720dc HDFS-17065. Fix typos in hadoop-hdfs-project (#5796)
9659d0720dc is described below
commit 9659d0720dc1a6ec510ca7362bfc9f8bea7811e1
Author: Zhaohui Wang <32935220+wzhallri...@users.noreply.github.com>
AuthorDate: Mon Jul 3 23:41:37 2023 +0800
HDFS-17065. Fix typos in hadoop-hdfs-project (#5796)
---
.../org/apache/hadoop/hdfs/server/federation/metrics/RBFMetrics.java | 2 +-
.../main/java/org/apache/hadoop/hdfs/server/datanode/DataXceiver.java | 4 ++--
.../java/org/apache/hadoop/hdfs/server/namenode/FSDirWriteFileOp.java | 2 +-
.../org/apache/hadoop/hdfs/TestClientProtocolForPipelineRecovery.java | 2 +-
4 files changed, 5 insertions(+), 5 deletions(-)
diff --git
a/hadoop-hdfs-project/hadoop-hdfs-rbf/src/main/java/org/apache/hadoop/hdfs/server/federation/metrics/RBFMetrics.java
b/hadoop-hdfs-project/hadoop-hdfs-rbf/src/main/java/org/apache/hadoop/hdfs/server/federation/metrics/RBFMetrics.java
index 41b58c4a16b..0a28688c916 100644
---
a/hadoop-hdfs-project/hadoop-hdfs-rbf/src/main/java/org/apache/hadoop/hdfs/server/federation/metrics/RBFMetrics.java
+++
b/hadoop-hdfs-project/hadoop-hdfs-rbf/src/main/java/org/apache/hadoop/hdfs/server/federation/metrics/RBFMetrics.java
@@ -874,7 +874,7 @@ public class RBFMetrics implements RouterMBean,
FederationMBean {
/**
* Fetches the most active namenode memberships for all known nameservices.
- * The fetched membership may not or may not be active. Excludes expired
+ * The fetched membership may or may not be active. Excludes expired
* memberships.
* @throws IOException if the query could not be performed.
* @return List of the most active NNs from each known nameservice.
diff --git
a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/datanode/DataXceiver.java
b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/datanode/DataXceiver.java
index ab706fb1731..d8c55a54d4c 100644
---
a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/datanode/DataXceiver.java
+++
b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/datanode/DataXceiver.java
@@ -186,8 +186,8 @@ class DataXceiver extends Receiver implements Runnable {
if (br == null) {
return;
}
- // This doesn't need to be in a critical section. Althogh the client
- // can resue the connection to issue a different request, trying sending
+ // This doesn't need to be in a critical section. Although the client
+ // can reuse the connection to issue a different request, trying sending
// an OOB through the recently closed block receiver is harmless.
LOG.info("Sending OOB to peer: {}", peer);
br.sendOOB();
diff --git
a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/FSDirWriteFileOp.java
b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/FSDirWriteFileOp.java
index 7b7f4a0f9c0..0d3cb89ac01 100644
---
a/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/FSDirWriteFileOp.java
+++
b/hadoop-hdfs-project/hadoop-hdfs/src/main/java/org/apache/hadoop/hdfs/server/namenode/FSDirWriteFileOp.java
@@ -624,7 +624,7 @@ class FSDirWriteFileOp {
// timeout, or because of an HA failover. In that case, we know
// by the fact that the client is re-issuing the RPC that it
// never began to write to the old block. Hence it is safe to
- // to return the existing block.
+ // return the existing block.
// 3) This is an entirely bogus request/bug -- we should error out
// rather than potentially appending a new block with an empty
// one in the middle, etc
diff --git
a/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/TestClientProtocolForPipelineRecovery.java
b/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/TestClientProtocolForPipelineRecovery.java
index 70aa9d7d635..9962e8c9dee 100644
---
a/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/TestClientProtocolForPipelineRecovery.java
+++
b/hadoop-hdfs-project/hadoop-hdfs/src/test/java/org/apache/hadoop/hdfs/TestClientProtocolForPipelineRecovery.java
@@ -327,7 +327,7 @@ public class TestClientProtocolForPipelineRecovery {
// Wait long enough to receive an OOB ack before closing the file.
GenericTestUtils.waitForThreadTermination(
"Async datanode shutdown thread", 100, 10000);
- // Retart the datanode
+ // Restart the datanode
cluster.restartDataNode(0, true);
// The following forces a data packet and end of block packets to be
sent.
out.close();
---------------------------------------------------------------------
To unsubscribe, e-mail: common-commits-unsubscr...@hadoop.apache.org
For additional commands, e-mail: common-commits-h...@hadoop.apache.org
