You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ozone.apache.org by ad...@apache.org on 2021/03/09 08:59:44 UTC

[ozone] branch master updated: HDDS-4919. Fix spelling (#2004)

This is an automated email from the ASF dual-hosted git repository.

adoroszlai pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/ozone.git


The following commit(s) were added to refs/heads/master by this push:
     new 45eee3f  HDDS-4919. Fix spelling (#2004)
45eee3f is described below

commit 45eee3fa5d29f49eaed0758d1703d446d56e70fb
Author: John Bampton <jb...@users.noreply.github.com>
AuthorDate: Tue Mar 9 18:59:26 2021 +1000

    HDDS-4919. Fix spelling (#2004)
---
 .../java/org/apache/hadoop/hdds/scm/storage/BlockInputStream.java   | 2 +-
 .../java/org/apache/hadoop/hdds/scm/storage/ChunkInputStream.java   | 2 +-
 hadoop-hdds/common/src/main/conf/hadoop-policy.xml                  | 4 ++--
 .../common/src/main/java/org/apache/hadoop/hdds/HddsUtils.java      | 2 +-
 .../main/java/org/apache/hadoop/hdds/conf/OzoneConfiguration.java   | 2 +-
 .../src/main/java/org/apache/hadoop/hdds/scm/XceiverClientSpi.java  | 2 +-
 .../apache/hadoop/hdds/security/exception/SCMSecurityException.java | 2 +-
 .../src/main/java/org/apache/hadoop/hdds/tracing/TracingUtil.java   | 2 +-
 .../java/org/apache/hadoop/ozone/common/OzoneChecksumException.java | 2 +-
 hadoop-hdds/common/src/main/resources/ozone-default.xml             | 2 +-
 .../test/java/org/apache/hadoop/hdds/conf/SimpleConfiguration.java  | 2 +-
 .../test/java/org/apache/hadoop/hdds/conf/ConfigurationExample.java | 2 +-
 .../apache/hadoop/ozone/container/common/impl/ContainerData.java    | 2 +-
 .../ozone/container/common/statemachine/EndpointStateMachine.java   | 2 +-
 .../hadoop/ozone/container/common/states/datanode/package-info.java | 2 +-
 .../hadoop/ozone/container/common/TestDatanodeStateMachine.java     | 2 +-
 hadoop-hdds/docs/content/design/decommissioning.md                  | 2 +-
 hadoop-hdds/docs/content/design/ozone-enhancement-proposals.md      | 4 ++--
 hadoop-hdds/docs/content/design/s3-performance.md                   | 2 +-
 hadoop-hdds/docs/content/design/volume-management.md                | 6 +++---
 hadoop-hdds/docs/content/start/Kubernetes.md                        | 2 +-
 hadoop-hdds/docs/content/start/StartFromDockerHub.md                | 2 +-
 .../java/org/apache/hadoop/hdds/conf/DatanodeRatisGrpcConfig.java   | 2 +-
 .../java/org/apache/hadoop/hdds/server/http/BaseHttpServer.java     | 2 +-
 .../main/java/org/apache/hadoop/hdds/server/http/HttpServer2.java   | 2 +-
 .../main/java/org/apache/hadoop/hdds/utils/db/TableIterator.java    | 2 +-
 hadoop-hdds/hadoop-dependency-client/README.md                      | 2 +-
 .../src/main/proto/ScmServerDatanodeHeartbeatProtocol.proto         | 6 +++---
 .../org/apache/hadoop/hdds/scm/container/SimpleMockNodeManager.java | 2 +-
 .../org/apache/hadoop/hdds/scm/cli/ContainerOperationClient.java    | 2 +-
 .../main/java/org/apache/hadoop/ozone/om/lock/OzoneManagerLock.java | 2 +-
 .../bin/licenses/LICENSE-org.codehaus.woodstox-stax2-api.txt        | 2 +-
 .../apache/hadoop/ozone/insight/TestConfigurationSubCommand.java    | 2 +-
 .../apache/hadoop/ozone/container/ozoneimpl/TestOzoneContainer.java | 2 +-
 .../org/apache/hadoop/ozone/om/TestOzoneManagerHAMetadataOnly.java  | 2 +-
 hadoop-ozone/interface-client/src/main/proto/OmClientProtocol.proto | 2 +-
 .../hadoop/ozone/security/OzoneDelegationTokenSecretManager.java    | 2 +-
 .../org/apache/hadoop/ozone/recon/fsck/TestContainerHealthTask.java | 2 +-
 .../main/java/org/apache/hadoop/ozone/s3/OzoneClientProducer.java   | 2 +-
 .../main/java/org/apache/hadoop/ozone/s3/util/ContinueToken.java    | 6 +++---
 tools/fault-injection-service/FileSystem/failure_injector_fs.cc     | 2 +-
 .../Service/cpp/failure_injector_svc_server.cc                      | 6 +++---
 42 files changed, 52 insertions(+), 52 deletions(-)

diff --git a/hadoop-hdds/client/src/main/java/org/apache/hadoop/hdds/scm/storage/BlockInputStream.java b/hadoop-hdds/client/src/main/java/org/apache/hadoop/hdds/scm/storage/BlockInputStream.java
index d0e45a0..d088bb4 100644
--- a/hadoop-hdds/client/src/main/java/org/apache/hadoop/hdds/scm/storage/BlockInputStream.java
+++ b/hadoop-hdds/client/src/main/java/org/apache/hadoop/hdds/scm/storage/BlockInputStream.java
@@ -90,7 +90,7 @@ public class BlockInputStream extends InputStream
   // BlockInputStream i.e offset of the data to be read next from this block
   private int chunkIndex;
 
-  // Position of the BlockInputStream is maintainted by this variable till
+  // Position of the BlockInputStream is maintained by this variable till
   // the stream is initialized. This position is w.r.t to the block only and
   // not the key.
   // For the above example, if we seek to position 240 before the stream is
diff --git a/hadoop-hdds/client/src/main/java/org/apache/hadoop/hdds/scm/storage/ChunkInputStream.java b/hadoop-hdds/client/src/main/java/org/apache/hadoop/hdds/scm/storage/ChunkInputStream.java
index 9c03453..657269d 100644
--- a/hadoop-hdds/client/src/main/java/org/apache/hadoop/hdds/scm/storage/ChunkInputStream.java
+++ b/hadoop-hdds/client/src/main/java/org/apache/hadoop/hdds/scm/storage/ChunkInputStream.java
@@ -250,7 +250,7 @@ public class ChunkInputStream extends InputStream
   /**
    * Prepares to read by advancing through buffers or allocating new buffers,
    * as needed until it finds data to return, or encounters EOF.
-   * @param len desired lenght of data to read
+   * @param len desired length of data to read
    * @return length of data available to read, possibly less than desired length
    */
   private synchronized int prepareRead(int len) throws IOException {
diff --git a/hadoop-hdds/common/src/main/conf/hadoop-policy.xml b/hadoop-hdds/common/src/main/conf/hadoop-policy.xml
index 85e4975..85837ba 100644
--- a/hadoop-hdds/common/src/main/conf/hadoop-policy.xml
+++ b/hadoop-hdds/common/src/main/conf/hadoop-policy.xml
@@ -145,7 +145,7 @@
     <name>security.mrhs.client.protocol.acl</name>
     <value>*</value>
     <description>ACL for HSClientProtocol, used by job clients to
-    communciate with the MR History Server job status etc.
+    communicate with the MR History Server job status etc.
     The ACL is a comma-separated list of user and group names. The user and
     group list is separated by a blank. For e.g. "alice,bob users,wheel".
     A special value of "*" means all users are allowed.</description>
@@ -226,7 +226,7 @@
     <name>security.job.client.protocol.acl</name>
     <value>*</value>
     <description>ACL for MRClientProtocol, used by job clients to
-    communciate with the MR ApplicationMaster to query job status etc.
+    communicate with the MR ApplicationMaster to query job status etc.
     The ACL is a comma-separated list of user and group names. The user and
     group list is separated by a blank. For e.g. "alice,bob users,wheel".
     A special value of "*" means all users are allowed.</description>
diff --git a/hadoop-hdds/common/src/main/java/org/apache/hadoop/hdds/HddsUtils.java b/hadoop-hdds/common/src/main/java/org/apache/hadoop/hdds/HddsUtils.java
index ae8b00b..b08f0f7 100644
--- a/hadoop-hdds/common/src/main/java/org/apache/hadoop/hdds/HddsUtils.java
+++ b/hadoop-hdds/common/src/main/java/org/apache/hadoop/hdds/HddsUtils.java
@@ -495,7 +495,7 @@ public final class HddsUtils {
    * passwords from the CredentialProvider API before falling back to
    * clear text in config - if falling back is allowed.
    * @param conf Configuration instance
-   * @param alias name of the credential to retreive
+   * @param alias name of the credential to retrieve
    * @return String credential value or null
    */
   static String getPassword(ConfigurationSource conf, String alias) {
diff --git a/hadoop-hdds/common/src/main/java/org/apache/hadoop/hdds/conf/OzoneConfiguration.java b/hadoop-hdds/common/src/main/java/org/apache/hadoop/hdds/conf/OzoneConfiguration.java
index d73c605..056cc5f 100644
--- a/hadoop-hdds/common/src/main/java/org/apache/hadoop/hdds/conf/OzoneConfiguration.java
+++ b/hadoop-hdds/common/src/main/java/org/apache/hadoop/hdds/conf/OzoneConfiguration.java
@@ -127,7 +127,7 @@ public class OzoneConfiguration extends Configuration
     }
     // Adding core-site here because properties from core-site are
     // distributed to executors by spark driver. Ozone properties which are
-    // added to core-site, will be overriden by properties from adding Resource
+    // added to core-site, will be overridden by properties from adding Resource
     // ozone-default.xml. So, adding core-site again will help to resolve
     // this override issue.
     addResource("core-site.xml");
diff --git a/hadoop-hdds/common/src/main/java/org/apache/hadoop/hdds/scm/XceiverClientSpi.java b/hadoop-hdds/common/src/main/java/org/apache/hadoop/hdds/scm/XceiverClientSpi.java
index fd49529..c904819 100644
--- a/hadoop-hdds/common/src/main/java/org/apache/hadoop/hdds/scm/XceiverClientSpi.java
+++ b/hadoop-hdds/common/src/main/java/org/apache/hadoop/hdds/scm/XceiverClientSpi.java
@@ -170,7 +170,7 @@ public abstract class XceiverClientSpi implements Closeable {
   public abstract HddsProtos.ReplicationType getPipelineType();
 
   /**
-   * Check if an specfic commitIndex is replicated to majority/all servers.
+   * Check if an specific commitIndex is replicated to majority/all servers.
    * @param index index to watch for
    * @return reply containing the min commit index replicated to all or majority
    *         servers in case of a failure
diff --git a/hadoop-hdds/common/src/main/java/org/apache/hadoop/hdds/security/exception/SCMSecurityException.java b/hadoop-hdds/common/src/main/java/org/apache/hadoop/hdds/security/exception/SCMSecurityException.java
index bbe25a9..2b95df3 100644
--- a/hadoop-hdds/common/src/main/java/org/apache/hadoop/hdds/security/exception/SCMSecurityException.java
+++ b/hadoop-hdds/common/src/main/java/org/apache/hadoop/hdds/security/exception/SCMSecurityException.java
@@ -21,7 +21,7 @@ package org.apache.hadoop.hdds.security.exception;
 import java.io.IOException;
 
 /**
- * Root Security Exception call for all Certificate related Execptions.
+ * Root Security Exception call for all Certificate related Exceptions.
  */
 public class SCMSecurityException extends IOException {
   private final ErrorCode errorCode;
diff --git a/hadoop-hdds/common/src/main/java/org/apache/hadoop/hdds/tracing/TracingUtil.java b/hadoop-hdds/common/src/main/java/org/apache/hadoop/hdds/tracing/TracingUtil.java
index fbab712..05928c2 100644
--- a/hadoop-hdds/common/src/main/java/org/apache/hadoop/hdds/tracing/TracingUtil.java
+++ b/hadoop-hdds/common/src/main/java/org/apache/hadoop/hdds/tracing/TracingUtil.java
@@ -116,7 +116,7 @@ public final class TracingUtil {
    * @param <T> the type of the interface
    * @param conf configuration
    *
-   * @return A new interface which implements interfce but delegate all the
+   * @return A new interface which implements interface but delegate all the
    * calls to the delegate and also enables tracing.
    */
   public static <T> T createProxy(
diff --git a/hadoop-hdds/common/src/main/java/org/apache/hadoop/ozone/common/OzoneChecksumException.java b/hadoop-hdds/common/src/main/java/org/apache/hadoop/ozone/common/OzoneChecksumException.java
index 13e33ee..8ba7b6d 100644
--- a/hadoop-hdds/common/src/main/java/org/apache/hadoop/ozone/common/OzoneChecksumException.java
+++ b/hadoop-hdds/common/src/main/java/org/apache/hadoop/ozone/common/OzoneChecksumException.java
@@ -29,7 +29,7 @@ import org.apache.hadoop.hdds.protocol.datanode.proto.ContainerProtos;
 public class OzoneChecksumException extends IOException {
 
   /**
-   * OzoneChecksumException to throw when checksum verfication fails.
+   * OzoneChecksumException to throw when checksum verification fails.
    * @param index checksum list index at which checksum match failed
    */
   public OzoneChecksumException(int index) {
diff --git a/hadoop-hdds/common/src/main/resources/ozone-default.xml b/hadoop-hdds/common/src/main/resources/ozone-default.xml
index 1dece14..94c2a4d 100644
--- a/hadoop-hdds/common/src/main/resources/ozone-default.xml
+++ b/hadoop-hdds/common/src/main/resources/ozone-default.xml
@@ -1428,7 +1428,7 @@
     <value/>
     <tag>OZONE, S3GATEWAY</tag>
     <description>List of Ozone S3Gateway domain names. If multiple
-      domain names to be provided, they should be a "," seperated.
+      domain names to be provided, they should be a "," separated.
       This parameter is only required when virtual host style pattern is
       followed.</description>
   </property>
diff --git a/hadoop-hdds/common/src/test/java/org/apache/hadoop/hdds/conf/SimpleConfiguration.java b/hadoop-hdds/common/src/test/java/org/apache/hadoop/hdds/conf/SimpleConfiguration.java
index 3288e56..a0b7972 100644
--- a/hadoop-hdds/common/src/test/java/org/apache/hadoop/hdds/conf/SimpleConfiguration.java
+++ b/hadoop-hdds/common/src/test/java/org/apache/hadoop/hdds/conf/SimpleConfiguration.java
@@ -26,7 +26,7 @@ import java.util.concurrent.TimeUnit;
 public class SimpleConfiguration extends SimpleConfigurationParent {
 
   @Config(key = "address", defaultValue = "localhost", description = "Client "
-      + "addres (To test string injection).", tags = ConfigTag.MANAGEMENT)
+      + "address (To test string injection).", tags = ConfigTag.MANAGEMENT)
   private String clientAddress;
 
   @Config(key = "bind.host", defaultValue = "0.0.0.0", description = "Bind "
diff --git a/hadoop-hdds/config/src/test/java/org/apache/hadoop/hdds/conf/ConfigurationExample.java b/hadoop-hdds/config/src/test/java/org/apache/hadoop/hdds/conf/ConfigurationExample.java
index c61ee49..dafc630 100644
--- a/hadoop-hdds/config/src/test/java/org/apache/hadoop/hdds/conf/ConfigurationExample.java
+++ b/hadoop-hdds/config/src/test/java/org/apache/hadoop/hdds/conf/ConfigurationExample.java
@@ -26,7 +26,7 @@ import java.util.concurrent.TimeUnit;
 public class ConfigurationExample extends ConfigurationExampleParent {
 
   @Config(key = "address", defaultValue = "localhost", description = "Client "
-      + "addres (To test string injection).", tags = ConfigTag.MANAGEMENT)
+      + "address (To test string injection).", tags = ConfigTag.MANAGEMENT)
   private String clientAddress;
 
   @Config(key = "bind.host", defaultValue = "0.0.0.0", description = "Bind "
diff --git a/hadoop-hdds/container-service/src/main/java/org/apache/hadoop/ozone/container/common/impl/ContainerData.java b/hadoop-hdds/container-service/src/main/java/org/apache/hadoop/ozone/container/common/impl/ContainerData.java
index 19cc1e2..7a953e9 100644
--- a/hadoop-hdds/container-service/src/main/java/org/apache/hadoop/ozone/container/common/impl/ContainerData.java
+++ b/hadoop-hdds/container-service/src/main/java/org/apache/hadoop/ozone/container/common/impl/ContainerData.java
@@ -259,7 +259,7 @@ public abstract class ContainerData {
   }
 
   /**
-   * Retuns metadata of the container.
+   * Returns metadata of the container.
    * @return metadata
    */
   public Map<String, String> getMetadata() {
diff --git a/hadoop-hdds/container-service/src/main/java/org/apache/hadoop/ozone/container/common/statemachine/EndpointStateMachine.java b/hadoop-hdds/container-service/src/main/java/org/apache/hadoop/ozone/container/common/statemachine/EndpointStateMachine.java
index 31d7bbc..10c9b74 100644
--- a/hadoop-hdds/container-service/src/main/java/org/apache/hadoop/ozone/container/common/statemachine/EndpointStateMachine.java
+++ b/hadoop-hdds/container-service/src/main/java/org/apache/hadoop/ozone/container/common/statemachine/EndpointStateMachine.java
@@ -102,7 +102,7 @@ public class EndpointStateMachine
   }
 
   /**
-   * Sets the Version reponse we recieved from the SCM.
+   * Sets the Version response we received from the SCM.
    *
    * @param version VersionResponse
    */
diff --git a/hadoop-hdds/container-service/src/main/java/org/apache/hadoop/ozone/container/common/states/datanode/package-info.java b/hadoop-hdds/container-service/src/main/java/org/apache/hadoop/ozone/container/common/states/datanode/package-info.java
index 6b8d16c..9453d8a 100644
--- a/hadoop-hdds/container-service/src/main/java/org/apache/hadoop/ozone/container/common/states/datanode/package-info.java
+++ b/hadoop-hdds/container-service/src/main/java/org/apache/hadoop/ozone/container/common/states/datanode/package-info.java
@@ -16,6 +16,6 @@
  */
 package org.apache.hadoop.ozone.container.common.states.datanode;
 /**
- This package contians files that guide the state transitions from
+ This package contains files that guide the state transitions from
  Init->Running->Shutdown for the datanode.
  */
\ No newline at end of file
diff --git a/hadoop-hdds/container-service/src/test/java/org/apache/hadoop/ozone/container/common/TestDatanodeStateMachine.java b/hadoop-hdds/container-service/src/test/java/org/apache/hadoop/ozone/container/common/TestDatanodeStateMachine.java
index 35858fd..7487856 100644
--- a/hadoop-hdds/container-service/src/test/java/org/apache/hadoop/ozone/container/common/TestDatanodeStateMachine.java
+++ b/hadoop-hdds/container-service/src/test/java/org/apache/hadoop/ozone/container/common/TestDatanodeStateMachine.java
@@ -140,7 +140,7 @@ public class TestDatanodeStateMachine {
         s.stop();
       }
     } catch (Exception e) {
-      //ignore all execption from the shutdown
+      //ignore all exception from the shutdown
     } finally {
       FileUtil.fullyDelete(testRoot);
     }
diff --git a/hadoop-hdds/docs/content/design/decommissioning.md b/hadoop-hdds/docs/content/design/decommissioning.md
index e4abdf6..a252d92 100644
--- a/hadoop-hdds/docs/content/design/decommissioning.md
+++ b/hadoop-hdds/docs/content/design/decommissioning.md
@@ -460,7 +460,7 @@ int getReplicationCount(int expectedCount, int healthy, int maintenance) {
 
 Please note that we always assume that the the in-flight deletion are applied and the container is already deleted.
 
-There is a very rare case where the in-flight deletion is timed out (and as a result replication manager would assume the container is not deleted) BUT in the mean-time the container finally deleted. It can be survivied with including the creation timestamp in the ContainerDeleteCommand.
+There is a very rare case where the in-flight deletion is timed out (and as a result replication manager would assume the container is not deleted) BUT in the mean-time the container finally deleted. It can be survived with including the creation timestamp in the ContainerDeleteCommand.
 
 ### Over replication examples
 
diff --git a/hadoop-hdds/docs/content/design/ozone-enhancement-proposals.md b/hadoop-hdds/docs/content/design/ozone-enhancement-proposals.md
index f14aca8..5b58e64 100644
--- a/hadoop-hdds/docs/content/design/ozone-enhancement-proposals.md
+++ b/hadoop-hdds/docs/content/design/ozone-enhancement-proposals.md
@@ -76,7 +76,7 @@ The easiest way to create a design doc is to create a new markdown file in a PR
 
 A very common practice of today is to create design doc on google docs and upload it to the JIRA.
 
- 1. Publicy available: YES, anybody can download it from the Jira.
+ 1. Publicly available: YES, anybody can download it from the Jira.
  2. Archived: YES, it's available from Apache infra.
  3. Editable: NO, It's harder to reuse the text to import to the docs or create a new design doc.
  4. Commentable: PARTIAL, Not as easy as a text file or the original google docs, but a good structure with numbered section may help
@@ -137,7 +137,7 @@ Defined in the markdown header. Proposed statuses:
 
  * `outdated`: Code has been changed and design doc doesn't reflect any more the state of the current code.
 
- Note: the _accepted_ design docs won't be visible as part of the documentation or only under a dedicated section to clearly comminucate that it's not ready, yet.
+ Note: the _accepted_ design docs won't be visible as part of the documentation or only under a dedicated section to clearly communicate that it's not ready, yet.
 
 3. Problem statement (Motivation / Abstract)
 
diff --git a/hadoop-hdds/docs/content/design/s3-performance.md b/hadoop-hdds/docs/content/design/s3-performance.md
index a90f662..8da6ab0 100644
--- a/hadoop-hdds/docs/content/design/s3-performance.md
+++ b/hadoop-hdds/docs/content/design/s3-performance.md
@@ -230,7 +230,7 @@ To make it easier to understand the implementation of this approach, let's compa
 # Possible alternatives
 
 * It's possible to use pure Hadoop RPC client instead of Ozone Client which would make the client connection slightly cheaper (service discovery call is not required) but it's still require to create new connections for each requests (and downloading data without OzoneClient may have own challenges).
-* CDI error handling can be improved with using other dependency injection (eg. Guice, which is already used by Recon) or some additional wrappers and manual connection creation. But it wouldn't solve the perfomance problem.
+* CDI error handling can be improved with using other dependency injection (eg. Guice, which is already used by Recon) or some additional wrappers and manual connection creation. But it wouldn't solve the performance problem.
 
 
 
diff --git a/hadoop-hdds/docs/content/design/volume-management.md b/hadoop-hdds/docs/content/design/volume-management.md
index c996a87..a21ffb7 100644
--- a/hadoop-hdds/docs/content/design/volume-management.md
+++ b/hadoop-hdds/docs/content/design/volume-management.md
@@ -91,7 +91,7 @@ Problem #5 can be easily supported with improving the `ozone s3` CLI. Ozone has
 
  1. Let's always use `s3v` volume for all the s3 buckets **if the bucket is created from the s3 interface**.
 
-This is an easy an fast method, but with this approach not all the volumes are avilable via the S3 interface. We need to provide a method to publish any of the ozone volumes / buckets.
+This is an easy an fast method, but with this approach not all the volumes are available via the S3 interface. We need to provide a method to publish any of the ozone volumes / buckets.
 
  2. Let's improve the existing toolset to expose **any** Ozone volume/bucket as an s3 bucket. (Eg. expose `o3:/vol1/bucketx` as an S3 bucket `s3://foobar` )
 
@@ -104,7 +104,7 @@ This is an easy an fast method, but with this approach not all the volumes are a
    1. Store some metadata (** s3 bucket name **) on each of the buckets
    2. Implement a **symbolic link** mechanism which makes it possible to *link* to any volume/buckets from the "s3" volume.
 
-The first approach required a secondary cache table and it violates the naming hierarchy. The s3 bucket name is a global unique name, therefore it's more than just a single attribute on a specific object. It's more like an element in the hierachy. For this reason the second option is proposed:
+The first approach required a secondary cache table and it violates the naming hierarchy. The s3 bucket name is a global unique name, therefore it's more than just a single attribute on a specific object. It's more like an element in the hierarchy. For this reason the second option is proposed:
 
 For example if the default s3 volume is `s3v`
 
@@ -184,7 +184,7 @@ We can also make volumes a lightweight *bucket group* object by removing it from
 
  * __pro__: can be the most simple solution. Easy to understand as there are no more volumes in the path.
  * __con__: Bigger change (all the API can't be modified to make volumes optional)
- * __con__: Harder to dis-joint namespaces based on volumes. (With the current scheme, it's easier to delegate the responsibilties for one volumes to a different OM).
+ * __con__: Harder to dis-joint namespaces based on volumes. (With the current scheme, it's easier to delegate the responsibilities for one volumes to a different OM).
  * __con__: We lose volumes as the top-level directories in `ofs` scheme.
  * __con__: One level of hierarchy might not be enough in case of multi-tenancy.
  * __con__: One level of hierarchy is not enough if we would like to provide separated level for users and admins 
diff --git a/hadoop-hdds/docs/content/start/Kubernetes.md b/hadoop-hdds/docs/content/start/Kubernetes.md
index ad85534..bf6b5d7 100644
--- a/hadoop-hdds/docs/content/start/Kubernetes.md
+++ b/hadoop-hdds/docs/content/start/Kubernetes.md
@@ -45,7 +45,7 @@ kubectl get pod
 Access the services
 ```
 
-Now you can access any of the services. By default the services are not published but you can access them with port-foward rules.
+Now you can access any of the services. By default the services are not published but you can access them with port-forward rules.
 
 ```
 kubectl port-forward s3g-0 9878:9878
diff --git a/hadoop-hdds/docs/content/start/StartFromDockerHub.md b/hadoop-hdds/docs/content/start/StartFromDockerHub.md
index 6d26dfa..1912935 100644
--- a/hadoop-hdds/docs/content/start/StartFromDockerHub.md
+++ b/hadoop-hdds/docs/content/start/StartFromDockerHub.md
@@ -44,7 +44,7 @@ Container Manager) one data node  and the S3 compatible REST server
 If you would like to use a more realistic pseudo-cluster where each components
 run in own containers, you can start it with a docker-compose file.
 
-We have shipped a docker-compose and an enviorment file as part of the
+We have shipped a docker-compose and an environment file as part of the
 container image  that is uploaded to docker hub.
 
 The following commands can be used to extract these files from the image in the docker hub.
diff --git a/hadoop-hdds/framework/src/main/java/org/apache/hadoop/hdds/conf/DatanodeRatisGrpcConfig.java b/hadoop-hdds/framework/src/main/java/org/apache/hadoop/hdds/conf/DatanodeRatisGrpcConfig.java
index 443b879..db4b9ba 100644
--- a/hadoop-hdds/framework/src/main/java/org/apache/hadoop/hdds/conf/DatanodeRatisGrpcConfig.java
+++ b/hadoop-hdds/framework/src/main/java/org/apache/hadoop/hdds/conf/DatanodeRatisGrpcConfig.java
@@ -35,7 +35,7 @@ public class DatanodeRatisGrpcConfig {
       defaultValue = "32MB",
       type = ConfigType.INT,
       tags = {OZONE, CLIENT, PERFORMANCE},
-      description = "Maximum message size allowed to be recieved by Grpc " +
+      description = "Maximum message size allowed to be received by Grpc " +
           "Channel (Server)."
   )
   private int maximumMessageSize = 32 * 1024 * 1024;
diff --git a/hadoop-hdds/framework/src/main/java/org/apache/hadoop/hdds/server/http/BaseHttpServer.java b/hadoop-hdds/framework/src/main/java/org/apache/hadoop/hdds/server/http/BaseHttpServer.java
index d5bf8f6..9c28fb2 100644
--- a/hadoop-hdds/framework/src/main/java/org/apache/hadoop/hdds/server/http/BaseHttpServer.java
+++ b/hadoop-hdds/framework/src/main/java/org/apache/hadoop/hdds/server/http/BaseHttpServer.java
@@ -359,7 +359,7 @@ public abstract class BaseHttpServer {
    * clear text in config - if falling back is allowed.
    *
    * @param conf  Configuration instance
-   * @param alias name of the credential to retreive
+   * @param alias name of the credential to retrieve
    * @return String credential value or null
    */
   static String getPassword(ConfigurationSource conf, String alias) {
diff --git a/hadoop-hdds/framework/src/main/java/org/apache/hadoop/hdds/server/http/HttpServer2.java b/hadoop-hdds/framework/src/main/java/org/apache/hadoop/hdds/server/http/HttpServer2.java
index 9aad94a..f293ffa 100644
--- a/hadoop-hdds/framework/src/main/java/org/apache/hadoop/hdds/server/http/HttpServer2.java
+++ b/hadoop-hdds/framework/src/main/java/org/apache/hadoop/hdds/server/http/HttpServer2.java
@@ -1425,7 +1425,7 @@ public final class HttpServer2 implements FilterContainer {
    * @param servletContext the servlet context.
    * @param request the servlet request.
    * @param response the servlet response.
-   * @return TRUE/FALSE based on the logic decribed above.
+   * @return TRUE/FALSE based on the logic described above.
    */
   public static boolean isInstrumentationAccessAllowed(
       ServletContext servletContext, HttpServletRequest request,
diff --git a/hadoop-hdds/framework/src/main/java/org/apache/hadoop/hdds/utils/db/TableIterator.java b/hadoop-hdds/framework/src/main/java/org/apache/hadoop/hdds/utils/db/TableIterator.java
index c9bc045..b5fb1e4 100644
--- a/hadoop-hdds/framework/src/main/java/org/apache/hadoop/hdds/utils/db/TableIterator.java
+++ b/hadoop-hdds/framework/src/main/java/org/apache/hadoop/hdds/utils/db/TableIterator.java
@@ -64,7 +64,7 @@ public interface TableIterator<KEY, T> extends Iterator<T>, Closeable {
    * Remove the actual value of the iterator from the database table on
    * which the iterator is working on.
    *
-   * @throws IOException when there is an error occured during deletion.
+   * @throws IOException when there is an error occurred during deletion.
    */
   void removeFromDB() throws IOException;
 
diff --git a/hadoop-hdds/hadoop-dependency-client/README.md b/hadoop-hdds/hadoop-dependency-client/README.md
index a3ec3680d..1d14607 100644
--- a/hadoop-hdds/hadoop-dependency-client/README.md
+++ b/hadoop-hdds/hadoop-dependency-client/README.md
@@ -21,7 +21,7 @@ which are not required for the parts used in Ozone.
 The exclude rules should be updated on each version bump. If Hadoop introduce new dependencies we need to exclude them (unless they are required).
 
 
-For the reference here are the minimal jar files wich are required by Ozone:
+For the reference here are the minimal jar files which are required by Ozone:
 
 
 ```
diff --git a/hadoop-hdds/interface-server/src/main/proto/ScmServerDatanodeHeartbeatProtocol.proto b/hadoop-hdds/interface-server/src/main/proto/ScmServerDatanodeHeartbeatProtocol.proto
index 505f9ca..116e35e 100644
--- a/hadoop-hdds/interface-server/src/main/proto/ScmServerDatanodeHeartbeatProtocol.proto
+++ b/hadoop-hdds/interface-server/src/main/proto/ScmServerDatanodeHeartbeatProtocol.proto
@@ -309,7 +309,7 @@ message SCMCommandProto {
 
 /**
  * SCM informs a datanode to register itself again.
- * With recieving this command, datanode will transit to REGISTER state.
+ * With receiving this command, datanode will transit to REGISTER state.
  */
 message ReregisterCommandProto {}
 
@@ -321,7 +321,7 @@ message DeleteBlocksCommandProto {
 }
 
 // The deleted blocks which are stored in deletedBlock.db of scm.
-// We don't use BlockID because this only contians multiple localIDs
+// We don't use BlockID because this only contains multiple localIDs
 // of the same containerID.
 message DeletedBlocksTransaction {
   required int64 txID = 1;
@@ -453,7 +453,7 @@ message SetNodeOperationalStateCommandProto {
  * it needs to do a registration.
  *
  * If registration is need datanode moves into REGISTER state. It will
- * send a register call with DatanodeDetailsProto data structure and presist
+ * send a register call with DatanodeDetailsProto data structure and persist
  * that info.
  *
  * The response to the command contains clusterID. This information is
diff --git a/hadoop-hdds/server-scm/src/test/java/org/apache/hadoop/hdds/scm/container/SimpleMockNodeManager.java b/hadoop-hdds/server-scm/src/test/java/org/apache/hadoop/hdds/scm/container/SimpleMockNodeManager.java
index 7f0d651..be4ab57 100644
--- a/hadoop-hdds/server-scm/src/test/java/org/apache/hadoop/hdds/scm/container/SimpleMockNodeManager.java
+++ b/hadoop-hdds/server-scm/src/test/java/org/apache/hadoop/hdds/scm/container/SimpleMockNodeManager.java
@@ -84,7 +84,7 @@ public class SimpleMockNodeManager implements NodeManager {
   }
 
   /**
-   * If the given node was registed with the nodeManager, return the
+   * If the given node was registered with the nodeManager, return the
    * NodeStatus for the node. Otherwise return a NodeStatus of "In Service
    * and Healthy".
    * @param datanodeDetails DatanodeDetails
diff --git a/hadoop-hdds/tools/src/main/java/org/apache/hadoop/hdds/scm/cli/ContainerOperationClient.java b/hadoop-hdds/tools/src/main/java/org/apache/hadoop/hdds/scm/cli/ContainerOperationClient.java
index baac26d..c96b9fe 100644
--- a/hadoop-hdds/tools/src/main/java/org/apache/hadoop/hdds/scm/cli/ContainerOperationClient.java
+++ b/hadoop-hdds/tools/src/main/java/org/apache/hadoop/hdds/scm/cli/ContainerOperationClient.java
@@ -187,7 +187,7 @@ public class ContainerOperationClient implements ScmClient {
   }
 
   /**
-   * Creates a pipeline over the machines choosen by the SCM.
+   * Creates a pipeline over the machines chosen by the SCM.
    *
    * @param client   - Client
    * @param pipeline - pipeline to be createdon Datanodes.
diff --git a/hadoop-ozone/common/src/main/java/org/apache/hadoop/ozone/om/lock/OzoneManagerLock.java b/hadoop-ozone/common/src/main/java/org/apache/hadoop/ozone/om/lock/OzoneManagerLock.java
index 4112941..ca3de18 100644
--- a/hadoop-ozone/common/src/main/java/org/apache/hadoop/ozone/om/lock/OzoneManagerLock.java
+++ b/hadoop-ozone/common/src/main/java/org/apache/hadoop/ozone/om/lock/OzoneManagerLock.java
@@ -234,7 +234,7 @@ public class OzoneManagerLock {
       throw new RuntimeException(errorMessage);
     } else {
       // When acquiring multiple user locks, the reason for doing lexical
-      // order comparision is to avoid deadlock scenario.
+      // order comparison is to avoid deadlock scenario.
 
       // Example: 1st thread acquire lock(ozone, hdfs)
       // 2nd thread acquire lock(hdfs, ozone).
diff --git a/hadoop-ozone/dist/src/main/license/bin/licenses/LICENSE-org.codehaus.woodstox-stax2-api.txt b/hadoop-ozone/dist/src/main/license/bin/licenses/LICENSE-org.codehaus.woodstox-stax2-api.txt
index 9b53393..d0b44cb 100644
--- a/hadoop-ozone/dist/src/main/license/bin/licenses/LICENSE-org.codehaus.woodstox-stax2-api.txt
+++ b/hadoop-ozone/dist/src/main/license/bin/licenses/LICENSE-org.codehaus.woodstox-stax2-api.txt
@@ -1,7 +1,7 @@
 This copy of Stax2 API is licensed under the
 Simplified BSD License (also known as "2-clause BSD", or "FreeBSD License")
 See the License for details about distribution rights, and the
-specific rights regarding derivate works.
+specific rights regarding derivative works.
 
 You may obtain a copy of the License at:
 
diff --git a/hadoop-ozone/insight/src/test/java/org/apache/hadoop/ozone/insight/TestConfigurationSubCommand.java b/hadoop-ozone/insight/src/test/java/org/apache/hadoop/ozone/insight/TestConfigurationSubCommand.java
index cb9f93f..ef8a190 100644
--- a/hadoop-ozone/insight/src/test/java/org/apache/hadoop/ozone/insight/TestConfigurationSubCommand.java
+++ b/hadoop-ozone/insight/src/test/java/org/apache/hadoop/ozone/insight/TestConfigurationSubCommand.java
@@ -88,7 +88,7 @@ public class TestConfigurationSubCommand {
   public static class CustomConfig extends ParentConfig {
 
     @Config(key = "address", defaultValue = "localhost", description = "Client "
-        + "addres (To test string injection).", tags = ConfigTag.MANAGEMENT)
+        + "address (To test string injection).", tags = ConfigTag.MANAGEMENT)
     private String clientAddress;
 
     public String getClientAddress() {
diff --git a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/container/ozoneimpl/TestOzoneContainer.java b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/container/ozoneimpl/TestOzoneContainer.java
index 0fd5c08..5d02ad3 100644
--- a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/container/ozoneimpl/TestOzoneContainer.java
+++ b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/container/ozoneimpl/TestOzoneContainer.java
@@ -359,7 +359,7 @@ public class TestOzoneContainer {
       Assert.assertEquals(ContainerProtos.Result.SUCCESS,
           response.getResult());
 
-      // Close the contianer.
+      // Close the container.
       request = ContainerTestHelper.getCloseContainer(
           client.getPipeline(), containerID);
       response = client.sendCommand(request);
diff --git a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/om/TestOzoneManagerHAMetadataOnly.java b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/om/TestOzoneManagerHAMetadataOnly.java
index 84a1b17..f6b9445 100644
--- a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/om/TestOzoneManagerHAMetadataOnly.java
+++ b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/om/TestOzoneManagerHAMetadataOnly.java
@@ -208,7 +208,7 @@ public class TestOzoneManagerHAMetadataOnly extends TestOzoneManagerHA {
     // Get the new OM Proxy NodeId
     String newProxyNodeId = omFailoverProxyProvider.getCurrentProxyOMNodeId();
 
-    // Verify that a failover occured. the new proxy nodeId should be
+    // Verify that a failover occurred. the new proxy nodeId should be
     // different from the old proxy nodeId.
     Assert.assertNotEquals("Failover did not occur as expected",
         firstProxyNodeId, newProxyNodeId);
diff --git a/hadoop-ozone/interface-client/src/main/proto/OmClientProtocol.proto b/hadoop-ozone/interface-client/src/main/proto/OmClientProtocol.proto
index da43725..64c2eb6 100644
--- a/hadoop-ozone/interface-client/src/main/proto/OmClientProtocol.proto
+++ b/hadoop-ozone/interface-client/src/main/proto/OmClientProtocol.proto
@@ -863,7 +863,7 @@ message LookupKeyResponse {
     // clients' followup request may carry this ID for stateful operations (similar
     // to a cookie).
     optional uint64 ID = 3;
-    // TODO : allow specifiying a particular version to read.
+    // TODO : allow specifying a particular version to read.
     optional uint64 openVersion = 4;
 }
 
diff --git a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/security/OzoneDelegationTokenSecretManager.java b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/security/OzoneDelegationTokenSecretManager.java
index 6e9bd1a..fc8324d 100644
--- a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/security/OzoneDelegationTokenSecretManager.java
+++ b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/security/OzoneDelegationTokenSecretManager.java
@@ -328,7 +328,7 @@ public class OzoneDelegationTokenSecretManager
       OzoneTokenIdentifier ozoneTokenIdentifier, long expiryTime) {
     //TODO: Instead of having in-memory map inside this class, we can use
     // cache from table and make this table cache clean up policy NEVER. In
-    // this way, we don't need to maintain seperate in-memory map. To do this
+    // this way, we don't need to maintain separate in-memory map. To do this
     // work we need to merge HA/Non-HA code.
     TokenInfo tokenInfo = new TokenInfo(expiryTime, token.getPassword(),
         ozoneTokenIdentifier.getTrackingId());
diff --git a/hadoop-ozone/recon/src/test/java/org/apache/hadoop/ozone/recon/fsck/TestContainerHealthTask.java b/hadoop-ozone/recon/src/test/java/org/apache/hadoop/ozone/recon/fsck/TestContainerHealthTask.java
index 3a9e4d1..2176a37 100644
--- a/hadoop-ozone/recon/src/test/java/org/apache/hadoop/ozone/recon/fsck/TestContainerHealthTask.java
+++ b/hadoop-ozone/recon/src/test/java/org/apache/hadoop/ozone/recon/fsck/TestContainerHealthTask.java
@@ -78,7 +78,7 @@ public class TestContainerHealthTask extends AbstractReconSqlDBTest {
     ContainerReplica healthyReplicaMock = mock(ContainerReplica.class);
     when(healthyReplicaMock.getState()).thenReturn(State.CLOSED);
 
-    // Create 6 containers. The first 5 will have various unhealty states
+    // Create 6 containers. The first 5 will have various unhealthy states
     // defined below. The container with ID=6 will be healthy.
     List<ContainerInfo> mockContainers = getMockContainers(6);
     when(scmMock.getContainerManager()).thenReturn(containerManagerMock);
diff --git a/hadoop-ozone/s3gateway/src/main/java/org/apache/hadoop/ozone/s3/OzoneClientProducer.java b/hadoop-ozone/s3gateway/src/main/java/org/apache/hadoop/ozone/s3/OzoneClientProducer.java
index 4d3b498..d0cca97 100644
--- a/hadoop-ozone/s3gateway/src/main/java/org/apache/hadoop/ozone/s3/OzoneClientProducer.java
+++ b/hadoop-ozone/s3gateway/src/main/java/org/apache/hadoop/ozone/s3/OzoneClientProducer.java
@@ -74,7 +74,7 @@ public class OzoneClientProducer {
   }
   
   @PreDestroy
-  public void destory() throws IOException {
+  public void destroy() throws IOException {
     client.close();
   }
 
diff --git a/hadoop-ozone/s3gateway/src/main/java/org/apache/hadoop/ozone/s3/util/ContinueToken.java b/hadoop-ozone/s3gateway/src/main/java/org/apache/hadoop/ozone/s3/util/ContinueToken.java
index 92ae6d4..5d99f98 100644
--- a/hadoop-ozone/s3gateway/src/main/java/org/apache/hadoop/ozone/s3/util/ContinueToken.java
+++ b/hadoop-ozone/s3gateway/src/main/java/org/apache/hadoop/ozone/s3/util/ContinueToken.java
@@ -38,7 +38,7 @@ public class ContinueToken {
 
   private String lastDir;
 
-  private static final String CONTINUE_TOKEN_SEPERATOR = "-";
+  private static final String CONTINUE_TOKEN_SEPARATOR = "-";
 
   public ContinueToken(String lastKey, String lastDir) {
     Preconditions.checkNotNull(lastKey,
@@ -68,7 +68,7 @@ public class ContinueToken {
 
       String hex = Hex.encodeHexString(buffer.array());
       String digest = DigestUtils.sha256Hex(hex);
-      return hex + CONTINUE_TOKEN_SEPERATOR + digest;
+      return hex + CONTINUE_TOKEN_SEPARATOR + digest;
     } else {
       return null;
     }
@@ -83,7 +83,7 @@ public class ContinueToken {
    */
   public static ContinueToken decodeFromString(String key) throws OS3Exception {
     if (key != null) {
-      int indexSeparator = key.indexOf(CONTINUE_TOKEN_SEPERATOR);
+      int indexSeparator = key.indexOf(CONTINUE_TOKEN_SEPARATOR);
       if (indexSeparator == -1) {
         throw S3ErrorTable.newError(S3ErrorTable.INVALID_ARGUMENT, key);
       }
diff --git a/tools/fault-injection-service/FileSystem/failure_injector_fs.cc b/tools/fault-injection-service/FileSystem/failure_injector_fs.cc
index ad03e74..1dfdc9b 100644
--- a/tools/fault-injection-service/FileSystem/failure_injector_fs.cc
+++ b/tools/fault-injection-service/FileSystem/failure_injector_fs.cc
@@ -126,7 +126,7 @@ void *FailureInjectorFs::fifs_init(
     cfg->attr_timeout = 0;
     cfg->negative_timeout = 0;
     
-    /* Create a separete GRPC server thread to accept failure injection. */
+    /* Create a seperate GRPC server thread to accept failure injection. */
     std::thread th(&RunGrpcService::RunServer, mGrpcSever);
     th.detach();
 
diff --git a/tools/fault-injection-service/Service/cpp/failure_injector_svc_server.cc b/tools/fault-injection-service/Service/cpp/failure_injector_svc_server.cc
index ac7919c..4a3fd8d 100644
--- a/tools/fault-injection-service/Service/cpp/failure_injector_svc_server.cc
+++ b/tools/fault-injection-service/Service/cpp/failure_injector_svc_server.cc
@@ -42,7 +42,7 @@ Status FailureInjectorSvcServiceImpl::GetStatus(
 {
 
     string prefix("GetStatus ");
-    cout << "Recived request " << request->name() << "\n";
+    cout << "Received request " << request->name() << "\n";
     reply->set_message(prefix + request->name());
     return Status::OK;
 }
@@ -52,7 +52,7 @@ Status FailureInjectorSvcServiceImpl::InjectFailure(
     const InjectFailureRequest* request,
     InjectFailureReply* reply)
 {
-  cout << "Recived request " << request->path() << ":" 
+  cout << "Received request " << request->path() << ":" 
             << request->op_name() << "\n";
   mFailureInjector->InjectFailure(request->path(), request->op_name(),
                                 InjectedAction((int)request->action_code(),
@@ -66,7 +66,7 @@ Status FailureInjectorSvcServiceImpl::ResetFailure(
     const ResetFailureRequest* request,
     ResetFailureReply* reply)
 {
-    cout << "Recived request ";
+    cout << "Received request ";
     if (request->has_path()) { 
             cout << request->path() << "\n";
         if (request->has_op_name()) {


---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@ozone.apache.org
For additional commands, e-mail: commits-help@ozone.apache.org