From 35f301f9b7e2d9bfd0dafdec7adc782d6cd8df54 Mon Sep 17 00:00:00 2001
From: daniilchik <dprizva55@gmail.com>
Date: Mon, 23 Sep 2024 15:42:43 +0300
Subject: [PATCH 01/50] docs: fixed javadocs warnings

---
 .../hadoop/hdds/scm/storage/BlockDataStreamOutput.java |  1 -
 .../ozone/client/io/BlockInputStreamFactory.java       |  1 -
 .../ozone/client/io/BlockInputStreamFactoryImpl.java   |  1 -
 .../ozone/client/io/ECBlockInputStreamFactory.java     |  1 -
 .../ozone/client/io/ECBlockInputStreamFactoryImpl.java |  1 -
 .../io/ECBlockReconstructedStripeInputStream.java      |  2 +-
 .../hadoop/hdds/annotation/InterfaceStability.java     |  6 +++---
 .../org/apache/hadoop/hdds/recon/ReconConfigKeys.java  |  7 ++++---
 .../java/org/apache/hadoop/hdds/scm/ScmConfig.java     |  3 +--
 .../org/apache/hadoop/hdds/scm/client/ScmClient.java   |  2 +-
 .../scm/protocol/StorageContainerLocationProtocol.java |  2 +-
 .../main/java/org/apache/hadoop/ozone/OzoneConsts.java |  2 +-
 .../org/apache/hadoop/ozone/common/ChunkBuffer.java    |  5 ++---
 .../ozone/upgrade/LayoutVersionInstanceFactory.java    |  8 +++-----
 .../ozone/container/common/impl/ContainerSet.java      |  1 -
 .../common/states/endpoint/HeartbeatEndpointTask.java  |  2 +-
 .../common/states/endpoint/RegisterEndpointTask.java   |  2 +-
 .../ozone/container/common/volume/HddsVolume.java      |  2 +-
 .../ozone/container/common/volume/VolumeInfo.java      | 10 +++++-----
 .../ozone/container/common/volume/VolumeUsage.java     |  2 +-
 .../keyvalue/helpers/KeyValueContainerUtil.java        |  5 ++---
 .../ozone/container/ozoneimpl/ContainerController.java |  1 -
 ...ontainerDatanodeProtocolClientSideTranslatorPB.java |  1 -
 ...ScmBlockLocationProtocolClientSideTranslatorPB.java |  2 +-
 .../apache/hadoop/hdds/server/http/ProfileServlet.java |  2 +-
 .../org/apache/hadoop/hdds/utils/HddsServerUtil.java   |  2 +-
 .../java/org/apache/hadoop/hdds/utils/db/Table.java    |  1 -
 .../org/apache/hadoop/ozone/audit/package-info.java    |  2 +-
 .../apache/hadoop/hdds/scm/block/DeletedBlockLog.java  |  2 +-
 .../org/apache/hadoop/hdds/scm/node/NodeManager.java   |  1 -
 .../apache/hadoop/hdds/scm/node/NodeManagerMXBean.java |  2 +-
 31 files changed, 34 insertions(+), 48 deletions(-)

diff --git a/hadoop-hdds/client/src/main/java/org/apache/hadoop/hdds/scm/storage/BlockDataStreamOutput.java b/hadoop-hdds/client/src/main/java/org/apache/hadoop/hdds/scm/storage/BlockDataStreamOutput.java
index d5423d4ec0b..48c77f2c863 100644
--- a/hadoop-hdds/client/src/main/java/org/apache/hadoop/hdds/scm/storage/BlockDataStreamOutput.java
+++ b/hadoop-hdds/client/src/main/java/org/apache/hadoop/hdds/scm/storage/BlockDataStreamOutput.java
@@ -364,7 +364,6 @@ public void writeOnRetry(long len) throws IOException {
    * it is a no op.
    * @param bufferFull flag indicating whether bufferFull condition is hit or
    *              its called as part flush/close
-   * @return minimum commit index replicated to all nodes
    * @throws IOException IOException in case watch gets timed out
    */
   public void watchForCommit(boolean bufferFull) throws IOException {
diff --git a/hadoop-hdds/client/src/main/java/org/apache/hadoop/ozone/client/io/BlockInputStreamFactory.java b/hadoop-hdds/client/src/main/java/org/apache/hadoop/ozone/client/io/BlockInputStreamFactory.java
index d347dee8512..8287a5a78bb 100644
--- a/hadoop-hdds/client/src/main/java/org/apache/hadoop/ozone/client/io/BlockInputStreamFactory.java
+++ b/hadoop-hdds/client/src/main/java/org/apache/hadoop/ozone/client/io/BlockInputStreamFactory.java
@@ -43,7 +43,6 @@ public interface BlockInputStreamFactory {
    * @param blockInfo The blockInfo representing the block.
    * @param pipeline The pipeline to be used for reading the block
    * @param token The block Access Token
-   * @param verifyChecksum Whether to verify checksums or not.
    * @param xceiverFactory Factory to create the xceiver in the client
    * @param refreshFunction Function to refresh the block location if needed
    * @return BlockExtendedInputStream of the correct type.
diff --git a/hadoop-hdds/client/src/main/java/org/apache/hadoop/ozone/client/io/BlockInputStreamFactoryImpl.java b/hadoop-hdds/client/src/main/java/org/apache/hadoop/ozone/client/io/BlockInputStreamFactoryImpl.java
index 8a87234a770..d9cadc948a6 100644
--- a/hadoop-hdds/client/src/main/java/org/apache/hadoop/ozone/client/io/BlockInputStreamFactoryImpl.java
+++ b/hadoop-hdds/client/src/main/java/org/apache/hadoop/ozone/client/io/BlockInputStreamFactoryImpl.java
@@ -71,7 +71,6 @@ public BlockInputStreamFactoryImpl(ByteBufferPool byteBufferPool,
    * @param blockInfo The blockInfo representing the block.
    * @param pipeline The pipeline to be used for reading the block
    * @param token The block Access Token
-   * @param verifyChecksum Whether to verify checksums or not.
    * @param xceiverFactory Factory to create the xceiver in the client
    * @param refreshFunction Function to refresh the pipeline if needed
    * @return BlockExtendedInputStream of the correct type.
diff --git a/hadoop-hdds/client/src/main/java/org/apache/hadoop/ozone/client/io/ECBlockInputStreamFactory.java b/hadoop-hdds/client/src/main/java/org/apache/hadoop/ozone/client/io/ECBlockInputStreamFactory.java
index 66e7a31337a..aca3cfed465 100644
--- a/hadoop-hdds/client/src/main/java/org/apache/hadoop/ozone/client/io/ECBlockInputStreamFactory.java
+++ b/hadoop-hdds/client/src/main/java/org/apache/hadoop/ozone/client/io/ECBlockInputStreamFactory.java
@@ -45,7 +45,6 @@ public interface ECBlockInputStreamFactory {
    *                        know are bad and should not be used.
    * @param repConfig The replication Config
    * @param blockInfo The blockInfo representing the block.
-   * @param verifyChecksum Whether to verify checksums or not.
    * @param xceiverFactory Factory to create the xceiver in the client
    * @param refreshFunction Function to refresh the block location if needed
    * @return BlockExtendedInputStream of the correct type.
diff --git a/hadoop-hdds/client/src/main/java/org/apache/hadoop/ozone/client/io/ECBlockInputStreamFactoryImpl.java b/hadoop-hdds/client/src/main/java/org/apache/hadoop/ozone/client/io/ECBlockInputStreamFactoryImpl.java
index 01d0b0a7b7e..41c46aad379 100644
--- a/hadoop-hdds/client/src/main/java/org/apache/hadoop/ozone/client/io/ECBlockInputStreamFactoryImpl.java
+++ b/hadoop-hdds/client/src/main/java/org/apache/hadoop/ozone/client/io/ECBlockInputStreamFactoryImpl.java
@@ -68,7 +68,6 @@ private ECBlockInputStreamFactoryImpl(BlockInputStreamFactory streamFactory,
    *                        know are bad and should not be used.
    * @param repConfig The replication Config
    * @param blockInfo The blockInfo representing the block.
-   * @param verifyChecksum Whether to verify checksums or not.
    * @param xceiverFactory Factory to create the xceiver in the client
    * @param refreshFunction Function to refresh the pipeline if needed
    * @return BlockExtendedInputStream of the correct type.
diff --git a/hadoop-hdds/client/src/main/java/org/apache/hadoop/ozone/client/io/ECBlockReconstructedStripeInputStream.java b/hadoop-hdds/client/src/main/java/org/apache/hadoop/ozone/client/io/ECBlockReconstructedStripeInputStream.java
index 31f94e0acad..229cc3f3e36 100644
--- a/hadoop-hdds/client/src/main/java/org/apache/hadoop/ozone/client/io/ECBlockReconstructedStripeInputStream.java
+++ b/hadoop-hdds/client/src/main/java/org/apache/hadoop/ozone/client/io/ECBlockReconstructedStripeInputStream.java
@@ -85,7 +85,7 @@
  * Parity elements long. Missing or not needed elements should be set to null
  * in the array. The elements should be assigned to the array in EC index order.
  *
- * Assuming we have n missing data locations, where n <= parity locations, the
+ * Assuming we have n missing data locations, where n {@literal <=} parity locations, the
  * ByteBuffers passed in from the client are either assigned to the decoder
  * input array, or they are assigned to the decoder output array, where
  * reconstructed data is written. The required number of parity buffers will be
diff --git a/hadoop-hdds/common/src/main/java/org/apache/hadoop/hdds/annotation/InterfaceStability.java b/hadoop-hdds/common/src/main/java/org/apache/hadoop/hdds/annotation/InterfaceStability.java
index 4251344139a..6e9ee946790 100644
--- a/hadoop-hdds/common/src/main/java/org/apache/hadoop/hdds/annotation/InterfaceStability.java
+++ b/hadoop-hdds/common/src/main/java/org/apache/hadoop/hdds/annotation/InterfaceStability.java
@@ -27,9 +27,9 @@
  * class or method not changing over time. Currently the stability can be
  * {@link Stable}, {@link Evolving} or {@link Unstable}. <br>
  *
- * <ul><li>All classes that are annotated with {@link Public} or
- * {@link LimitedPrivate} must have InterfaceStability annotation. </li>
- * <li>Classes that are {@link Private} are to be considered unstable unless
+ * <ul><li>All classes that are annotated with {@link InterfaceAudience.Public} or
+ * {@link InterfaceAudience.LimitedPrivate} must have InterfaceStability annotation. </li>
+ * <li>Classes that are {@link InterfaceAudience.Private} are to be considered unstable unless
  * a different InterfaceStability annotation states otherwise.</li>
  * <li>Incompatible changes must not be made to classes marked as stable.</li>
  * </ul>
diff --git a/hadoop-hdds/common/src/main/java/org/apache/hadoop/hdds/recon/ReconConfigKeys.java b/hadoop-hdds/common/src/main/java/org/apache/hadoop/hdds/recon/ReconConfigKeys.java
index 3ed9f4e58e1..26790e36458 100644
--- a/hadoop-hdds/common/src/main/java/org/apache/hadoop/hdds/recon/ReconConfigKeys.java
+++ b/hadoop-hdds/common/src/main/java/org/apache/hadoop/hdds/recon/ReconConfigKeys.java
@@ -20,11 +20,12 @@
 
 /**
  * This class contains constants for Recon related configuration keys used in
- * SCM & Datanode.
+ * SCM &amp; Datanode.
  */
 public final class ReconConfigKeys {
 
-  /**
+  /**This class contains constants for Recon related configuration keys used in
+   * SCM &amp; Datanode.
    * Never constructed.
    */
   private ReconConfigKeys() {
@@ -71,7 +72,7 @@ private ReconConfigKeys() {
    * Recon administrator users delimited by a comma.
    * This is the list of users who can access admin only information from recon.
    * Users defined in
-   * {@link org.apache.hadoop.ozone.OzoneConfigKeys.OZONE_ADMINISTRATORS}
+   * {@link org.apache.hadoop.ozone.OzoneConfigKeys#OZONE_ADMINISTRATORS}
    * will always be able to access all recon information regardless of this
    * setting.
    */
diff --git a/hadoop-hdds/common/src/main/java/org/apache/hadoop/hdds/scm/ScmConfig.java b/hadoop-hdds/common/src/main/java/org/apache/hadoop/hdds/scm/ScmConfig.java
index 3ef9317ced0..dd78faf6827 100644
--- a/hadoop-hdds/common/src/main/java/org/apache/hadoop/hdds/scm/ScmConfig.java
+++ b/hadoop-hdds/common/src/main/java/org/apache/hadoop/hdds/scm/ScmConfig.java
@@ -206,8 +206,7 @@ public int getScmDefaultLayoutVersionOnInit() {
    * required for SCMSecurityProtocol where the KerberosInfo references
    * the old configuration with
    * the annotation shown below:-
-   * @KerberosInfo(serverPrincipal = ScmConfigKeys
-   *    .HDDS_SCM_KERBEROS_PRINCIPAL_KEY)
+   * {@code @KerberosInfo(serverPrincipal = ScmConfigKeys.HDDS_SCM_KERBEROS_PRINCIPAL_KEY)}
    */
   public static class ConfigStrings {
     public static final String HDDS_SCM_KERBEROS_PRINCIPAL_KEY =
diff --git a/hadoop-hdds/common/src/main/java/org/apache/hadoop/hdds/scm/client/ScmClient.java b/hadoop-hdds/common/src/main/java/org/apache/hadoop/hdds/scm/client/ScmClient.java
index 34b2680b301..1427fbf5873 100644
--- a/hadoop-hdds/common/src/main/java/org/apache/hadoop/hdds/scm/client/ScmClient.java
+++ b/hadoop-hdds/common/src/main/java/org/apache/hadoop/hdds/scm/client/ScmClient.java
@@ -414,7 +414,7 @@ StartContainerBalancerResponseProto startContainerBalancer(
    * considered to be failed if it has been sent more than MAX_RETRY limit
    * and its count is reset to -1.
    *
-   * @param count Maximum num of returned transactions, if < 0. return all.
+   * @param count Maximum num of returned transactions, if {@literal < 0}. return all.
    * @param startTxId The least transaction id to start with.
    * @return a list of failed deleted block transactions.
    * @throws IOException
diff --git a/hadoop-hdds/common/src/main/java/org/apache/hadoop/hdds/scm/protocol/StorageContainerLocationProtocol.java b/hadoop-hdds/common/src/main/java/org/apache/hadoop/hdds/scm/protocol/StorageContainerLocationProtocol.java
index 45825cb2b62..f280e9bb6e7 100644
--- a/hadoop-hdds/common/src/main/java/org/apache/hadoop/hdds/scm/protocol/StorageContainerLocationProtocol.java
+++ b/hadoop-hdds/common/src/main/java/org/apache/hadoop/hdds/scm/protocol/StorageContainerLocationProtocol.java
@@ -337,7 +337,7 @@ Pipeline createReplicationPipeline(HddsProtos.ReplicationType type,
    * considered to be failed if it has been sent more than MAX_RETRY limit
    * and its count is reset to -1.
    *
-   * @param count Maximum num of returned transactions, if < 0. return all.
+   * @param count Maximum num of returned transactions, if {@literal < 0}. return all.
    * @param startTxId The least transaction id to start with.
    * @return a list of failed deleted block transactions.
    * @throws IOException
diff --git a/hadoop-hdds/common/src/main/java/org/apache/hadoop/ozone/OzoneConsts.java b/hadoop-hdds/common/src/main/java/org/apache/hadoop/ozone/OzoneConsts.java
index c6023ccd071..101507b502e 100644
--- a/hadoop-hdds/common/src/main/java/org/apache/hadoop/ozone/OzoneConsts.java
+++ b/hadoop-hdds/common/src/main/java/org/apache/hadoop/ozone/OzoneConsts.java
@@ -363,7 +363,7 @@ private OzoneConsts() {
    * contains illegal characters when creating/renaming key.
    *
    * Avoid the following characters in a key name:
-   * "\", "{", "}", "<", ">", "^", "%", "~", "#", "|", "`", "[", "]", Quotation
+   * {@literal "\", "{", "}", "<", ">", "^", "%", "~", "#", "|", "`", "[", "]"}, Quotation
    * marks and Non-printable ASCII characters (128–255 decimal characters).
    * https://docs.aws.amazon.com/AmazonS3/latest/userguide/object-keys.html
    */
diff --git a/hadoop-hdds/common/src/main/java/org/apache/hadoop/ozone/common/ChunkBuffer.java b/hadoop-hdds/common/src/main/java/org/apache/hadoop/ozone/common/ChunkBuffer.java
index d3a558ca430..a24d39e5dac 100644
--- a/hadoop-hdds/common/src/main/java/org/apache/hadoop/ozone/common/ChunkBuffer.java
+++ b/hadoop-hdds/common/src/main/java/org/apache/hadoop/ozone/common/ChunkBuffer.java
@@ -39,13 +39,12 @@ static ChunkBuffer allocate(int capacity) {
     return allocate(capacity, 0);
   }
 
-  /**
-   * Similar to {@link ByteBuffer#allocate(int)}
+  /** Similar to {@link ByteBuffer#allocate(int)}
    * except that it can specify the increment.
    *
    * @param increment
    *   the increment size so that this buffer is allocated incrementally.
-   *   When increment <= 0, entire buffer is allocated in the beginning.
+   *   When increment {@literal <= 0}, entire buffer is allocated in the beginning.
    */
   static ChunkBuffer allocate(int capacity, int increment) {
     if (increment > 0 && increment < capacity) {
diff --git a/hadoop-hdds/common/src/main/java/org/apache/hadoop/ozone/upgrade/LayoutVersionInstanceFactory.java b/hadoop-hdds/common/src/main/java/org/apache/hadoop/ozone/upgrade/LayoutVersionInstanceFactory.java
index 83e63a2a322..2e32182ee9a 100644
--- a/hadoop-hdds/common/src/main/java/org/apache/hadoop/ozone/upgrade/LayoutVersionInstanceFactory.java
+++ b/hadoop-hdds/common/src/main/java/org/apache/hadoop/ozone/upgrade/LayoutVersionInstanceFactory.java
@@ -37,18 +37,16 @@
 
 /**
  * Generic factory which stores different instances of Type 'T' sharded by
- * a key & version. A single key can be associated with different versions
+ * a key &amp; version. A single key can be associated with different versions
  * of 'T'.
- *
  * Why does this class exist?
  * A typical use case during upgrade is to have multiple versions of a class
  * / method / object and chose them based  on current layout
  * version at runtime. Before finalizing, an older version is typically
  * needed, and after finalize, a newer version is needed. This class serves
  * this purpose in a generic way.
- *
  * For example, we can create a Factory to create multiple versions of
- * OMRequests sharded by Request Type & Layout Version Supported.
+ * OMRequests sharded by Request Type &amp; Layout Version Supported.
  */
 public class LayoutVersionInstanceFactory<T> {
 
@@ -141,7 +139,7 @@ private boolean isValid(LayoutVersionManager lvm, int version) {
    * From the list of versioned instances for a given "key", this
    * returns the "floor" value corresponding to the given version.
    * For example, if we have key = "CreateKey",  entry -> [(1, CreateKeyV1),
-   * (3, CreateKeyV2), and if the passed in key = CreateKey & version = 2, we
+   * (3, CreateKeyV2), and if the passed in key = CreateKey &amp; version = 2, we
    * return CreateKeyV1.
    * Since this is a priority queue based implementation, we use a O(1) peek()
    * lookup to get the current valid version.
diff --git a/hadoop-hdds/container-service/src/main/java/org/apache/hadoop/ozone/container/common/impl/ContainerSet.java b/hadoop-hdds/container-service/src/main/java/org/apache/hadoop/ozone/container/common/impl/ContainerSet.java
index b5dfd07d576..15cc6245ddb 100644
--- a/hadoop-hdds/container-service/src/main/java/org/apache/hadoop/ozone/container/common/impl/ContainerSet.java
+++ b/hadoop-hdds/container-service/src/main/java/org/apache/hadoop/ozone/container/common/impl/ContainerSet.java
@@ -189,7 +189,6 @@ public int containerCount() {
    * Send FCR which will not contain removed containers.
    *
    * @param  context StateContext
-   * @return
    */
   public void handleVolumeFailures(StateContext context) {
     AtomicBoolean failedVolume = new AtomicBoolean(false);
diff --git a/hadoop-hdds/container-service/src/main/java/org/apache/hadoop/ozone/container/common/states/endpoint/HeartbeatEndpointTask.java b/hadoop-hdds/container-service/src/main/java/org/apache/hadoop/ozone/container/common/states/endpoint/HeartbeatEndpointTask.java
index 44f0eae49ea..25db14a1012 100644
--- a/hadoop-hdds/container-service/src/main/java/org/apache/hadoop/ozone/container/common/states/endpoint/HeartbeatEndpointTask.java
+++ b/hadoop-hdds/container-service/src/main/java/org/apache/hadoop/ozone/container/common/states/endpoint/HeartbeatEndpointTask.java
@@ -489,7 +489,7 @@ public Builder setEndpointStateMachine(EndpointStateMachine rpcEndPoint) {
     /**
      * Sets the LayoutVersionManager.
      *
-     * @param versionMgr - config
+     * @param lvm config
      * @return Builder
      */
     public Builder setLayoutVersionManager(HDDSLayoutVersionManager lvm) {
diff --git a/hadoop-hdds/container-service/src/main/java/org/apache/hadoop/ozone/container/common/states/endpoint/RegisterEndpointTask.java b/hadoop-hdds/container-service/src/main/java/org/apache/hadoop/ozone/container/common/states/endpoint/RegisterEndpointTask.java
index 71f95cc4d32..969756b40f8 100644
--- a/hadoop-hdds/container-service/src/main/java/org/apache/hadoop/ozone/container/common/states/endpoint/RegisterEndpointTask.java
+++ b/hadoop-hdds/container-service/src/main/java/org/apache/hadoop/ozone/container/common/states/endpoint/RegisterEndpointTask.java
@@ -244,7 +244,7 @@ public Builder setConfig(ConfigurationSource config) {
     /**
      * Sets the LayoutVersionManager.
      *
-     * @param versionMgr - config
+     * @param lvm config
      * @return Builder.
      */
     public Builder setLayoutVersionManager(HDDSLayoutVersionManager lvm) {
diff --git a/hadoop-hdds/container-service/src/main/java/org/apache/hadoop/ozone/container/common/volume/HddsVolume.java b/hadoop-hdds/container-service/src/main/java/org/apache/hadoop/ozone/container/common/volume/HddsVolume.java
index b22b9148bb1..efdecc65ffb 100644
--- a/hadoop-hdds/container-service/src/main/java/org/apache/hadoop/ozone/container/common/volume/HddsVolume.java
+++ b/hadoop-hdds/container-service/src/main/java/org/apache/hadoop/ozone/container/common/volume/HddsVolume.java
@@ -199,7 +199,7 @@ public void shutdown() {
 
   /**
    * Delete all files under
-   * <volume>/hdds/<cluster-id>/tmp/deleted-containers.
+   * &lt;volume&gt;/hdds/&lt;cluster-id&gt;/tmp/deleted-containers.
    * This is the directory where containers are moved when they are deleted
    * from the system, but before being removed from the filesystem. This
    * makes the deletion atomic.
diff --git a/hadoop-hdds/container-service/src/main/java/org/apache/hadoop/ozone/container/common/volume/VolumeInfo.java b/hadoop-hdds/container-service/src/main/java/org/apache/hadoop/ozone/container/common/volume/VolumeInfo.java
index af890269255..0bedd4a089c 100644
--- a/hadoop-hdds/container-service/src/main/java/org/apache/hadoop/ozone/container/common/volume/VolumeInfo.java
+++ b/hadoop-hdds/container-service/src/main/java/org/apache/hadoop/ozone/container/common/volume/VolumeInfo.java
@@ -46,15 +46,15 @@
  * - fsCapacity: reported total capacity from local fs.
  * - minVolumeFreeSpace (mvfs) : determines the free space for closing
      containers.This is like adding a few reserved bytes to reserved space.
-     Dn's will send close container action to SCM at this limit & it is
+     Dn's will send close container action to SCM at this limit &amp; it is
      configurable.
 
  *
  *
  * |----used----|   (avail)   |++mvfs++|++++reserved+++++++|
- * |<-     capacity                  ->|
+ * |&lt;-     capacity                  -&gt;|
  *              |     fsAvail      |-------other-----------|
- * |<-                   fsCapacity                      ->|
+ * |&lt;-                   fsCapacity                      -&gt;|
  *
  * What we could directly get from local fs:
  *     fsCapacity, fsAvail, (fsUsed = fsCapacity - fsAvail)
@@ -80,7 +80,7 @@
  * Then it is much simpler, since we don't care about other usage:
  *
  *  |----used----|             (avail)/fsAvail              |
- *  |<-              capacity/fsCapacity                  ->|
+ *  |&lt;-              capacity/fsCapacity                  -&gt;|
  *
  *  We have avail == fsAvail.
  */
@@ -155,7 +155,7 @@ public long getCapacity() {
   /**
    * Calculate available space use method A.
    * |----used----|   (avail)   |++++++++reserved++++++++|
-   * |<-     capacity         ->|
+   * |&lt;-     capacity         -&gt;|
    *
    * A) avail = capacity - used
    */
diff --git a/hadoop-hdds/container-service/src/main/java/org/apache/hadoop/ozone/container/common/volume/VolumeUsage.java b/hadoop-hdds/container-service/src/main/java/org/apache/hadoop/ozone/container/common/volume/VolumeUsage.java
index 7e138b05716..f0625464755 100644
--- a/hadoop-hdds/container-service/src/main/java/org/apache/hadoop/ozone/container/common/volume/VolumeUsage.java
+++ b/hadoop-hdds/container-service/src/main/java/org/apache/hadoop/ozone/container/common/volume/VolumeUsage.java
@@ -80,7 +80,7 @@ public long getUsedSpace() {
    * Calculate available space use method B.
    * |----used----|   (avail)   |++++++++reserved++++++++|
    *              |     fsAvail      |-------other-------|
-   *                          ->|~~~~|<-
+   *                          -&gt;|~~~~|&lt;-
    *                      remainingReserved
    * B) avail = fsAvail - Max(reserved - other, 0);
    */
diff --git a/hadoop-hdds/container-service/src/main/java/org/apache/hadoop/ozone/container/keyvalue/helpers/KeyValueContainerUtil.java b/hadoop-hdds/container-service/src/main/java/org/apache/hadoop/ozone/container/keyvalue/helpers/KeyValueContainerUtil.java
index b7d5b5fa59e..dfd0b51775d 100644
--- a/hadoop-hdds/container-service/src/main/java/org/apache/hadoop/ozone/container/keyvalue/helpers/KeyValueContainerUtil.java
+++ b/hadoop-hdds/container-service/src/main/java/org/apache/hadoop/ozone/container/keyvalue/helpers/KeyValueContainerUtil.java
@@ -439,13 +439,13 @@ public static boolean isSameSchemaVersion(String schema, String other) {
 
   /**
    * Moves container directory to a new location
-   * under "<volume>/hdds/<cluster-id>/tmp/deleted-containers"
+   * under "&lt;volume&gt;/hdds/&lt;cluster-id&gt;/tmp/deleted-containers"
    * and updates metadata and chunks path.
    * Containers will be moved under it before getting deleted
    * to avoid, in case of failure, having artifact leftovers
    * on the default container path on the disk.
    *
-   * Delete operation for Schema < V3
+   * Delete operation for Schema &lt; V3
    * 1. Container is marked DELETED
    * 2. Container is removed from memory container set
    * 3. Container DB handler from cache is removed and closed
@@ -460,7 +460,6 @@ public static boolean isSameSchemaVersion(String schema, String other) {
    * 5. Container is deleted from tmp directory.
    *
    * @param keyValueContainerData
-   * @return true if renaming was successful
    */
   public static void moveToDeletedContainerDir(
       KeyValueContainerData keyValueContainerData,
diff --git a/hadoop-hdds/container-service/src/main/java/org/apache/hadoop/ozone/container/ozoneimpl/ContainerController.java b/hadoop-hdds/container-service/src/main/java/org/apache/hadoop/ozone/container/ozoneimpl/ContainerController.java
index ecc4e80b4bf..0db98a01d82 100644
--- a/hadoop-hdds/container-service/src/main/java/org/apache/hadoop/ozone/container/ozoneimpl/ContainerController.java
+++ b/hadoop-hdds/container-service/src/main/java/org/apache/hadoop/ozone/container/ozoneimpl/ContainerController.java
@@ -163,7 +163,6 @@ public void closeContainer(final long containerId) throws IOException {
    * Returns the Container given a container id.
    *
    * @param containerId ID of the container
-   * @return Container
    */
   public void addFinalizedBlock(final long containerId,
       final long localId) {
diff --git a/hadoop-hdds/container-service/src/main/java/org/apache/hadoop/ozone/protocolPB/StorageContainerDatanodeProtocolClientSideTranslatorPB.java b/hadoop-hdds/container-service/src/main/java/org/apache/hadoop/ozone/protocolPB/StorageContainerDatanodeProtocolClientSideTranslatorPB.java
index eeb99b5a3db..d6b44f2a641 100644
--- a/hadoop-hdds/container-service/src/main/java/org/apache/hadoop/ozone/protocolPB/StorageContainerDatanodeProtocolClientSideTranslatorPB.java
+++ b/hadoop-hdds/container-service/src/main/java/org/apache/hadoop/ozone/protocolPB/StorageContainerDatanodeProtocolClientSideTranslatorPB.java
@@ -122,7 +122,6 @@ private SCMDatanodeResponse submitRequest(Type type,
   /**
    * Returns SCM version.
    *
-   * @param unused - set to null and unused.
    * @return Version info.
    */
   @Override
diff --git a/hadoop-hdds/framework/src/main/java/org/apache/hadoop/hdds/scm/protocolPB/ScmBlockLocationProtocolClientSideTranslatorPB.java b/hadoop-hdds/framework/src/main/java/org/apache/hadoop/hdds/scm/protocolPB/ScmBlockLocationProtocolClientSideTranslatorPB.java
index 1f114304cca..3c6222049b4 100644
--- a/hadoop-hdds/framework/src/main/java/org/apache/hadoop/hdds/scm/protocolPB/ScmBlockLocationProtocolClientSideTranslatorPB.java
+++ b/hadoop-hdds/framework/src/main/java/org/apache/hadoop/hdds/scm/protocolPB/ScmBlockLocationProtocolClientSideTranslatorPB.java
@@ -307,7 +307,7 @@ public boolean addSCM(AddSCMRequest request) throws IOException {
   }
   /**
    * Sort the datanodes based on distance from client.
-   * @return List<DatanodeDetails></>
+   * @return List&lt;DatanodeDetails&gt;
    * @throws IOException
    */
   @Override
diff --git a/hadoop-hdds/framework/src/main/java/org/apache/hadoop/hdds/server/http/ProfileServlet.java b/hadoop-hdds/framework/src/main/java/org/apache/hadoop/hdds/server/http/ProfileServlet.java
index f4f188aaf39..34d6dfb9661 100644
--- a/hadoop-hdds/framework/src/main/java/org/apache/hadoop/hdds/server/http/ProfileServlet.java
+++ b/hadoop-hdds/framework/src/main/java/org/apache/hadoop/hdds/server/http/ProfileServlet.java
@@ -79,7 +79,7 @@
  * curl "http://localhost:10002/prof"
  * - To collect 1 minute CPU profile of current process and output in tree
  * format (html)
- * curl "http://localhost:10002/prof?output=tree&duration=60"
+ * curl {@literal "http://localhost:10002/prof?output=tree&duration=60"}
  * - To collect 30 second heap allocation profile of current process (returns
  * FlameGraph svg)
  * curl "http://localhost:10002/prof?event=alloc"
diff --git a/hadoop-hdds/framework/src/main/java/org/apache/hadoop/hdds/utils/HddsServerUtil.java b/hadoop-hdds/framework/src/main/java/org/apache/hadoop/hdds/utils/HddsServerUtil.java
index c45e772c241..3bcd5532b98 100644
--- a/hadoop-hdds/framework/src/main/java/org/apache/hadoop/hdds/utils/HddsServerUtil.java
+++ b/hadoop-hdds/framework/src/main/java/org/apache/hadoop/hdds/utils/HddsServerUtil.java
@@ -129,7 +129,7 @@ private HddsServerUtil() {
    * @param conf configuration
    * @param protocol Protocol interface
    * @param service service that implements the protocol
-   * @param server RPC server to which the protocol & implementation is added to
+   * @param server RPC server to which the protocol &amp; implementation is added to
    */
   public static void addPBProtocol(Configuration conf, Class<?> protocol,
       BlockingService service, RPC.Server server) throws IOException {
diff --git a/hadoop-hdds/framework/src/main/java/org/apache/hadoop/hdds/utils/db/Table.java b/hadoop-hdds/framework/src/main/java/org/apache/hadoop/hdds/utils/db/Table.java
index f153823db7c..5cfdcdb8a03 100644
--- a/hadoop-hdds/framework/src/main/java/org/apache/hadoop/hdds/utils/db/Table.java
+++ b/hadoop-hdds/framework/src/main/java/org/apache/hadoop/hdds/utils/db/Table.java
@@ -308,7 +308,6 @@ List<? extends KeyValue<KEY, VALUE>> getSequentialRangeKVs(KEY startKey,
    * as part of a batch operation.
    * @param batch
    * @param prefix
-   * @return
    */
   void deleteBatchWithPrefix(BatchOperation batch, KEY prefix)
       throws IOException;
diff --git a/hadoop-hdds/framework/src/main/java/org/apache/hadoop/ozone/audit/package-info.java b/hadoop-hdds/framework/src/main/java/org/apache/hadoop/ozone/audit/package-info.java
index 0c1ec710d2c..981f168ddba 100644
--- a/hadoop-hdds/framework/src/main/java/org/apache/hadoop/ozone/audit/package-info.java
+++ b/hadoop-hdds/framework/src/main/java/org/apache/hadoop/ozone/audit/package-info.java
@@ -48,7 +48,7 @@
  * This interface must be implemented by entities requiring audit logging.
  * For example - OMVolumeArgs, OMBucketArgs.
  * The implementing class must override toAuditMap() to return an
- * instance of Map<Key, Value> where both Key and Value are String.
+ * instance of Map&lt;Key, Value&gt; where both Key and Value are String.
  *
  * Key: must contain printable US ASCII characters
  * May not contain a space, =, ], or "
diff --git a/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/block/DeletedBlockLog.java b/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/block/DeletedBlockLog.java
index 45d53c0ef2c..5ec68c78d74 100644
--- a/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/block/DeletedBlockLog.java
+++ b/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/block/DeletedBlockLog.java
@@ -57,7 +57,7 @@ DatanodeDeletedBlockTransactions getTransactions(
    * considered to be failed if it has been sent more than MAX_RETRY limit
    * and its count is reset to -1.
    *
-   * @param count Maximum num of returned transactions, if < 0. return all.
+   * @param count Maximum num of returned transactions, if &lt; 0. return all.
    * @param startTxId The least transaction id to start with.
    * @return a list of failed deleted block transactions.
    * @throws IOException
diff --git a/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/node/NodeManager.java b/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/node/NodeManager.java
index 25be60945a9..ec148301d73 100644
--- a/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/node/NodeManager.java
+++ b/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/node/NodeManager.java
@@ -97,7 +97,6 @@ default RegisteredCommand register(
    * @param type The type of the SCMCommand.
    * @param scmCommand A BiConsumer that takes a DatanodeDetails and a
    *                   SCMCommand object and performs the necessary actions.
-   * @return whatever the regular register command returns with default
    * layout version passed in.
    */
   default void registerSendCommandNotify(SCMCommandProto.Type type,
diff --git a/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/node/NodeManagerMXBean.java b/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/node/NodeManagerMXBean.java
index a66fc0d22fb..3b7f8480f57 100644
--- a/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/node/NodeManagerMXBean.java
+++ b/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/node/NodeManagerMXBean.java
@@ -45,7 +45,7 @@ public interface NodeManagerMXBean {
 
   /**
    * @return Get the NodeStatus table information  like hostname,
-   * Commissioned State & Operational State column for dataNode
+   * Commissioned State &amp; Operational State column for dataNode
    */
   Map<String, Map<String, String>> getNodeStatusInfo();
 

From 32a30fd8d7f7fb6fa58ea58b72991733d8045519 Mon Sep 17 00:00:00 2001
From: daniilchik <dprizva55@gmail.com>
Date: Mon, 23 Sep 2024 16:49:31 +0300
Subject: [PATCH 02/50] docs: fixed javadocs warnings

---
 .../apache/hadoop/hdds/scm/SCMCommonPlacementPolicy.java  | 8 ++++----
 .../hadoop/hdds/scm/container/ContainerManager.java       | 1 -
 .../scm/container/placement/metrics/SCMNodeMetric.java    | 3 +--
 .../org/apache/hadoop/hdds/scm/node/NodeStateManager.java | 4 ++--
 .../hadoop/hdds/scm/pipeline/PipelineStateManager.java    | 3 +--
 .../hadoop/hdds/scm/security/RootCARotationManager.java   | 4 ++--
 .../hdds/scm/server/SCMDatanodeHeartbeatDispatcher.java   | 4 ++--
 .../hadoop/hdds/scm/server/SCMHTTPServerConfig.java       | 7 ++++---
 .../src/main/java/org/apache/hadoop/ozone/OFSPath.java    | 2 +-
 .../ozone/om/exceptions/OMLeaderNotReadyException.java    | 2 +-
 .../apache/hadoop/ozone/om/helpers/RepeatedOmKeyInfo.java | 2 +-
 .../org/apache/hadoop/ozone/om/helpers/SnapshotInfo.java  | 2 +-
 .../apache/hadoop/ozone/security/acl/OzoneObjInfo.java    | 2 +-
 .../org/apache/hadoop/ozone/om/OMMetadataManager.java     | 2 +-
 .../java/org/apache/hadoop/ozone/om/ListIterator.java     | 2 +-
 .../org/apache/hadoop/ozone/om/OMMultiTenantManager.java  | 2 +-
 .../apache/hadoop/ozone/om/OMMultiTenantManagerImpl.java  | 1 -
 .../hadoop/ozone/om/multitenant/AuthorizerLock.java       | 2 +-
 .../hadoop/ozone/om/request/key/OMKeyCommitRequest.java   | 1 -
 .../apache/hadoop/ozone/om/request/key/OMKeyRequest.java  | 2 +-
 .../org/apache/hadoop/fs/ozone/OzoneFSInputStream.java    | 1 -
 21 files changed, 26 insertions(+), 31 deletions(-)

diff --git a/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/SCMCommonPlacementPolicy.java b/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/SCMCommonPlacementPolicy.java
index 471a9479412..6489eeffe81 100644
--- a/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/SCMCommonPlacementPolicy.java
+++ b/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/SCMCommonPlacementPolicy.java
@@ -582,7 +582,7 @@ protected Node getPlacementGroup(DatanodeDetails dn) {
    * replication is computed.
    * The algorithm starts with creating a replicaIdMap which contains the
    * replicas grouped by replica Index. A placementGroup Map is created which
-   * groups replicas based on their rack & the replicas within the rack
+   * groups replicas based on their rack &amp; the replicas within the rack
    * are further grouped based on the replica Index.
    * A placement Group Count Map is created which keeps
    * track of the count of replicas in each rack.
@@ -590,9 +590,9 @@ protected Node getPlacementGroup(DatanodeDetails dn) {
    * order based on their current replication factor in a descending factor.
    * For each replica Index the replica is removed from the rack which contains
    * the most replicas, in order to achieve this the racks are put
-   * into priority queue & are based on the number of replicas they have.
-   * The replica is removed from the rack with maximum replicas & the replica
-   * to be removed is also removed from the maps created above &
+   * into priority queue &amp; are based on the number of replicas they have.
+   * The replica is removed from the rack with maximum replicas &amp; the replica
+   * to be removed is also removed from the maps created above &amp;
    * the count for rack is reduced.
    * The set of replicas computed are then returned by the function.
    * @param replicas: Set of existing replicas of the container
diff --git a/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/container/ContainerManager.java b/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/container/ContainerManager.java
index 3eba240533e..af900d1c146 100644
--- a/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/container/ContainerManager.java
+++ b/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/container/ContainerManager.java
@@ -164,7 +164,6 @@ void updateContainerReplica(ContainerID containerID, ContainerReplica replica)
    *
    * @param containerID Container ID
    * @param replica ContainerReplica
-   * @return True of dataNode is removed successfully else false.
    */
   void removeContainerReplica(ContainerID containerID, ContainerReplica replica)
       throws ContainerNotFoundException, ContainerReplicaNotFoundException;
diff --git a/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/container/placement/metrics/SCMNodeMetric.java b/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/container/placement/metrics/SCMNodeMetric.java
index 094e535dcbd..3d113b3d301 100644
--- a/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/container/placement/metrics/SCMNodeMetric.java
+++ b/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/container/placement/metrics/SCMNodeMetric.java
@@ -42,8 +42,7 @@ public SCMNodeMetric(SCMNodeStat stat) {
    * @param capacity  in bytes
    * @param used      in bytes
    * @param remaining in bytes
-   * @param committed
-   * @paaram committed in bytes
+   * @param committed in bytes
    */
   @VisibleForTesting
   public SCMNodeMetric(long capacity, long used, long remaining,
diff --git a/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/node/NodeStateManager.java b/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/node/NodeStateManager.java
index 3c3ff8fb833..78c1801a103 100644
--- a/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/node/NodeStateManager.java
+++ b/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/node/NodeStateManager.java
@@ -791,7 +791,7 @@ public void run() {
    *
    * This method is synchronized to coordinate node state updates between
    * the upgrade finalization thread which calls this method, and the
-   * node health processing thread that calls {@link this#checkNodesHealth}.
+   * node health processing thread that calls {@link #checkNodesHealth}.
    */
   public synchronized void forceNodesToHealthyReadOnly() {
     try {
@@ -817,7 +817,7 @@ public synchronized void forceNodesToHealthyReadOnly() {
   /**
    * This method is synchronized to coordinate node state updates between
    * the upgrade finalization thread which calls
-   * {@link this#forceNodesToHealthyReadOnly}, and the node health processing
+   * {@link #forceNodesToHealthyReadOnly}, and the node health processing
    * thread that calls this method.
    */
   @VisibleForTesting
diff --git a/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/pipeline/PipelineStateManager.java b/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/pipeline/PipelineStateManager.java
index 4dd0443a505..94b56186a93 100644
--- a/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/pipeline/PipelineStateManager.java
+++ b/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/pipeline/PipelineStateManager.java
@@ -45,8 +45,7 @@ void addPipeline(HddsProtos.Pipeline pipelineProto)
 
   /**
    * Removing pipeline would be replicated to Ratis.
-   * @param pipelineIDProto
-   * @return Pipeline removed
+   * @param pipelineIDProto Pipeline
    * @throws IOException
    */
   @Replicate
diff --git a/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/security/RootCARotationManager.java b/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/security/RootCARotationManager.java
index d38a904d09c..0e03203406e 100644
--- a/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/security/RootCARotationManager.java
+++ b/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/security/RootCARotationManager.java
@@ -121,7 +121,7 @@ public class RootCARotationManager extends StatefulService {
    *                         (1)   (3)(4)
    *                   --------------------------->
    *                         (2)                        scm2(Follower)
-   *    (1) (3)(4)     <---------------------------
+   *    (1) (3)(4)     &lt;---------------------------
    *     -------      |
    *    |        \   |
    *     ----->  scm1(Leader)
@@ -129,7 +129,7 @@ public class RootCARotationManager extends StatefulService {
    *     ------->      \      (1)  (3)(4)
    *                   --------------------------->
    *                          (2)                       scm3(Follower)
-   *                   <---------------------------
+   *                   &lt;---------------------------
    *
    *
    *   (1) Rotation Prepare
diff --git a/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/server/SCMDatanodeHeartbeatDispatcher.java b/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/server/SCMDatanodeHeartbeatDispatcher.java
index cca2df00374..6f5429a853b 100644
--- a/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/server/SCMDatanodeHeartbeatDispatcher.java
+++ b/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/server/SCMDatanodeHeartbeatDispatcher.java
@@ -289,12 +289,12 @@ public interface ContainerReport {
   public enum ContainerReportType {
     /**
      * Incremental container report type
-     * {@liks IncrementalContainerReportFromDatanode}.
+     * {@link IncrementalContainerReportFromDatanode}.
      */
     ICR,
     /**
      * Full container report type
-     * {@liks ContainerReportFromDatanode}.
+     * {@link ContainerReportFromDatanode}.
      */
     FCR
   }
diff --git a/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/server/SCMHTTPServerConfig.java b/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/server/SCMHTTPServerConfig.java
index 2b6fa032b53..5aaf4b7b485 100644
--- a/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/server/SCMHTTPServerConfig.java
+++ b/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/server/SCMHTTPServerConfig.java
@@ -70,9 +70,10 @@ public String getKerberosKeytab() {
    * This static class is required to support other classes
    * that reference the key names and also require attributes.
    * Example: SCMSecurityProtocol where the KerberosInfo references
-   * the old configuration with the annotation shown below:-
-   * @KerberosInfo(serverPrincipal =
-   *    ScmConfigKeys.HDDS_SCM_KERBEROS_PRINCIPAL_KEY)
+   * the old configuration with the annotation shown below:
+   * <br>
+   * {@code KerberosInfo(serverPrincipal =
+   *    ScmConfigKeys.HDDS_SCM_KERBEROS_PRINCIPAL_KEY)}
    */
   public static class ConfigStrings {
     public static final String HDDS_SCM_HTTP_AUTH_CONFIG_PREFIX =
diff --git a/hadoop-ozone/common/src/main/java/org/apache/hadoop/ozone/OFSPath.java b/hadoop-ozone/common/src/main/java/org/apache/hadoop/ozone/OFSPath.java
index 61ae0879f78..c936c143a80 100644
--- a/hadoop-ozone/common/src/main/java/org/apache/hadoop/ozone/OFSPath.java
+++ b/hadoop-ozone/common/src/main/java/org/apache/hadoop/ozone/OFSPath.java
@@ -214,7 +214,7 @@ public String toString() {
   }
 
   /**
-   * Get the volume & bucket or mount name (non-key path).
+   * Get the volume &amp; bucket or mount name (non-key path).
    * @return String of path excluding key in bucket.
    */
   // Prepend a delimiter at beginning. e.g. /vol1/buc1
diff --git a/hadoop-ozone/common/src/main/java/org/apache/hadoop/ozone/om/exceptions/OMLeaderNotReadyException.java b/hadoop-ozone/common/src/main/java/org/apache/hadoop/ozone/om/exceptions/OMLeaderNotReadyException.java
index 0bfd6922fee..8c3943d0fab 100644
--- a/hadoop-ozone/common/src/main/java/org/apache/hadoop/ozone/om/exceptions/OMLeaderNotReadyException.java
+++ b/hadoop-ozone/common/src/main/java/org/apache/hadoop/ozone/om/exceptions/OMLeaderNotReadyException.java
@@ -24,7 +24,7 @@
  * Exception thrown by
  * {@link org.apache.hadoop.ozone.om.protocolPB.OzoneManagerProtocolPB} when
  * OM leader is not ready to serve requests. This error is thrown when Raft
- * Server returns {@link org.apache.ratis.protocol.LeaderNotReadyException}.
+ * Server returns {@link org.apache.ratis.protocol.exceptions.LeaderNotReadyException}.
  */
 public class OMLeaderNotReadyException extends IOException  {
 
diff --git a/hadoop-ozone/common/src/main/java/org/apache/hadoop/ozone/om/helpers/RepeatedOmKeyInfo.java b/hadoop-ozone/common/src/main/java/org/apache/hadoop/ozone/om/helpers/RepeatedOmKeyInfo.java
index 24c172ef8fd..6dc17d5bc26 100644
--- a/hadoop-ozone/common/src/main/java/org/apache/hadoop/ozone/om/helpers/RepeatedOmKeyInfo.java
+++ b/hadoop-ozone/common/src/main/java/org/apache/hadoop/ozone/om/helpers/RepeatedOmKeyInfo.java
@@ -34,7 +34,7 @@
 /**
  * Args for deleted keys. This is written to om metadata deletedTable.
  * Once a key is deleted, it is moved to om metadata deletedTable. Having a
- * {label: List<OMKeyInfo>} ensures that if users create & delete keys with
+ * label: {@code List<OMKeyInfo>} ensures that if users create &amp; delete keys with
  * exact same uri multiple times, all the delete instances are bundled under
  * the same key name. This is useful as part of GDPR compliance where an
  * admin wants to confirm if a given key is deleted from deletedTable metadata.
diff --git a/hadoop-ozone/common/src/main/java/org/apache/hadoop/ozone/om/helpers/SnapshotInfo.java b/hadoop-ozone/common/src/main/java/org/apache/hadoop/ozone/om/helpers/SnapshotInfo.java
index 8584796c2e9..0f5593643c9 100644
--- a/hadoop-ozone/common/src/main/java/org/apache/hadoop/ozone/om/helpers/SnapshotInfo.java
+++ b/hadoop-ozone/common/src/main/java/org/apache/hadoop/ozone/om/helpers/SnapshotInfo.java
@@ -52,7 +52,7 @@
  * Each snapshot created has an associated SnapshotInfo entry
  * containing the snapshotId, snapshot path,
  * snapshot checkpoint directory, previous snapshotId
- * for the snapshot path & global amongst other necessary fields.
+ * for the snapshot path &amp; global amongst other necessary fields.
  */
 public final class SnapshotInfo implements Auditable, CopyObject<SnapshotInfo> {
   private static final Codec<SnapshotInfo> CODEC = new DelegatedCodec<>(
diff --git a/hadoop-ozone/common/src/main/java/org/apache/hadoop/ozone/security/acl/OzoneObjInfo.java b/hadoop-ozone/common/src/main/java/org/apache/hadoop/ozone/security/acl/OzoneObjInfo.java
index ca32c96855d..e1f1f3a8c1e 100644
--- a/hadoop-ozone/common/src/main/java/org/apache/hadoop/ozone/security/acl/OzoneObjInfo.java
+++ b/hadoop-ozone/common/src/main/java/org/apache/hadoop/ozone/security/acl/OzoneObjInfo.java
@@ -24,7 +24,7 @@
 
 /**
  * Class representing an ozone object.
- * It can be a volume with non-null volumeName (bucketName=null & name=null)
+ * It can be a volume with non-null volumeName {@literal (bucketName=null & name=null)}
  * or a bucket with non-null volumeName and bucketName (name=null)
  * or a key with non-null volumeName, bucketName and key name
  * (via getKeyName)
diff --git a/hadoop-ozone/interface-storage/src/main/java/org/apache/hadoop/ozone/om/OMMetadataManager.java b/hadoop-ozone/interface-storage/src/main/java/org/apache/hadoop/ozone/om/OMMetadataManager.java
index 67f7ce2f07c..7ec0e8349da 100644
--- a/hadoop-ozone/interface-storage/src/main/java/org/apache/hadoop/ozone/om/OMMetadataManager.java
+++ b/hadoop-ozone/interface-storage/src/main/java/org/apache/hadoop/ozone/om/OMMetadataManager.java
@@ -647,7 +647,7 @@ String getMultipartKey(long volumeId, long bucketId,
   long getBucketId(String volume, String bucket) throws IOException;
 
   /**
-   * Returns List<{@link BlockGroup}> for a key in the deletedTable.
+   * Returns List&lt;{@link BlockGroup}&gt; for a key in the deletedTable.
    * @param deletedKey - key to be purged from the deletedTable
    * @return {@link BlockGroup}
    */
diff --git a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/ListIterator.java b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/ListIterator.java
index 86d8352697a..6091cc6b0c0 100644
--- a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/ListIterator.java
+++ b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/ListIterator.java
@@ -43,7 +43,7 @@
 
 /**
  * Common class to do listing of resources after merging
- * rocksDB table cache & actual table.
+ * rocksDB table cache &amp; actual table.
  */
 public class ListIterator {
 
diff --git a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/OMMultiTenantManager.java b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/OMMultiTenantManager.java
index f68789b5394..059ebbc22c6 100644
--- a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/OMMultiTenantManager.java
+++ b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/OMMultiTenantManager.java
@@ -129,7 +129,7 @@ boolean isTenantAdmin(UserGroupInformation callerUgi, String tenantId,
       boolean delegated);
 
   /**
-   * List all the user & accessIDs of all users that belong to this Tenant.
+   * List all the user &amp; accessIDs of all users that belong to this Tenant.
    * Note this read is unprotected. See OzoneManager#listUserInTenant
    * @param tenantID
    * @return List of users
diff --git a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/OMMultiTenantManagerImpl.java b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/OMMultiTenantManagerImpl.java
index 1d25a49fc56..a5954485bbd 100644
--- a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/OMMultiTenantManagerImpl.java
+++ b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/OMMultiTenantManagerImpl.java
@@ -246,7 +246,6 @@ private void checkAcquiredAuthorizerWriteLock() throws OMException {
      * @param tenantId tenant name
      * @param userRoleName user role name
      * @param adminRoleName admin role name
-     * @return Tenant
      * @throws IOException
      */
     @Override
diff --git a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/multitenant/AuthorizerLock.java b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/multitenant/AuthorizerLock.java
index 1dcb0f0cd61..2d59c6259ad 100644
--- a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/multitenant/AuthorizerLock.java
+++ b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/multitenant/AuthorizerLock.java
@@ -43,7 +43,7 @@ public interface AuthorizerLock {
 
   /**
    * @return stamp that can be passed to
-   *    {@link this#validateOptimisticRead(long)} to check if a write lock was
+   *    {@link #validateOptimisticRead(long)} to check if a write lock was
    *    acquired since the stamp was issued.
    * @throws IOException If an ongoing write prevents the lock from moving to
    *    the read state for longer than the timeout.
diff --git a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/key/OMKeyCommitRequest.java b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/key/OMKeyCommitRequest.java
index cb507cd0f34..378e0cb12ce 100644
--- a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/key/OMKeyCommitRequest.java
+++ b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/key/OMKeyCommitRequest.java
@@ -458,7 +458,6 @@ protected List<OmKeyLocationInfo> getOmKeyLocationInfos(
    * @param omMetrics        om metrics
    * @param exception        exception trace
    * @param omKeyInfo        omKeyInfo
-   * @param result           result
    * @param result           stores the result of the execution
    */
   @SuppressWarnings("parameternumber")
diff --git a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/key/OMKeyRequest.java b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/key/OMKeyRequest.java
index 09e5d8bca06..729ec57283f 100644
--- a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/key/OMKeyRequest.java
+++ b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/key/OMKeyRequest.java
@@ -623,7 +623,7 @@ protected FileEncryptionInfo getFileEncryptionInfo(KeyArgs keyArgs) {
 
   /**
    * Check bucket quota in bytes.
-   * @paran metadataManager
+   * @param metadataManager
    * @param omBucketInfo
    * @param allocateSize
    * @throws IOException
diff --git a/hadoop-ozone/ozonefs-common/src/main/java/org/apache/hadoop/fs/ozone/OzoneFSInputStream.java b/hadoop-ozone/ozonefs-common/src/main/java/org/apache/hadoop/fs/ozone/OzoneFSInputStream.java
index 4dc70bfa569..f873b43ae98 100644
--- a/hadoop-ozone/ozonefs-common/src/main/java/org/apache/hadoop/fs/ozone/OzoneFSInputStream.java
+++ b/hadoop-ozone/ozonefs-common/src/main/java/org/apache/hadoop/fs/ozone/OzoneFSInputStream.java
@@ -193,7 +193,6 @@ public int read(long position, ByteBuffer buf) throws IOException {
   /**
    * @param buf the ByteBuffer to receive the results of the read operation.
    * @param position offset
-   * @return void
    * @throws IOException if there is some error performing the read
    * @throws EOFException if end of file reached before reading fully
    */

From 9b7b0f2703a85ece02ad39fca618b335f4bb949c Mon Sep 17 00:00:00 2001
From: daniilchik <dprizva55@gmail.com>
Date: Thu, 26 Sep 2024 11:37:44 +0300
Subject: [PATCH 03/50] HDDS-11484. Add check for javadoc correctness

---
 .github/workflows/ci.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index bd0a12edd93..19b7a1fba16 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -142,7 +142,7 @@ jobs:
           distribution: 'temurin'
           java-version: ${{ matrix.java }}
       - name: Run a full build
-        run: hadoop-ozone/dev-support/checks/build.sh -Pdist -Psrc -Dmaven.javadoc.skip=true ${{ inputs.ratis_args }}
+        run: hadoop-ozone/dev-support/checks/build.sh -Pdist -Psrc -Dmaven.javadoc.skip=false ${{ inputs.ratis_args }}
         env:
           DEVELOCITY_ACCESS_KEY: ${{ secrets.GE_ACCESS_TOKEN }}
       - name: Store binaries for tests

From f3cfffe9a7de6bfe0336351f48581132636e0f9e Mon Sep 17 00:00:00 2001
From: daniilchik <dprizva55@gmail.com>
Date: Thu, 26 Sep 2024 11:40:33 +0300
Subject: [PATCH 04/50] HDDS-11484. Add check for javadoc correctness

---
 .../hadoop/hdds/scm/server/StorageContainerManager.java  | 6 ++++--
 .../java/org/apache/hadoop/ozone/client/ObjectStore.java | 2 +-
 .../java/org/apache/hadoop/ozone/om/OzoneManager.java    | 4 ++--
 pom.xml                                                  | 9 ++++++---
 4 files changed, 13 insertions(+), 8 deletions(-)

diff --git a/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/server/StorageContainerManager.java b/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/server/StorageContainerManager.java
index 5f69d9fee2b..ba52b7fcc5f 100644
--- a/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/server/StorageContainerManager.java
+++ b/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/server/StorageContainerManager.java
@@ -609,7 +609,8 @@ public OzoneConfiguration getConfiguration() {
    * @param conf        HDDS configuration
    * @param configurator SCM configurator
    * @return SCM instance
-   * @throws IOException, AuthenticationException
+   * @throws IOException on Failure,
+   * @throws AuthenticationException
    */
   public static StorageContainerManager createSCM(
       OzoneConfiguration conf, SCMConfigurator configurator)
@@ -622,7 +623,8 @@ public static StorageContainerManager createSCM(
    *
    * @param conf        HDDS configuration
    * @return SCM instance
-   * @throws IOException, AuthenticationException
+   * @throws IOException on Failure,
+   * @throws AuthenticationException
    */
   public static StorageContainerManager createSCM(OzoneConfiguration conf)
       throws IOException, AuthenticationException {
diff --git a/hadoop-ozone/client/src/main/java/org/apache/hadoop/ozone/client/ObjectStore.java b/hadoop-ozone/client/src/main/java/org/apache/hadoop/ozone/client/ObjectStore.java
index 65dce09cba1..56ca8798f22 100644
--- a/hadoop-ozone/client/src/main/java/org/apache/hadoop/ozone/client/ObjectStore.java
+++ b/hadoop-ozone/client/src/main/java/org/apache/hadoop/ozone/client/ObjectStore.java
@@ -217,7 +217,7 @@ public S3SecretValue getS3Secret(String kerberosID, boolean createIfNotExist)
    * Set secretKey for accessId.
    * @param accessId
    * @param secretKey
-   * @return S3SecretValue <accessId, secretKey> pair
+   * @return {@code S3SecretValue <accessId, secretKey>} pair
    * @throws IOException
    */
   public S3SecretValue setS3Secret(String accessId, String secretKey)
diff --git a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/OzoneManager.java b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/OzoneManager.java
index 0038bca2e32..93e84768ec5 100644
--- a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/OzoneManager.java
+++ b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/OzoneManager.java
@@ -791,8 +791,8 @@ private void setInstanceVariablesFromConf() {
    *
    * @param conf OzoneConfiguration
    * @return OM instance
-   * @throws IOException, AuthenticationException in case OM instance
-   *                      creation fails.
+   * @throws IOException on Failure
+   * @throws AuthenticationException in case OM instance creation fails.
    */
   public static OzoneManager createOm(OzoneConfiguration conf)
       throws IOException, AuthenticationException {
diff --git a/pom.xml b/pom.xml
index b607372b0ee..1a35012da7b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1421,7 +1421,8 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xs
           <artifactId>maven-javadoc-plugin</artifactId>
           <version>${maven-javadoc-plugin.version}</version>
           <configuration>
-            <additionalJOption>-Xdoclint:none</additionalJOption>
+            <additionalJOption>-Xdoclint:accessibility,reference,syntax</additionalJOption>
+            <failOnWarnings>true</failOnWarnings>
           </configuration>
         </plugin>
         <plugin>
@@ -1883,8 +1884,6 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xs
     </plugins>
   </build>
 
-
-
   <profiles>
     <profile>
       <id>dist</id>
@@ -1893,6 +1892,10 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xs
           <plugin>
             <groupId>org.apache.maven.plugins</groupId>
             <artifactId>maven-javadoc-plugin</artifactId>
+            <configuration>
+              <additionalJOption>-Xdoclint:syntax</additionalJOption>
+              <failOnWarnings>true</failOnWarnings>
+            </configuration>
             <executions>
               <execution>
                 <!-- build javadoc jars per jar for publishing to maven -->

From 5bf24d4fb0c0fa1966be5c6590d46c2855f6e9ce Mon Sep 17 00:00:00 2001
From: daniilchik <dprizva55@gmail.com>
Date: Thu, 26 Sep 2024 12:25:26 +0300
Subject: [PATCH 05/50] HDDS-11484. Add check for javadoc correctness

---
 .github/workflows/ci.yml                                       | 2 +-
 .../org/apache/hadoop/ozone/om/snapshot/SnapshotUtils.java     | 2 +-
 .../main/java/org/apache/hadoop/ozone/recon/ReconUtils.java    | 3 ++-
 3 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 19b7a1fba16..bd0a12edd93 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -142,7 +142,7 @@ jobs:
           distribution: 'temurin'
           java-version: ${{ matrix.java }}
       - name: Run a full build
-        run: hadoop-ozone/dev-support/checks/build.sh -Pdist -Psrc -Dmaven.javadoc.skip=false ${{ inputs.ratis_args }}
+        run: hadoop-ozone/dev-support/checks/build.sh -Pdist -Psrc -Dmaven.javadoc.skip=true ${{ inputs.ratis_args }}
         env:
           DEVELOCITY_ACCESS_KEY: ${{ secrets.GE_ACCESS_TOKEN }}
       - name: Store binaries for tests
diff --git a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/snapshot/SnapshotUtils.java b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/snapshot/SnapshotUtils.java
index 7af6d085137..d89799a8437 100644
--- a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/snapshot/SnapshotUtils.java
+++ b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/snapshot/SnapshotUtils.java
@@ -207,7 +207,7 @@ public static Map<String, String> getColumnFamilyToKeyPrefixMap(
    * <p>
    * Note: Currently, this is only intended to be a special use case in
    * Snapshot. If this is used elsewhere, consider moving this to
-   * @link OMMetadataManager}.
+   * {@link OMMetadataManager}.
    *
    * @param volumeName volume name
    * @param bucketName bucket name
diff --git a/hadoop-ozone/recon/src/main/java/org/apache/hadoop/ozone/recon/ReconUtils.java b/hadoop-ozone/recon/src/main/java/org/apache/hadoop/ozone/recon/ReconUtils.java
index 5c9f6a5f4e1..baf3acce9cd 100644
--- a/hadoop-ozone/recon/src/main/java/org/apache/hadoop/ozone/recon/ReconUtils.java
+++ b/hadoop-ozone/recon/src/main/java/org/apache/hadoop/ozone/recon/ReconUtils.java
@@ -352,7 +352,8 @@ private static void triggerRebuild(ReconNamespaceSummaryManager reconNamespaceSu
    * @param url               url to call
    * @param isSpnego          is SPNEGO enabled
    * @return HttpURLConnection instance of the HTTP call.
-   * @throws IOException, AuthenticationException While reading the response.
+   * @throws IOException ioException,
+   * @throws AuthenticationException While reading the response.
    */
   public HttpURLConnection makeHttpCall(URLConnectionFactory connectionFactory,
                                         String url, boolean isSpnego)

From c66f57e97cfce1353ddeeccfc6ffe49b5298945d Mon Sep 17 00:00:00 2001
From: daniilchik <dprizva55@gmail.com>
Date: Thu, 26 Sep 2024 12:27:27 +0300
Subject: [PATCH 06/50] HDDS-11484. Add check for javadoc correctness

---
 .../main/java/org/apache/ozone/test/GenericTestUtils.java | 8 ++++----
 .../main/java/org/apache/ozone/test/LambdaTestUtils.java  | 4 ++++
 .../apache/hadoop/ozone/recon/api/ContainerEndpoint.java  | 2 +-
 .../hadoop/ozone/recon/api/OMDBInsightEndpoint.java       | 4 ++--
 .../ozone/recon/spi/ReconContainerMetadataManager.java    | 2 +-
 .../recon/spi/impl/ReconContainerMetadataManagerImpl.java | 2 +-
 .../hadoop/ozone/s3/signature/AWSSignatureProcessor.java  | 2 +-
 .../apache/hadoop/ozone/freon/HadoopDirTreeGenerator.java | 2 +-
 .../org/apache/hadoop/ozone/fsck/ContainerMapper.java     | 2 +-
 9 files changed, 16 insertions(+), 12 deletions(-)

diff --git a/hadoop-hdds/test-utils/src/main/java/org/apache/ozone/test/GenericTestUtils.java b/hadoop-hdds/test-utils/src/main/java/org/apache/ozone/test/GenericTestUtils.java
index c9fa668445d..61452094c13 100644
--- a/hadoop-hdds/test-utils/src/main/java/org/apache/ozone/test/GenericTestUtils.java
+++ b/hadoop-hdds/test-utils/src/main/java/org/apache/ozone/test/GenericTestUtils.java
@@ -335,11 +335,11 @@ private static long monotonicNow() {
    * </pre>
    * <p>
    * TODO: Add lambda support once Java 8 is common.
-   * <pre>
+   * {@code
    *   SystemErrCapturer.withCapture(capture -> {
    *     ...
    *   })
-   * </pre>
+   * }
    */
   public static class SystemErrCapturer implements AutoCloseable {
     private final ByteArrayOutputStream bytes;
@@ -376,11 +376,11 @@ public void close() throws Exception {
    * </pre>
    * <p>
    * TODO: Add lambda support once Java 8 is common.
-   * <pre>
+   * {@code
    *   SystemOutCapturer.withCapture(capture -> {
    *     ...
    *   })
-   * </pre>
+   * }
    */
   public static class SystemOutCapturer implements AutoCloseable {
     private final ByteArrayOutputStream bytes;
diff --git a/hadoop-hdds/test-utils/src/main/java/org/apache/ozone/test/LambdaTestUtils.java b/hadoop-hdds/test-utils/src/main/java/org/apache/ozone/test/LambdaTestUtils.java
index 661989dade1..d6b028c815f 100644
--- a/hadoop-hdds/test-utils/src/main/java/org/apache/ozone/test/LambdaTestUtils.java
+++ b/hadoop-hdds/test-utils/src/main/java/org/apache/ozone/test/LambdaTestUtils.java
@@ -77,11 +77,13 @@ public interface TimeoutHandler {
    * is called. This returns the exception passed in (if any),
    * or generates a new one.
    * <pre>
+   * {@code
    * await(
    *   30 * 1000,
    *   () -> { return 0 == filesystem.listFiles(new Path("/")).length); },
    *   () -> 500),
    *   (timeout, ex) -> ex != null ? ex : new TimeoutException("timeout"));
+   * }
    * </pre>
    *
    * @param timeoutMillis timeout in milliseconds.
@@ -160,9 +162,11 @@ public static int await(int timeoutMillis,
    * <p>
    * Example: await for probe to succeed:
    * <pre>
+   * {@code
    * await(
    *   30 * 1000, 500,
    *   () -> { return 0 == filesystem.listFiles(new Path("/")).length); });
+   * }
    * </pre>
    *
    * @param timeoutMillis timeout in milliseconds.
diff --git a/hadoop-ozone/recon/src/main/java/org/apache/hadoop/ozone/recon/api/ContainerEndpoint.java b/hadoop-ozone/recon/src/main/java/org/apache/hadoop/ozone/recon/api/ContainerEndpoint.java
index cbdc198f8aa..d7c50c7a22b 100644
--- a/hadoop-ozone/recon/src/main/java/org/apache/hadoop/ozone/recon/api/ContainerEndpoint.java
+++ b/hadoop-ozone/recon/src/main/java/org/apache/hadoop/ozone/recon/api/ContainerEndpoint.java
@@ -157,7 +157,7 @@ public ContainerEndpoint(OzoneStorageContainerManager reconSCM,
   }
 
   /**
-   * Return @{@link org.apache.hadoop.hdds.scm.container}
+   * Return {@link org.apache.hadoop.hdds.scm.container.ContainerInfo}
    * for the containers starting from the given "prev-key" query param for the
    * given "limit". The given "prev-key" is skipped from the results returned.
    *
diff --git a/hadoop-ozone/recon/src/main/java/org/apache/hadoop/ozone/recon/api/OMDBInsightEndpoint.java b/hadoop-ozone/recon/src/main/java/org/apache/hadoop/ozone/recon/api/OMDBInsightEndpoint.java
index 3f95c04fc91..9dd74c10e1b 100644
--- a/hadoop-ozone/recon/src/main/java/org/apache/hadoop/ozone/recon/api/OMDBInsightEndpoint.java
+++ b/hadoop-ozone/recon/src/main/java/org/apache/hadoop/ozone/recon/api/OMDBInsightEndpoint.java
@@ -734,7 +734,7 @@ public Response getDeletedDirectorySummary() {
    * /volume1/fso-bucket/dir1/dir2/dir3/file1
    * Input Request for OBS bucket:
    *
-   *    `api/v1/keys/listKeys?startPrefix=/volume1/obs-bucket&limit=2&replicationType=RATIS`
+   * {@literal `api/v1/keys/listKeys?startPrefix=/volume1/obs-bucket&limit=2&replicationType=RATIS`}
    * Output Response:
    *
    * {
@@ -832,7 +832,7 @@ public Response getDeletedDirectorySummary() {
    * }
    * Input Request for FSO bucket:
    *
-   *        `api/v1/keys/listKeys?startPrefix=/volume1/fso-bucket&limit=2&replicationType=RATIS`
+   * {@literal `api/v1/keys/listKeys?startPrefix=/volume1/fso-bucket&limit=2&replicationType=RATIS`}
    * Output Response:
    *
    * {
diff --git a/hadoop-ozone/recon/src/main/java/org/apache/hadoop/ozone/recon/spi/ReconContainerMetadataManager.java b/hadoop-ozone/recon/src/main/java/org/apache/hadoop/ozone/recon/spi/ReconContainerMetadataManager.java
index 59957e11624..bfb2b05aad3 100644
--- a/hadoop-ozone/recon/src/main/java/org/apache/hadoop/ozone/recon/spi/ReconContainerMetadataManager.java
+++ b/hadoop-ozone/recon/src/main/java/org/apache/hadoop/ozone/recon/spi/ReconContainerMetadataManager.java
@@ -177,7 +177,7 @@ Map<ContainerKeyPrefix, Integer> getKeyPrefixesForContainer(
 
   /**
    * Get a Map of containerID, containerMetadata of Containers only for the
-   * given limit. If the limit is -1 or any integer <0, then return all
+   * given limit. If the limit is -1 or any integer &lt; 0, then return all
    * the containers without any limit.
    *
    * @param limit the no. of containers to fetch.
diff --git a/hadoop-ozone/recon/src/main/java/org/apache/hadoop/ozone/recon/spi/impl/ReconContainerMetadataManagerImpl.java b/hadoop-ozone/recon/src/main/java/org/apache/hadoop/ozone/recon/spi/impl/ReconContainerMetadataManagerImpl.java
index 46b75e45fad..88dffbacd20 100644
--- a/hadoop-ozone/recon/src/main/java/org/apache/hadoop/ozone/recon/spi/impl/ReconContainerMetadataManagerImpl.java
+++ b/hadoop-ozone/recon/src/main/java/org/apache/hadoop/ozone/recon/spi/impl/ReconContainerMetadataManagerImpl.java
@@ -421,7 +421,7 @@ public Map<ContainerKeyPrefix, Integer> getKeyPrefixesForContainer(
    * only for the given limit from the given start key. The start containerID
    * is skipped from the result.
    *
-   * Return all the containers if limit < 0.
+   * Return all the containers if limit &lt; 0.
    *
    * @param limit No of containers to get.
    * @param prevContainer containerID after which the
diff --git a/hadoop-ozone/s3gateway/src/main/java/org/apache/hadoop/ozone/s3/signature/AWSSignatureProcessor.java b/hadoop-ozone/s3gateway/src/main/java/org/apache/hadoop/ozone/s3/signature/AWSSignatureProcessor.java
index 43a1e6b7130..d517154de80 100644
--- a/hadoop-ozone/s3gateway/src/main/java/org/apache/hadoop/ozone/s3/signature/AWSSignatureProcessor.java
+++ b/hadoop-ozone/s3gateway/src/main/java/org/apache/hadoop/ozone/s3/signature/AWSSignatureProcessor.java
@@ -45,7 +45,7 @@
 import static org.apache.hadoop.ozone.s3.exception.S3ErrorTable.MALFORMED_HEADER;
 
 /**
- * Parser to process AWS V2 & V4 auth request. Creates string to sign and auth
+ * Parser to process AWS V2 and V4 auth request. Creates string to sign and auth
  * header. For more details refer to AWS documentation https://docs.aws
  * .amazon.com/general/latest/gr/sigv4-create-canonical-request.html.
  **/
diff --git a/hadoop-ozone/tools/src/main/java/org/apache/hadoop/ozone/freon/HadoopDirTreeGenerator.java b/hadoop-ozone/tools/src/main/java/org/apache/hadoop/ozone/freon/HadoopDirTreeGenerator.java
index 3eb879d5c06..5bc2c409318 100644
--- a/hadoop-ozone/tools/src/main/java/org/apache/hadoop/ozone/freon/HadoopDirTreeGenerator.java
+++ b/hadoop-ozone/tools/src/main/java/org/apache/hadoop/ozone/freon/HadoopDirTreeGenerator.java
@@ -31,7 +31,7 @@
 import java.util.concurrent.atomic.AtomicLong;
 
 /**
- * Directory & File Generator tool to test OM performance.
+ * Directory and File Generator tool to test OM performance.
  */
 @Command(name = "dtsg",
     aliases = "dfs-tree-generator",
diff --git a/hadoop-ozone/tools/src/main/java/org/apache/hadoop/ozone/fsck/ContainerMapper.java b/hadoop-ozone/tools/src/main/java/org/apache/hadoop/ozone/fsck/ContainerMapper.java
index a7a74c2e372..76ac3144d45 100644
--- a/hadoop-ozone/tools/src/main/java/org/apache/hadoop/ozone/fsck/ContainerMapper.java
+++ b/hadoop-ozone/tools/src/main/java/org/apache/hadoop/ozone/fsck/ContainerMapper.java
@@ -67,7 +67,7 @@ public static void main(String[] args) throws IOException {
   /**
    * Generates Container Id to Blocks and BlockDetails mapping.
    * @param configuration @{@link OzoneConfiguration}
-   * @return Map<Long, List<Map<Long, @BlockDetails>>>
+   * @return {@code Map<Long, List<Map<Long, @BlockDetails>>>}
    *   Map of ContainerId -> (Block, Block info)
    * @throws IOException
    */

From 62f70e458aba29299968739be23344177f08a065 Mon Sep 17 00:00:00 2001
From: daniilchik <dprizva55@gmail.com>
Date: Thu, 26 Sep 2024 13:08:45 +0300
Subject: [PATCH 07/50] HDDS-11484. Add check for javadoc correctness

---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 1a35012da7b..7d296fc281f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1421,7 +1421,7 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xs
           <artifactId>maven-javadoc-plugin</artifactId>
           <version>${maven-javadoc-plugin.version}</version>
           <configuration>
-            <additionalJOption>-Xdoclint:accessibility,reference,syntax</additionalJOption>
+            <additionalJOption>-Xdoclint:syntax</additionalJOption>
             <failOnWarnings>true</failOnWarnings>
           </configuration>
         </plugin>

From 5a3101dc366ebd612a04b1ddc1643f2da5a8cff1 Mon Sep 17 00:00:00 2001
From: daniilchik <dprizva55@gmail.com>
Date: Thu, 26 Sep 2024 13:09:31 +0300
Subject: [PATCH 08/50] HDDS-11484. Add check for javadoc correctness

---
 .../src/main/java/org/apache/ozone/test/GenericTestUtils.java | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/hadoop-hdds/test-utils/src/main/java/org/apache/ozone/test/GenericTestUtils.java b/hadoop-hdds/test-utils/src/main/java/org/apache/ozone/test/GenericTestUtils.java
index 61452094c13..9a3a5c7a8f1 100644
--- a/hadoop-hdds/test-utils/src/main/java/org/apache/ozone/test/GenericTestUtils.java
+++ b/hadoop-hdds/test-utils/src/main/java/org/apache/ozone/test/GenericTestUtils.java
@@ -475,8 +475,8 @@ public static final class ReflectionUtils {
      * This method provides the modifiers field using reflection approach which is compatible
      * for both pre Java 9 and post java 9 versions.
      * @return modifiers field
-     * @throws IllegalAccessException
-     * @throws NoSuchFieldException
+     * @throws IllegalAccessException illegalAccessException,
+     * @throws NoSuchFieldException noSuchFieldException.
      */
     public static Field getModifiersField() throws IllegalAccessException, NoSuchFieldException {
       Field modifiersField = null;

From ecdebda08f9879f7643f6080551c86c02f84b5fd Mon Sep 17 00:00:00 2001
From: daniilchik <dprizva55@gmail.com>
Date: Thu, 26 Sep 2024 13:56:39 +0300
Subject: [PATCH 09/50] HDDS-11484. Add check for javadoc correctness

---
 .../java/org/apache/hadoop/hdds/conf/ConfigurationSource.java   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/hadoop-hdds/config/src/main/java/org/apache/hadoop/hdds/conf/ConfigurationSource.java b/hadoop-hdds/config/src/main/java/org/apache/hadoop/hdds/conf/ConfigurationSource.java
index b1a20c9aecb..0d6c0c90878 100644
--- a/hadoop-hdds/config/src/main/java/org/apache/hadoop/hdds/conf/ConfigurationSource.java
+++ b/hadoop-hdds/config/src/main/java/org/apache/hadoop/hdds/conf/ConfigurationSource.java
@@ -108,7 +108,7 @@ default String[] getTrimmedStrings(String name) {
   /**
    * Gets the configuration entries where the key contains the prefix. This
    * method will strip the prefix from the key in the return Map.
-   * Example: somePrefix.key->value will be key->value in the returned map.
+   * Example: {@code somePrefix.key->value} will be {@code key->value} in the returned map.
    * @param keyPrefix Prefix to search.
    * @return Map containing keys that match and their values.
    */

From 7b27171ee79082e970dd7b42d86584fe2c53e4a4 Mon Sep 17 00:00:00 2001
From: daniilchik <dprizva55@gmail.com>
Date: Thu, 26 Sep 2024 18:03:38 +0300
Subject: [PATCH 10/50] HDDS-11484. Add check for javadoc correctness

---
 hadoop-hdds/dev-support/checkstyle/checkstyle.xml | 5 ++++-
 pom.xml                                           | 5 ++---
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/hadoop-hdds/dev-support/checkstyle/checkstyle.xml b/hadoop-hdds/dev-support/checkstyle/checkstyle.xml
index 3a69c793c26..2110734fef6 100644
--- a/hadoop-hdds/dev-support/checkstyle/checkstyle.xml
+++ b/hadoop-hdds/dev-support/checkstyle/checkstyle.xml
@@ -88,8 +88,11 @@
         <module name="JavadocType">
           <property name="scope" value="public"/>
           <property name="allowMissingParamTags" value="true"/>
+          <property name="allowUnknownTags" value="false"/>
+        </module>
+        <module name="JavadocStyle">
+            <property name="checkFirstSentence" value="true"/>
         </module>
-        <module name="JavadocStyle"/>
         <module name="MissingJavadocPackage"/>
         <module name="MissingJavadocType"/>
 
diff --git a/pom.xml b/pom.xml
index 7d296fc281f..0692efa1e32 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1421,8 +1421,7 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xs
           <artifactId>maven-javadoc-plugin</artifactId>
           <version>${maven-javadoc-plugin.version}</version>
           <configuration>
-            <additionalJOption>-Xdoclint:syntax</additionalJOption>
-            <failOnWarnings>true</failOnWarnings>
+            <doclint>none</doclint>
           </configuration>
         </plugin>
         <plugin>
@@ -1893,7 +1892,7 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xs
             <groupId>org.apache.maven.plugins</groupId>
             <artifactId>maven-javadoc-plugin</artifactId>
             <configuration>
-              <additionalJOption>-Xdoclint:syntax</additionalJOption>
+              <additionalJOption>-Xdoclint:none</additionalJOption>
               <failOnWarnings>true</failOnWarnings>
             </configuration>
             <executions>

From a3588009ea477b897e66e10658c90ec98178425b Mon Sep 17 00:00:00 2001
From: daniilchik <dprizva55@gmail.com>
Date: Thu, 26 Sep 2024 18:06:31 +0300
Subject: [PATCH 11/50] HDDS-11484. Add check for javadoc correctness

---
 .../hadoop/hdds/scm/net/InnerNodeImpl.java    |  5 +++-
 .../hadoop/hdds/utils/LeakDetector.java       | 12 ++++-----
 .../upgrade/LayoutVersionInstanceFactory.java |  4 +--
 .../ozone/upgrade/UpgradeFinalizer.java       | 12 ++++-----
 .../ozone/upgrade/VersionFactoryKey.java      |  2 +-
 ...ntainerDeletionChoosingPolicyTemplate.java |  2 +-
 .../container/stream/StreamingSource.java     |  2 +-
 .../client/DefaultCertificateClient.java      |  5 +++-
 .../hadoop/hdds/server/http/HttpServer2.java  |  4 +--
 .../apache/hadoop/hdds/utils/db/DBStore.java  |  2 +-
 .../hdds/scm/container/ContainerManager.java  |  8 +++---
 .../ContainerReplicaPendingOps.java           |  8 +++---
 .../RatisContainerReplicaCount.java           |  6 ++---
 .../container/states/ContainerAttribute.java  |  8 +++---
 .../hadoop/hdds/scm/node/DatanodeInfo.java    |  2 +-
 .../scm/security/RootCARotationManager.java   | 10 ++++---
 .../java/org/apache/hadoop/ozone/OmUtils.java |  4 +--
 .../hadoop/ozone/om/S3SecretManager.java      |  2 +-
 .../hadoop/ozone/om/BucketManagerImpl.java    |  2 +-
 .../ozone/om/GrpcOzoneManagerServer.java      |  2 +-
 .../ozone/om/OmMetadataManagerImpl.java       | 26 ++++++++++++++-----
 .../hadoop/ozone/om/OzoneManagerUtils.java    |  4 +++
 .../ozone/om/snapshot/OmSnapshotUtils.java    |  2 +-
 .../hadoop/fs/ozone/FileStatusAdapter.java    |  2 +-
 .../recon/api/AccessHeatMapEndpoint.java      |  5 ++--
 .../ozone/recon/api/ContainerEndpoint.java    |  6 +++--
 .../recon/api/OMDBInsightSearchEndpoint.java  |  6 +++--
 .../recon/api/handlers/BucketHandler.java     |  2 +-
 .../spi/ReconContainerMetadataManager.java    | 14 +++++-----
 .../ReconContainerMetadataManagerImpl.java    | 10 +++----
 .../recon/tasks/ContainerKeyMapperTask.java   |  6 ++---
 .../hadoop/ozone/recon/tasks/ReconOmTask.java |  4 +--
 .../recon/tasks/ReconTaskController.java      |  2 +-
 .../hadoop/ozone/freon/S3BucketGenerator.java |  6 ++---
 .../hadoop/ozone/fsck/ContainerMapper.java    |  2 +-
 35 files changed, 115 insertions(+), 84 deletions(-)

diff --git a/hadoop-hdds/common/src/main/java/org/apache/hadoop/hdds/scm/net/InnerNodeImpl.java b/hadoop-hdds/common/src/main/java/org/apache/hadoop/hdds/scm/net/InnerNodeImpl.java
index 332dddac25c..779f2456be6 100644
--- a/hadoop-hdds/common/src/main/java/org/apache/hadoop/hdds/scm/net/InnerNodeImpl.java
+++ b/hadoop-hdds/common/src/main/java/org/apache/hadoop/hdds/scm/net/InnerNodeImpl.java
@@ -307,10 +307,13 @@ public void remove(Node node) {
    * @param loc string location of a node. If loc starts with "/", it's a
    *            absolute path, otherwise a relative path. Following examples
    *            are all accepted,
+   *            <pre>
+   *            {@code
    *            1.  /dc1/rm1/rack1          -> an inner node
    *            2.  /dc1/rm1/rack1/node1    -> a leaf node
    *            3.  rack1/node1             -> a relative path to this node
-   *
+   *            }
+   *            </pre>
    * @return null if the node is not found
    */
   @Override
diff --git a/hadoop-hdds/common/src/main/java/org/apache/hadoop/hdds/utils/LeakDetector.java b/hadoop-hdds/common/src/main/java/org/apache/hadoop/hdds/utils/LeakDetector.java
index 477a291f928..91abe53a819 100644
--- a/hadoop-hdds/common/src/main/java/org/apache/hadoop/hdds/utils/LeakDetector.java
+++ b/hadoop-hdds/common/src/main/java/org/apache/hadoop/hdds/utils/LeakDetector.java
@@ -31,7 +31,6 @@
 /**
  * Simple general resource leak detector using {@link ReferenceQueue} and {@link java.lang.ref.WeakReference} to
  * observe resource object life-cycle and assert proper resource closure before they are GCed.
- *
  * <p>
  * Example usage:
  *
@@ -43,16 +42,17 @@
  *      // report leaks, don't refer to the original object (MyResource) here.
  *      System.out.println("MyResource is not closed before being discarded.");
  *   });
- *
- *   @Override
+ * }
+ * }
+ * <pre>
+ *   {@code @Override
  *   public void close() {
  *     // proper resources cleanup...
  *     // inform tracker that this object is closed properly.
  *     leakTracker.close();
  *   }
- * }
- *
- * }</pre>
+ *  }
+ * </pre>
  */
 public class LeakDetector {
   private static final Logger LOG = LoggerFactory.getLogger(LeakDetector.class);
diff --git a/hadoop-hdds/common/src/main/java/org/apache/hadoop/ozone/upgrade/LayoutVersionInstanceFactory.java b/hadoop-hdds/common/src/main/java/org/apache/hadoop/ozone/upgrade/LayoutVersionInstanceFactory.java
index 2e32182ee9a..796c8d8cdcf 100644
--- a/hadoop-hdds/common/src/main/java/org/apache/hadoop/ozone/upgrade/LayoutVersionInstanceFactory.java
+++ b/hadoop-hdds/common/src/main/java/org/apache/hadoop/ozone/upgrade/LayoutVersionInstanceFactory.java
@@ -69,7 +69,7 @@ public class LayoutVersionInstanceFactory<T> {
   /**
    * Register an instance with a given factory key (key + version).
    * For safety reasons we dont allow (1) re-registering, (2) registering an
-   * instance with version > SLV.
+   * instance with version &gt; SLV.
    *
    * @param lvm LayoutVersionManager
    * @param key VersionFactoryKey key to associate with instance.
@@ -138,7 +138,7 @@ private boolean isValid(LayoutVersionManager lvm, int version) {
   /**
    * From the list of versioned instances for a given "key", this
    * returns the "floor" value corresponding to the given version.
-   * For example, if we have key = "CreateKey",  entry -> [(1, CreateKeyV1),
+   * For example, if we have key = "CreateKey",  entry -&gt; [(1, CreateKeyV1),
    * (3, CreateKeyV2), and if the passed in key = CreateKey &amp; version = 2, we
    * return CreateKeyV1.
    * Since this is a priority queue based implementation, we use a O(1) peek()
diff --git a/hadoop-hdds/common/src/main/java/org/apache/hadoop/ozone/upgrade/UpgradeFinalizer.java b/hadoop-hdds/common/src/main/java/org/apache/hadoop/ozone/upgrade/UpgradeFinalizer.java
index 44ae94870e3..19c0498aa7a 100644
--- a/hadoop-hdds/common/src/main/java/org/apache/hadoop/ozone/upgrade/UpgradeFinalizer.java
+++ b/hadoop-hdds/common/src/main/java/org/apache/hadoop/ozone/upgrade/UpgradeFinalizer.java
@@ -50,14 +50,14 @@ public interface UpgradeFinalizer<T> {
    * Represents the current state in which the service is with regards to
    * finalization after an upgrade.
    * The state transitions are the following:
-   * ALREADY_FINALIZED - no entry no exit from this status without restart.
+   * {@code ALREADY_FINALIZED} - no entry no exit from this status without restart.
    * After an upgrade:
-   * FINALIZATION_REQUIRED -(finalize)-> STARTING_FINALIZATION
-   * -> FINALIZATION_IN_PROGRESS -> FINALIZATION_DONE from finalization done
+   * {@code FINALIZATION_REQUIRED -(finalize)-> STARTING_FINALIZATION
+   * -> FINALIZATION_IN_PROGRESS -> FINALIZATION_DONE} from finalization done
    * there is no more move possible, after a restart the service can end up in:
-   * - FINALIZATION_REQUIRED, if the finalization failed and have not reached
-   * FINALIZATION_DONE,
-   * - or it can be ALREADY_FINALIZED if the finalization was successfully done.
+   * {@code FINALIZATION_REQUIRED}, if the finalization failed and have not reached
+   * {@code FINALIZATION_DONE},
+   * - or it can be {@code ALREADY_FINALIZED} if the finalization was successfully done.
    */
   enum Status {
     ALREADY_FINALIZED,
diff --git a/hadoop-hdds/common/src/main/java/org/apache/hadoop/ozone/upgrade/VersionFactoryKey.java b/hadoop-hdds/common/src/main/java/org/apache/hadoop/ozone/upgrade/VersionFactoryKey.java
index bda45f5a745..6465cc85501 100644
--- a/hadoop-hdds/common/src/main/java/org/apache/hadoop/ozone/upgrade/VersionFactoryKey.java
+++ b/hadoop-hdds/common/src/main/java/org/apache/hadoop/ozone/upgrade/VersionFactoryKey.java
@@ -20,7 +20,7 @@
 
 /**
  * "Key" element to the Version specific instance factory. Currently it has 2
- * dimensions -> a 'key' string and a version. This is to support a factory
+ * dimensions -&gt; a 'key' string and a version. This is to support a factory
  * which returns an instance for a given "key" and "version".
  */
 public class VersionFactoryKey {
diff --git a/hadoop-hdds/container-service/src/main/java/org/apache/hadoop/ozone/container/common/interfaces/ContainerDeletionChoosingPolicyTemplate.java b/hadoop-hdds/container-service/src/main/java/org/apache/hadoop/ozone/container/common/interfaces/ContainerDeletionChoosingPolicyTemplate.java
index c584ba79037..bb47b5b9b6f 100644
--- a/hadoop-hdds/container-service/src/main/java/org/apache/hadoop/ozone/container/common/interfaces/ContainerDeletionChoosingPolicyTemplate.java
+++ b/hadoop-hdds/container-service/src/main/java/org/apache/hadoop/ozone/container/common/interfaces/ContainerDeletionChoosingPolicyTemplate.java
@@ -90,7 +90,7 @@ public final List<ContainerBlockInfo> chooseContainerForBlockDeletion(
   /**
    * Abstract step for ordering the container data to be deleted.
    * Subclass need to implement the concrete ordering implementation
-   * in descending order (more prioritized -> less prioritized)
+   * in descending order (more prioritized -&gt; less prioritized)
    * @param candidateContainers candidate containers to be ordered
    */
   protected abstract void orderByDescendingPriority(
diff --git a/hadoop-hdds/container-service/src/main/java/org/apache/hadoop/ozone/container/stream/StreamingSource.java b/hadoop-hdds/container-service/src/main/java/org/apache/hadoop/ozone/container/stream/StreamingSource.java
index 5fdfc931b99..58b5cf11622 100644
--- a/hadoop-hdds/container-service/src/main/java/org/apache/hadoop/ozone/container/stream/StreamingSource.java
+++ b/hadoop-hdds/container-service/src/main/java/org/apache/hadoop/ozone/container/stream/StreamingSource.java
@@ -29,7 +29,7 @@ public interface StreamingSource {
    *
    * @param id: custom identifier
    *
-   * @return map of files which should be copied (logical name -> real path)
+   * @return map of files which should be copied (logical name -&gt; real path)
    */
   Map<String, Path> getFilesToStream(String id) throws InterruptedException;
 
diff --git a/hadoop-hdds/framework/src/main/java/org/apache/hadoop/hdds/security/x509/certificate/client/DefaultCertificateClient.java b/hadoop-hdds/framework/src/main/java/org/apache/hadoop/hdds/security/x509/certificate/client/DefaultCertificateClient.java
index b277a759cb8..719ed0d43e9 100644
--- a/hadoop-hdds/framework/src/main/java/org/apache/hadoop/hdds/security/x509/certificate/client/DefaultCertificateClient.java
+++ b/hadoop-hdds/framework/src/main/java/org/apache/hadoop/hdds/security/x509/certificate/client/DefaultCertificateClient.java
@@ -668,6 +668,8 @@ protected enum InitCase {
    *    certificate.
    *
    * Truth table:
+   * <pre>
+   * {@code
    *  +--------------+---------------+--------------+---------------------+
    *  | Private Key  | Public Keys   | Certificate  |   Result            |
    *  +--------------+---------------+--------------+---------------------+
@@ -680,7 +682,8 @@ protected enum InitCase {
    *  | True   (1)   | True    (1)   | False  (0)   |   GETCERT->SUCCESS  |
    *  | True   (1)   | True    (1)   | True   (1)   |   SUCCESS           |
    *  +--------------+-----------------+--------------+----------------+
-   *
+   * }
+   * </pre>
    * Success in following cases:
    * 1. If keypair as well certificate is available.
    * 2. If private key and certificate is available and public key is
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 f27f42e0b4c..9d037fed6bc 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
@@ -123,8 +123,8 @@
 /**
  * Create a Jetty embedded server to answer http requests. The primary goal is
  * to serve up status information for the server. There are three contexts:
- * "/logs/" -> points to the log directory "/static/" -> points to common static
- * files (src/webapps/static) "/" -> the jsp server code from
+ * "/logs/" -&gt; points to the log directory "/static/" -&gt; points to common static
+ * files (src/webapps/static) "/" -&gt; the jsp server code from
  * (src/webapps/<name>)
  *
  * This class is a fork of the old HttpServer. HttpServer exists for
diff --git a/hadoop-hdds/framework/src/main/java/org/apache/hadoop/hdds/utils/db/DBStore.java b/hadoop-hdds/framework/src/main/java/org/apache/hadoop/hdds/utils/db/DBStore.java
index 3e8ea30a652..8623a3bdd7d 100644
--- a/hadoop-hdds/framework/src/main/java/org/apache/hadoop/hdds/utils/db/DBStore.java
+++ b/hadoop-hdds/framework/src/main/java/org/apache/hadoop/hdds/utils/db/DBStore.java
@@ -184,7 +184,7 @@ <KEY, VALUE> void move(KEY sourceKey, KEY destKey, VALUE value,
   /**
    * Get List of Index to Table Names.
    * (For decoding table from column family index)
-   * @return Map of Index -> TableName
+   * @return Map of Index -&gt; TableName
    */
   Map<Integer, String> getTableNames();
 
diff --git a/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/container/ContainerManager.java b/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/container/ContainerManager.java
index af900d1c146..6b6a888f424 100644
--- a/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/container/ContainerManager.java
+++ b/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/container/ContainerManager.java
@@ -61,9 +61,9 @@ default List<ContainerInfo> getContainers() {
    * The max size of the searching range cannot exceed the
    * value of count.
    *
-   * @param startID start containerID, >=0,
+   * @param startID start containerID, &gt;=0,
    * start searching at the head if 0.
-   * @param count count must be >= 0
+   * @param count count must be &gt;= 0
    *              Usually the count will be replace with a very big
    *              value instead of being unlimited in case the db is very big.
    *
@@ -85,9 +85,9 @@ default List<ContainerInfo> getContainers() {
    * The max size of the searching range cannot exceed the
    * value of count.
    *
-   * @param startID start containerID, >=0,
+   * @param startID start containerID, &gt;=0,
    * start searching at the head if 0.
-   * @param count count must be >= 0
+   * @param count count must be &gt;= 0
    *              Usually the count will be replace with a very big
    *              value instead of being unlimited in case the db is very big.
    * @param state container state
diff --git a/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/container/replication/ContainerReplicaPendingOps.java b/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/container/replication/ContainerReplicaPendingOps.java
index d1890bdf802..4eef0a8a744 100644
--- a/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/container/replication/ContainerReplicaPendingOps.java
+++ b/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/container/replication/ContainerReplicaPendingOps.java
@@ -116,7 +116,7 @@ public List<ContainerReplicaOp> getPendingOps(ContainerID containerID) {
    * Store a ContainerReplicaOp to add a replica for the given ContainerID.
    * @param containerID ContainerID for which to add a replica
    * @param target The target datanode
-   * @param replicaIndex The replica index (zero for Ratis, > 0 for EC)
+   * @param replicaIndex The replica index (zero for Ratis, &gt; 0 for EC)
    * @param deadlineEpochMillis The time by which the replica should have been
    *                            added and reported by the datanode, or it will
    *                            be discarded.
@@ -130,7 +130,7 @@ public void scheduleAddReplica(ContainerID containerID,
    * Store a ContainerReplicaOp to delete a replica for the given ContainerID.
    * @param containerID ContainerID for which to delete a replica
    * @param target The target datanode
-   * @param replicaIndex The replica index (zero for Ratis, > 0 for EC)
+   * @param replicaIndex The replica index (zero for Ratis, &gt; 0 for EC)
    * @param deadlineEpochMillis The time by which the replica should have been
    *                            deleted and reported by the datanode, or it will
    *                            be discarded.
@@ -145,7 +145,7 @@ public void scheduleDeleteReplica(ContainerID containerID,
    * been replicated successfully.
    * @param containerID ContainerID for which to complete the replication
    * @param target The target Datanode
-   * @param replicaIndex The replica index (zero for Ratis, > 0 for EC)
+   * @param replicaIndex The replica index (zero for Ratis, &gt; 0 for EC)
    * @return True if a pending replica was found and removed, false otherwise.
    */
   public boolean completeAddReplica(ContainerID containerID,
@@ -167,7 +167,7 @@ public boolean completeAddReplica(ContainerID containerID,
    * been deleted successfully.
    * @param containerID ContainerID for which to complete the deletion
    * @param target The target Datanode
-   * @param replicaIndex The replica index (zero for Ratis, > 0 for EC)
+   * @param replicaIndex The replica index (zero for Ratis, &gt; 0 for EC)
    * @return True if a pending replica was found and removed, false otherwise.
    */
   public boolean completeDeleteReplica(ContainerID containerID,
diff --git a/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/container/replication/RatisContainerReplicaCount.java b/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/container/replication/RatisContainerReplicaCount.java
index fe771fac6a4..4e14798ccdc 100644
--- a/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/container/replication/RatisContainerReplicaCount.java
+++ b/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/container/replication/RatisContainerReplicaCount.java
@@ -186,9 +186,9 @@ private void countReplicas() {
    * For example, consider a CLOSED container with the following replicas:
    * {CLOSED, CLOSING, OPEN, UNHEALTHY}
    * In this case, healthy replica count equals 3. Calculation:
-   * 1 CLOSED -> 1 matching replica.
-   * 1 OPEN, 1 CLOSING -> 2 mismatched replicas.
-   * 1 UNHEALTHY -> 1 unhealthy replica. Not counted as healthy.
+   * 1 CLOSED -&gt; 1 matching replica.
+   * 1 OPEN, 1 CLOSING -&gt; 2 mismatched replicas.
+   * 1 UNHEALTHY -&gt; 1 unhealthy replica. Not counted as healthy.
    * Total healthy replicas = 3 = 1 matching + 2 mismatched replicas
    */
   public int getHealthyReplicaCount() {
diff --git a/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/container/states/ContainerAttribute.java b/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/container/states/ContainerAttribute.java
index c6f15be5d2c..1289a0a21ff 100644
--- a/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/container/states/ContainerAttribute.java
+++ b/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/container/states/ContainerAttribute.java
@@ -37,10 +37,10 @@
  * <p>
  * Currently we manage the following attributes for a container.
  * <p>
- * 1. StateMap - LifeCycleState -> Set of ContainerIDs
- * 2. TypeMap  - ReplicationType -> Set of ContainerIDs
- * 3. OwnerMap - OwnerNames -> Set of ContainerIDs
- * 4. FactorMap - ReplicationFactor -> Set of ContainerIDs
+ * 1. StateMap - LifeCycleState -&gt; Set of ContainerIDs
+ * 2. TypeMap  - ReplicationType -&gt; Set of ContainerIDs
+ * 3. OwnerMap - OwnerNames -&gt; Set of ContainerIDs
+ * 4. FactorMap - ReplicationFactor -&gt; Set of ContainerIDs
  * <p>
  * This means that for a cluster size of 750 PB -- we will have around 150
  * Million containers, if we assume 5GB average container size.
diff --git a/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/node/DatanodeInfo.java b/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/node/DatanodeInfo.java
index 05ed833edbe..b3350d8a12a 100644
--- a/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/node/DatanodeInfo.java
+++ b/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/node/DatanodeInfo.java
@@ -346,7 +346,7 @@ public void setCommandCounts(CommandQueueReportProto cmds,
    * Retrieve the number of queued commands of the given type, as reported by
    * the datanode at the last heartbeat.
    * @param cmd The command for which to receive the queued command count
-   * @return -1 if we have no information about the count, or an integer >= 0
+   * @return -1 if we have no information about the count, or an integer &gt;= 0
    *         indicating the command count at the last heartbeat.
    */
   public int getCommandCount(SCMCommandProto.Type cmd) {
diff --git a/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/security/RootCARotationManager.java b/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/security/RootCARotationManager.java
index 0e03203406e..7f17acbef06 100644
--- a/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/security/RootCARotationManager.java
+++ b/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/security/RootCARotationManager.java
@@ -117,11 +117,12 @@ public class RootCARotationManager extends StatefulService {
    * Constructs RootCARotationManager with the specified arguments.
    *
    * @param scm the storage container manager
-   *
+   * <pre>
+   * {@code
    *                         (1)   (3)(4)
    *                   --------------------------->
    *                         (2)                        scm2(Follower)
-   *    (1) (3)(4)     &lt;---------------------------
+   *    (1) (3)(4)     <---------------------------
    *     -------      |
    *    |        \   |
    *     ----->  scm1(Leader)
@@ -129,8 +130,9 @@ public class RootCARotationManager extends StatefulService {
    *     ------->      \      (1)  (3)(4)
    *                   --------------------------->
    *                          (2)                       scm3(Follower)
-   *                   &lt;---------------------------
-   *
+   *                   <---------------------------
+   * }
+   * </pre>
    *
    *   (1) Rotation Prepare
    *   (2) Rotation Prepare Ack
diff --git a/hadoop-ozone/common/src/main/java/org/apache/hadoop/ozone/OmUtils.java b/hadoop-ozone/common/src/main/java/org/apache/hadoop/ozone/OmUtils.java
index b70ea51fde5..b5dec2affbc 100644
--- a/hadoop-ozone/common/src/main/java/org/apache/hadoop/ozone/OmUtils.java
+++ b/hadoop-ozone/common/src/main/java/org/apache/hadoop/ozone/OmUtils.java
@@ -119,7 +119,7 @@ public static InetSocketAddress getOmAddress(ConfigurationSource conf) {
    * Return list of OM addresses by service ids - when HA is enabled.
    *
    * @param conf {@link ConfigurationSource}
-   * @return {service.id -> [{@link InetSocketAddress}]}
+   * @return {service.id -&gt; [{@link InetSocketAddress}]}
    */
   public static Map<String, List<InetSocketAddress>> getOmHAAddressesById(
       ConfigurationSource conf) {
@@ -708,7 +708,7 @@ public static void verifyKeyNameWithSnapshotReservedWordForDeletion(String keyNa
    * Look at 'ozone.om.internal.service.id' first. If configured, return that.
    * If the above is not configured, look at 'ozone.om.service.ids'.
    * If count(ozone.om.service.ids) == 1, return that id.
-   * If count(ozone.om.service.ids) > 1 throw exception
+   * If count(ozone.om.service.ids) &gt; 1 throw exception
    * If 'ozone.om.service.ids' is not configured, return null. (Non HA)
    * @param conf configuration
    * @return OM service ID.
diff --git a/hadoop-ozone/common/src/main/java/org/apache/hadoop/ozone/om/S3SecretManager.java b/hadoop-ozone/common/src/main/java/org/apache/hadoop/ozone/om/S3SecretManager.java
index ae238f1b45a..db00917dacc 100644
--- a/hadoop-ozone/common/src/main/java/org/apache/hadoop/ozone/om/S3SecretManager.java
+++ b/hadoop-ozone/common/src/main/java/org/apache/hadoop/ozone/om/S3SecretManager.java
@@ -80,7 +80,7 @@ <T> T doUnderLock(String lockId, S3SecretFunction<T> action)
   /**
    * Default implementation of secret check method.
    * @param kerberosId kerberos principal.
-   * @return true if exist associated s3 secret for given {@param kerberosId},
+   * @return true if exist associated s3 secret for given {@code kerberosId},
    * false if not.
    */
   default boolean hasS3Secret(String kerberosId) throws IOException {
diff --git a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/BucketManagerImpl.java b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/BucketManagerImpl.java
index 68429c36d08..e4174efcfcc 100644
--- a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/BucketManagerImpl.java
+++ b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/BucketManagerImpl.java
@@ -43,7 +43,7 @@
  * BucketManager uses MetadataDB to store bucket level information.
  * Keys used in BucketManager for storing data into MetadataDB
  * for BucketInfo:
- * {volume/bucket} -> bucketInfo
+ * {volume/bucket} -&gt; bucketInfo
  */
 public class BucketManagerImpl implements BucketManager {
   private static final Logger LOG =
diff --git a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/GrpcOzoneManagerServer.java b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/GrpcOzoneManagerServer.java
index a83304ade45..bb682508524 100644
--- a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/GrpcOzoneManagerServer.java
+++ b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/GrpcOzoneManagerServer.java
@@ -63,7 +63,7 @@
 import static org.apache.hadoop.ozone.om.OMConfigKeys.OZONE_OM_GRPC_WORKERGROUP_SIZE_KEY;
 
 /**
- * Separated network server for gRPC transport OzoneManagerService s3g->OM.
+ * Separated network server for gRPC transport OzoneManagerService s3g-&gt;OM.
  */
 public class GrpcOzoneManagerServer {
   private static final Logger LOG =
diff --git a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/OmMetadataManagerImpl.java b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/OmMetadataManagerImpl.java
index 2e85fef162c..af94ac4a387 100644
--- a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/OmMetadataManagerImpl.java
+++ b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/OmMetadataManagerImpl.java
@@ -140,7 +140,8 @@ public class OmMetadataManagerImpl implements OMMetadataManager,
    * <p>
    * OM DB Schema:
    *
-   *
+   * <pre>
+   * {@code
    * Common Tables:
    * |----------------------------------------------------------------------|
    * |  Column Family     |        VALUE                                    |
@@ -161,7 +162,10 @@ public class OmMetadataManagerImpl implements OMMetadataManager,
    * |----------------------------------------------------------------------|
    * | transactionInfoTable| #TRANSACTIONINFO -> OMTransactionInfo          |
    * |----------------------------------------------------------------------|
-   *
+   * }
+   * </pre>
+   * <pre>
+   * {@code
    * Multi-Tenant Tables:
    * |----------------------------------------------------------------------|
    * | tenantStateTable          | tenantId -> OmDBTenantState              |
@@ -170,8 +174,10 @@ public class OmMetadataManagerImpl implements OMMetadataManager,
    * |----------------------------------------------------------------------|
    * | principalToAccessIdsTable | userPrincipal -> OmDBUserPrincipalInfo   |
    * |----------------------------------------------------------------------|
-   *
-   *
+   * }
+   * </pre>
+   * <pre>
+   * {@code
    * Simple Tables:
    * |----------------------------------------------------------------------|
    * |  Column Family     |        VALUE                                    |
@@ -182,7 +188,10 @@ public class OmMetadataManagerImpl implements OMMetadataManager,
    * |----------------------------------------------------------------------|
    * | openKey            | /volumeName/bucketName/keyName/id->KeyInfo      |
    * |----------------------------------------------------------------------|
-   *
+   * }
+   * </pre>
+   * <pre>
+   * {@code
    * Prefix Tables:
    * |----------------------------------------------------------------------|
    * |  Column Family   |        VALUE                                      |
@@ -196,7 +205,10 @@ public class OmMetadataManagerImpl implements OMMetadataManager,
    * |  deletedDirTable | /volumeId/bucketId/parentId/dirName/objectId ->   |
    * |                  |                                      KeyInfo      |
    * |----------------------------------------------------------------------|
-   *
+   * }
+   * </pre>
+   * <pre>
+   * {@code
    * Snapshot Tables:
    * |-------------------------------------------------------------------------|
    * |  Column Family        |        VALUE                                    |
@@ -210,6 +222,8 @@ public class OmMetadataManagerImpl implements OMMetadataManager,
    * |-------------------------------------------------------------------------|
    * | compactionLogTable    | dbTrxId-compactionTime -> compactionLogEntry    |
    * |-------------------------------------------------------------------------|
+   * }
+   * </pre>
    */
 
   public static final String USER_TABLE = "userTable";
diff --git a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/OzoneManagerUtils.java b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/OzoneManagerUtils.java
index 2301bbbdbf2..c693e529580 100644
--- a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/OzoneManagerUtils.java
+++ b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/OzoneManagerUtils.java
@@ -51,6 +51,8 @@ private OzoneManagerUtils() {
    * OzoneManagerStateMachine#runCommand function and ensures sequential
    * execution path.
    * Below is the call trace to perform OM client request operation:
+   * <pre>
+   * {@code
    * OzoneManagerStateMachine#applyTransaction ->
    * OzoneManagerStateMachine#runCommand ->
    * OzoneManagerRequestHandler#handleWriteRequest ->
@@ -60,6 +62,8 @@ private OzoneManagerUtils() {
    * OzoneManagerUtils#getBucketLayout ->
    * OzoneManagerUtils#getOmBucketInfo ->
    * omMetadataManager().getBucketTable().get(buckKey)
+   * }
+   * </pre>
    */
 
   public static OmBucketInfo getBucketInfo(OMMetadataManager metaMgr,
diff --git a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/snapshot/OmSnapshotUtils.java b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/snapshot/OmSnapshotUtils.java
index 05b0e5b0cdc..b400fb6ed76 100644
--- a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/snapshot/OmSnapshotUtils.java
+++ b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/snapshot/OmSnapshotUtils.java
@@ -77,7 +77,7 @@ public static Object getINode(Path file) throws IOException {
    * sst compaction backup directory)
    *
    * @param truncateLength - Length of initial path to trim in file path.
-   * @param hardLinkFiles  - Map of link->file paths.
+   * @param hardLinkFiles  - Map of link-&gt;file paths.
    * @return Path to the file of links created.
    */
   public static Path createHardLinkList(int truncateLength,
diff --git a/hadoop-ozone/ozonefs-common/src/main/java/org/apache/hadoop/fs/ozone/FileStatusAdapter.java b/hadoop-ozone/ozonefs-common/src/main/java/org/apache/hadoop/fs/ozone/FileStatusAdapter.java
index f92f8d95704..6354ee0eebe 100644
--- a/hadoop-ozone/ozonefs-common/src/main/java/org/apache/hadoop/fs/ozone/FileStatusAdapter.java
+++ b/hadoop-ozone/ozonefs-common/src/main/java/org/apache/hadoop/fs/ozone/FileStatusAdapter.java
@@ -33,7 +33,7 @@
  * information can be converted to this class, and this class can be used to
  * create hadoop 2.x FileStatus.
  * <p>
- * FileStatus (Hadoop 3.x) --> FileStatusAdapter --> FileStatus (Hadoop 2.x)
+ * FileStatus (Hadoop 3.x) --&gt; FileStatusAdapter --&gt; FileStatus (Hadoop 2.x)
  */
 public final class FileStatusAdapter {
 
diff --git a/hadoop-ozone/recon/src/main/java/org/apache/hadoop/ozone/recon/api/AccessHeatMapEndpoint.java b/hadoop-ozone/recon/src/main/java/org/apache/hadoop/ozone/recon/api/AccessHeatMapEndpoint.java
index b0a9681c5b8..472cdb62a66 100644
--- a/hadoop-ozone/recon/src/main/java/org/apache/hadoop/ozone/recon/api/AccessHeatMapEndpoint.java
+++ b/hadoop-ozone/recon/src/main/java/org/apache/hadoop/ozone/recon/api/AccessHeatMapEndpoint.java
@@ -65,13 +65,14 @@ public AccessHeatMapEndpoint(HeatMapServiceImpl heatMapService) {
    * with volume, buckets under that volume,
    * then directories, subdirectories and paths
    * under that bucket.
-   * E.g. -------->>
+   * <pre>
+   * E.g. --------&gt;&gt;
    * vol1                           vol2
    * - bucket1                      - bucket2
    * - dir1/dir2/key1               - dir4/dir1/key1
    * - dir1/dir2/key2               - dir4/dir5/key2
    * - dir1/dir3/key1               - dir5/dir3/key1
-   *
+   * </pre>
    * @return {@link Response}
    */
   @GET
diff --git a/hadoop-ozone/recon/src/main/java/org/apache/hadoop/ozone/recon/api/ContainerEndpoint.java b/hadoop-ozone/recon/src/main/java/org/apache/hadoop/ozone/recon/api/ContainerEndpoint.java
index d7c50c7a22b..dfc969656e7 100644
--- a/hadoop-ozone/recon/src/main/java/org/apache/hadoop/ozone/recon/api/ContainerEndpoint.java
+++ b/hadoop-ozone/recon/src/main/java/org/apache/hadoop/ozone/recon/api/ContainerEndpoint.java
@@ -162,10 +162,10 @@ public ContainerEndpoint(OzoneStorageContainerManager reconSCM,
    * given "limit". The given "prev-key" is skipped from the results returned.
    *
    * @param prevKey the containerID after which results are returned.
-   *                start containerID, >=0,
+   *                start containerID, &gt;=0,
    *                start searching at the head if 0.
    * @param limit   max no. of containers to get.
-   *                count must be >= 0
+   *                count must be &gt;= 0
    *                Usually the count will be replace with a very big
    *                value instead of being unlimited in case the db is very big.
    * @return {@link Response}
@@ -468,6 +468,7 @@ public Response getUnhealthyContainers(
 
   /**
    * This API will return all DELETED containers in SCM in below JSON format.
+   * <pre>
    * {
    * containers: [
    * {
@@ -486,6 +487,7 @@ public Response getUnhealthyContainers(
    * }
    * ]
    * }
+   * </pre>
    * @param limit limits the number of deleted containers
    * @param prevKey previous container Id to skip
    * @return Response of deleted containers.
diff --git a/hadoop-ozone/recon/src/main/java/org/apache/hadoop/ozone/recon/api/OMDBInsightSearchEndpoint.java b/hadoop-ozone/recon/src/main/java/org/apache/hadoop/ozone/recon/api/OMDBInsightSearchEndpoint.java
index 9cd6fa33d03..58d2cd31076 100644
--- a/hadoop-ozone/recon/src/main/java/org/apache/hadoop/ozone/recon/api/OMDBInsightSearchEndpoint.java
+++ b/hadoop-ozone/recon/src/main/java/org/apache/hadoop/ozone/recon/api/OMDBInsightSearchEndpoint.java
@@ -245,13 +245,15 @@ public Map<String, OmKeyInfo> searchOpenKeysInFSO(String startPrefix,
    * This method transforms a user-provided path (e.g., "volume/bucket/dir1") into
    * a database-friendly format ("/volumeID/bucketID/ParentId/") by replacing names
    * with their corresponding IDs. It simplifies database queries for FSO bucket operations.
-   *
+   * <pre>
+   * {@code
    * Examples:
    * - Input: "volume/bucket/key" -> Output: "/volumeID/bucketID/parentDirID/key"
    * - Input: "volume/bucket/dir1" -> Output: "/volumeID/bucketID/dir1ID/"
    * - Input: "volume/bucket/dir1/key1" -> Output: "/volumeID/bucketID/dir1ID/key1"
    * - Input: "volume/bucket/dir1/dir2" -> Output: "/volumeID/bucketID/dir2ID/"
-   *
+   * }
+   * </pre>
    * @param prevKeyPrefix The path to be converted.
    * @return The object path as "/volumeID/bucketID/ParentId/" or an empty string if an error occurs.
    * @throws IOException If database access fails.
diff --git a/hadoop-ozone/recon/src/main/java/org/apache/hadoop/ozone/recon/api/handlers/BucketHandler.java b/hadoop-ozone/recon/src/main/java/org/apache/hadoop/ozone/recon/api/handlers/BucketHandler.java
index 266caaa2d8e..ffc5b7e41a8 100644
--- a/hadoop-ozone/recon/src/main/java/org/apache/hadoop/ozone/recon/api/handlers/BucketHandler.java
+++ b/hadoop-ozone/recon/src/main/java/org/apache/hadoop/ozone/recon/api/handlers/BucketHandler.java
@@ -118,7 +118,7 @@ public static String buildSubpath(String path, String nextLevel) {
   }
 
   /**
-   * Example: /vol1/buck1/a/b/c/d/e/file1.txt -> a/b/c/d/e/file1.txt.
+   * Example: {@literal /vol1/buck1/a/b/c/d/e/file1.txt -> a/b/c/d/e/file1.txt.}
    * @param names parsed request
    * @return key name
    */
diff --git a/hadoop-ozone/recon/src/main/java/org/apache/hadoop/ozone/recon/spi/ReconContainerMetadataManager.java b/hadoop-ozone/recon/src/main/java/org/apache/hadoop/ozone/recon/spi/ReconContainerMetadataManager.java
index bfb2b05aad3..44595a43b79 100644
--- a/hadoop-ozone/recon/src/main/java/org/apache/hadoop/ozone/recon/spi/ReconContainerMetadataManager.java
+++ b/hadoop-ozone/recon/src/main/java/org/apache/hadoop/ozone/recon/spi/ReconContainerMetadataManager.java
@@ -70,7 +70,7 @@ void batchStoreContainerKeyMapping(BatchOperation batch,
                                      Integer count) throws IOException;
 
   /**
-   * Store the containerID -> no. of keys count into the container DB store.
+   * Store the containerID -&gt; no. of keys count into the container DB store.
    *
    * @param containerID the containerID.
    * @param count count of the keys within the given containerID.
@@ -80,7 +80,7 @@ void batchStoreContainerKeyMapping(BatchOperation batch,
   void storeContainerKeyCount(Long containerID, Long count) throws IOException;
 
   /**
-   * Store the containerID -> no. of keys count into a batch.
+   * Store the containerID -&gt; no. of keys count into a batch.
    *
    * @param batch the batch operation we store into
    * @param containerID the containerID.
@@ -91,7 +91,7 @@ void batchStoreContainerKeyCounts(BatchOperation batch, Long containerID,
                                     Long count) throws IOException;
 
   /**
-   * Store the containerID -> ContainerReplicaWithTimestamp mapping to the
+   * Store the containerID -&gt; ContainerReplicaWithTimestamp mapping to the
    * container DB store.
    *
    * @param containerID the containerID.
@@ -159,7 +159,7 @@ Map<UUID, ContainerReplicaHistory> getContainerReplicaHistory(
    * Get the stored key prefixes for the given containerId.
    *
    * @param containerId the given containerId.
-   * @return Map of Key prefix -> count.
+   * @return Map of Key prefix -&gt; count.
    */
   Map<ContainerKeyPrefix, Integer> getKeyPrefixesForContainer(
       long containerId) throws IOException;
@@ -170,7 +170,7 @@ Map<ContainerKeyPrefix, Integer> getKeyPrefixesForContainer(
    *
    * @param containerId the given containerId.
    * @param prevKeyPrefix the key prefix to seek to and start scanning.
-   * @return Map of Key prefix -> count.
+   * @return Map of Key prefix -&gt; count.
    */
   Map<ContainerKeyPrefix, Integer> getKeyPrefixesForContainer(
       long containerId, String prevKeyPrefix) throws IOException;
@@ -182,7 +182,7 @@ Map<ContainerKeyPrefix, Integer> getKeyPrefixesForContainer(
    *
    * @param limit the no. of containers to fetch.
    * @param prevContainer containerID after which the results are returned.
-   * @return Map of containerID -> containerMetadata.
+   * @return Map of containerID -&gt; containerMetadata.
    * @throws IOException
    */
   Map<Long, ContainerMetadata> getContainers(int limit, long prevContainer)
@@ -256,7 +256,7 @@ void commitBatchOperation(RDBBatchOperation rdbBatchOperation)
    *
    * @param prevKeyPrefix the key prefix to seek to and start scanning.
    * @param keyVersion the key version to seek
-   * @return Map of Key prefix -> count.
+   * @return Map of Key prefix -&gt; count.
    */
   Map<KeyPrefixContainer, Integer> getContainerForKeyPrefixes(
       String prevKeyPrefix, long keyVersion) throws IOException;
diff --git a/hadoop-ozone/recon/src/main/java/org/apache/hadoop/ozone/recon/spi/impl/ReconContainerMetadataManagerImpl.java b/hadoop-ozone/recon/src/main/java/org/apache/hadoop/ozone/recon/spi/impl/ReconContainerMetadataManagerImpl.java
index 88dffbacd20..42908a775a4 100644
--- a/hadoop-ozone/recon/src/main/java/org/apache/hadoop/ozone/recon/spi/impl/ReconContainerMetadataManagerImpl.java
+++ b/hadoop-ozone/recon/src/main/java/org/apache/hadoop/ozone/recon/spi/impl/ReconContainerMetadataManagerImpl.java
@@ -191,7 +191,7 @@ public void batchStoreContainerKeyMapping(BatchOperation batch,
   }
 
   /**
-   * Store the containerID -> no. of keys count into the container DB store.
+   * Store the containerID -&gt; no. of keys count into the container DB store.
    *
    * @param containerID the containerID.
    * @param count count of the keys within the given containerID.
@@ -204,7 +204,7 @@ public void storeContainerKeyCount(Long containerID, Long count)
   }
 
   /**
-   * Store the containerID -> no. of keys count into a batch.
+   * Store the containerID -&gt; no. of keys count into a batch.
    *
    * @param batch the batch we store into
    * @param containerID the containerID.
@@ -219,7 +219,7 @@ public void batchStoreContainerKeyCounts(BatchOperation batch,
   }
 
   /**
-   * Store the ContainerID -> ContainerReplicaHistory (container first and last
+   * Store the ContainerID -&gt; ContainerReplicaHistory (container first and last
    * seen time) mapping to the container DB store.
    *
    * @param containerID the containerID.
@@ -417,7 +417,7 @@ public Map<ContainerKeyPrefix, Integer> getKeyPrefixesForContainer(
   }
 
   /**
-   * Iterate the DB to construct a Map of containerID -> containerMetadata
+   * Iterate the DB to construct a Map of containerID -&gt; containerMetadata
    * only for the given limit from the given start key. The start containerID
    * is skipped from the result.
    *
@@ -426,7 +426,7 @@ public Map<ContainerKeyPrefix, Integer> getKeyPrefixesForContainer(
    * @param limit No of containers to get.
    * @param prevContainer containerID after which the
    *                      list of containers are scanned.
-   * @return Map of containerID -> containerMetadata.
+   * @return Map of containerID -&gt; containerMetadata.
    * @throws IOException on failure.
    */
   @Override
diff --git a/hadoop-ozone/recon/src/main/java/org/apache/hadoop/ozone/recon/tasks/ContainerKeyMapperTask.java b/hadoop-ozone/recon/src/main/java/org/apache/hadoop/ozone/recon/tasks/ContainerKeyMapperTask.java
index fd5d8864080..bf34c9f8930 100644
--- a/hadoop-ozone/recon/src/main/java/org/apache/hadoop/ozone/recon/tasks/ContainerKeyMapperTask.java
+++ b/hadoop-ozone/recon/src/main/java/org/apache/hadoop/ozone/recon/tasks/ContainerKeyMapperTask.java
@@ -57,7 +57,7 @@
 
 /**
  * Class to iterate over the OM DB and populate the Recon container DB with
- * the container -> Key reverse mapping.
+ * the container -&gt; Key reverse mapping.
  */
 public class ContainerKeyMapperTask implements ReconOmTask {
 
@@ -81,8 +81,8 @@ public ContainerKeyMapperTask(ReconContainerMetadataManager
   }
 
   /**
-   * Read Key -> ContainerId data from OM snapshot DB and write reverse map
-   * (container, key) -> count to Recon Container DB.
+   * Read Key -&gt; ContainerId data from OM snapshot DB and write reverse map
+   * (container, key) -&gt; count to Recon Container DB.
    */
   @Override
   public Pair<String, Boolean> reprocess(OMMetadataManager omMetadataManager) {
diff --git a/hadoop-ozone/recon/src/main/java/org/apache/hadoop/ozone/recon/tasks/ReconOmTask.java b/hadoop-ozone/recon/src/main/java/org/apache/hadoop/ozone/recon/tasks/ReconOmTask.java
index e904334bb31..2092d6a326c 100644
--- a/hadoop-ozone/recon/src/main/java/org/apache/hadoop/ozone/recon/tasks/ReconOmTask.java
+++ b/hadoop-ozone/recon/src/main/java/org/apache/hadoop/ozone/recon/tasks/ReconOmTask.java
@@ -35,14 +35,14 @@ public interface ReconOmTask {
   /**
    * Process a set of OM events on tables that the task is listening on.
    * @param events Set of events to be processed by the task.
-   * @return Pair of task name -> task success.
+   * @return Pair of task name -&gt; task success.
    */
   Pair<String, Boolean> process(OMUpdateEventBatch events);
 
   /**
    * Process a  on tables that the task is listening on.
    * @param omMetadataManager OM Metadata manager instance.
-   * @return Pair of task name -> task success.
+   * @return Pair of task name -&gt; task success.
    */
   Pair<String, Boolean> reprocess(OMMetadataManager omMetadataManager);
 
diff --git a/hadoop-ozone/recon/src/main/java/org/apache/hadoop/ozone/recon/tasks/ReconTaskController.java b/hadoop-ozone/recon/src/main/java/org/apache/hadoop/ozone/recon/tasks/ReconTaskController.java
index d66a7279cce..1a514ceb90b 100644
--- a/hadoop-ozone/recon/src/main/java/org/apache/hadoop/ozone/recon/tasks/ReconTaskController.java
+++ b/hadoop-ozone/recon/src/main/java/org/apache/hadoop/ozone/recon/tasks/ReconTaskController.java
@@ -53,7 +53,7 @@ void reInitializeTasks(ReconOMMetadataManager omMetadataManager)
 
   /**
    * Get set of registered tasks.
-   * @return Map of Task name -> Task.
+   * @return Map of Task name -&gt; Task.
    */
   Map<String, ReconOmTask> getRegisteredTasks();
 
diff --git a/hadoop-ozone/tools/src/main/java/org/apache/hadoop/ozone/freon/S3BucketGenerator.java b/hadoop-ozone/tools/src/main/java/org/apache/hadoop/ozone/freon/S3BucketGenerator.java
index ef7a85a4121..0233c14470a 100644
--- a/hadoop-ozone/tools/src/main/java/org/apache/hadoop/ozone/freon/S3BucketGenerator.java
+++ b/hadoop-ozone/tools/src/main/java/org/apache/hadoop/ozone/freon/S3BucketGenerator.java
@@ -28,9 +28,9 @@
  * Generate buckets via the s3 interface.
  *
  * For a secure cluster,
- * $> init user keytab
- * $> kinit -kt /etc/security/keytabs/testuser.keytab testuser/scm@EXAMPLE.COM
- * $> eval $(ozone s3 getsecret -e)
+ * $&gt; init user keytab
+ * $&gt; kinit -kt /etc/security/keytabs/testuser.keytab testuser/scm@EXAMPLE.COM
+ * $&gt; eval $(ozone s3 getsecret -e)
  * for getting and exporting access_key_id and secret_access_key
  * to freon shell test environment
  * secret access key.
diff --git a/hadoop-ozone/tools/src/main/java/org/apache/hadoop/ozone/fsck/ContainerMapper.java b/hadoop-ozone/tools/src/main/java/org/apache/hadoop/ozone/fsck/ContainerMapper.java
index 76ac3144d45..b8bb94dcc91 100644
--- a/hadoop-ozone/tools/src/main/java/org/apache/hadoop/ozone/fsck/ContainerMapper.java
+++ b/hadoop-ozone/tools/src/main/java/org/apache/hadoop/ozone/fsck/ContainerMapper.java
@@ -68,7 +68,7 @@ public static void main(String[] args) throws IOException {
    * Generates Container Id to Blocks and BlockDetails mapping.
    * @param configuration @{@link OzoneConfiguration}
    * @return {@code Map<Long, List<Map<Long, @BlockDetails>>>}
-   *   Map of ContainerId -> (Block, Block info)
+   *   Map of ContainerId -&gt; (Block, Block info)
    * @throws IOException
    */
   public Map<Long, List<Map<Long, BlockIdDetails>>>

From 7db59c1a8f72f06b027afabdbbf917adea08b364 Mon Sep 17 00:00:00 2001
From: daniilchik <dprizva55@gmail.com>
Date: Thu, 26 Sep 2024 18:11:05 +0300
Subject: [PATCH 12/50] HDDS-11484. Add check for javadoc correctness

---
 .../src/main/java/org/apache/hadoop/hdds/utils/LeakDetector.java | 1 +
 1 file changed, 1 insertion(+)

diff --git a/hadoop-hdds/common/src/main/java/org/apache/hadoop/hdds/utils/LeakDetector.java b/hadoop-hdds/common/src/main/java/org/apache/hadoop/hdds/utils/LeakDetector.java
index 91abe53a819..9579d4e73bf 100644
--- a/hadoop-hdds/common/src/main/java/org/apache/hadoop/hdds/utils/LeakDetector.java
+++ b/hadoop-hdds/common/src/main/java/org/apache/hadoop/hdds/utils/LeakDetector.java
@@ -44,6 +44,7 @@
  *   });
  * }
  * }
+ * </pre>
  * <pre>
  *   {@code @Override
  *   public void close() {

From 5221843b7c951ca859aae2bc018ba418b357301e Mon Sep 17 00:00:00 2001
From: daniilchik <dprizva55@gmail.com>
Date: Thu, 26 Sep 2024 18:15:15 +0300
Subject: [PATCH 13/50] HDDS-11484. Add check for javadoc correctness

---
 hadoop-hdds/dev-support/checkstyle/checkstyle.xml | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/hadoop-hdds/dev-support/checkstyle/checkstyle.xml b/hadoop-hdds/dev-support/checkstyle/checkstyle.xml
index 2110734fef6..288085ef948 100644
--- a/hadoop-hdds/dev-support/checkstyle/checkstyle.xml
+++ b/hadoop-hdds/dev-support/checkstyle/checkstyle.xml
@@ -90,9 +90,7 @@
           <property name="allowMissingParamTags" value="true"/>
           <property name="allowUnknownTags" value="false"/>
         </module>
-        <module name="JavadocStyle">
-            <property name="checkFirstSentence" value="true"/>
-        </module>
+        <module name="JavadocStyle"/>
         <module name="MissingJavadocPackage"/>
         <module name="MissingJavadocType"/>
 

From 4ca55cbc399937974905c74052a0ca0b55a7cb86 Mon Sep 17 00:00:00 2001
From: daniilchik <dprizva55@gmail.com>
Date: Thu, 26 Sep 2024 18:18:48 +0300
Subject: [PATCH 14/50] HDDS-11484. Add check for javadoc correctness


From f46675eeb328bcf8ac7f7038ab875ec1e9498d65 Mon Sep 17 00:00:00 2001
From: daniilchik <dprizva55@gmail.com>
Date: Thu, 26 Sep 2024 18:28:15 +0300
Subject: [PATCH 15/50] HDDS-11484. Add check for javadoc correctness

---
 .../apache/hadoop/ozone/recon/api/handlers/BucketHandler.java   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/hadoop-ozone/recon/src/main/java/org/apache/hadoop/ozone/recon/api/handlers/BucketHandler.java b/hadoop-ozone/recon/src/main/java/org/apache/hadoop/ozone/recon/api/handlers/BucketHandler.java
index ffc5b7e41a8..a2db616ec2f 100644
--- a/hadoop-ozone/recon/src/main/java/org/apache/hadoop/ozone/recon/api/handlers/BucketHandler.java
+++ b/hadoop-ozone/recon/src/main/java/org/apache/hadoop/ozone/recon/api/handlers/BucketHandler.java
@@ -118,7 +118,7 @@ public static String buildSubpath(String path, String nextLevel) {
   }
 
   /**
-   * Example: {@literal /vol1/buck1/a/b/c/d/e/file1.txt -> a/b/c/d/e/file1.txt.}
+   * Example: {@literal /vol1/buck1/a/b/c/d/e/file1.txt -> a/b/c/d/e/file1.txt} .
    * @param names parsed request
    * @return key name
    */

From db670837e13de73dfd58fa2f5c9dbcd289691990 Mon Sep 17 00:00:00 2001
From: daniilchik <dprizva55@gmail.com>
Date: Sat, 28 Sep 2024 12:18:37 +0300
Subject: [PATCH 16/50] HHDS-11484. Add check for javadoc correctness


From abb7b5473ce98277a7b4eaae434bb066dc151fa2 Mon Sep 17 00:00:00 2001
From: daniilchik <dprizva55@gmail.com>
Date: Sat, 28 Sep 2024 13:09:56 +0300
Subject: [PATCH 17/50] HDDS-11484. Add check for javadoc correctness

---
 .../src/main/java/org/apache/hadoop/hdds/HddsUtils.java   | 4 ++--
 .../org/apache/hadoop/hdds/client/DecommissionUtils.java  | 4 ++--
 .../java/org/apache/hadoop/hdds/scm/client/ScmClient.java | 1 -
 .../hdds/scm/container/ReplicationManagerReport.java      | 4 ++--
 .../java/org/apache/hadoop/hdds/scm/ha/SCMNodeInfo.java   | 2 +-
 .../org/apache/hadoop/hdds/scm/pipeline/Pipeline.java     | 2 +-
 .../java/org/apache/hadoop/hdds/server/ServerUtils.java   | 2 +-
 .../org/apache/hadoop/hdds/utils/db/DelegatedCodec.java   | 8 ++++----
 .../ozone/container/common/helpers/ChunkInfoList.java     | 4 ++--
 .../apache/hadoop/ozone/upgrade/LayoutVersionManager.java | 1 -
 10 files changed, 15 insertions(+), 17 deletions(-)

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 794b972f150..ee57a30888f 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
@@ -650,7 +650,7 @@ public static File createDir(String dirPath) {
    * Utility string formatter method to display SCM roles.
    *
    * @param nodes
-   * @return
+   * @return String
    */
   public static String format(List<String> nodes) {
     StringBuilder sb = new StringBuilder();
@@ -680,7 +680,7 @@ public static int roundupMb(long bytes) {
 
   /**
    * Unwrap exception to check if it is some kind of access control problem
-   * ({@link AccessControlException} or {@link SecretManager.InvalidToken})
+   * ({@link org.apache.hadoop.security.AccessControlException} or {@link org.apache.hadoop.security.token.SecretManager.InvalidToken})
    * or a RpcException.
    */
   public static Throwable getUnwrappedException(Exception ex) {
diff --git a/hadoop-hdds/common/src/main/java/org/apache/hadoop/hdds/client/DecommissionUtils.java b/hadoop-hdds/common/src/main/java/org/apache/hadoop/hdds/client/DecommissionUtils.java
index c176ad1464e..eb9f39f86de 100644
--- a/hadoop-hdds/common/src/main/java/org/apache/hadoop/hdds/client/DecommissionUtils.java
+++ b/hadoop-hdds/common/src/main/java/org/apache/hadoop/hdds/client/DecommissionUtils.java
@@ -97,7 +97,7 @@ public static JsonNode getBeansJsonNode(String metricsJson) throws IOException {
    * Returns the number of decommissioning nodes.
    *
    * @param jsonNode
-   * @return
+   * @return {@code int}
    */
   public static int getNumDecomNodes(JsonNode jsonNode) {
     int numDecomNodes;
@@ -118,7 +118,7 @@ public static int getNumDecomNodes(JsonNode jsonNode) {
    * @param numDecomNodes
    * @param countsMap
    * @param errMsg
-   * @return
+   * @return {@code Map<String, Object>}
    * @throws IOException
    */
   @Nullable
diff --git a/hadoop-hdds/common/src/main/java/org/apache/hadoop/hdds/scm/client/ScmClient.java b/hadoop-hdds/common/src/main/java/org/apache/hadoop/hdds/scm/client/ScmClient.java
index 1427fbf5873..2ca3e947438 100644
--- a/hadoop-hdds/common/src/main/java/org/apache/hadoop/hdds/scm/client/ScmClient.java
+++ b/hadoop-hdds/common/src/main/java/org/apache/hadoop/hdds/scm/client/ScmClient.java
@@ -396,7 +396,6 @@ StartContainerBalancerResponseProto startContainerBalancer(
    * Force generates new secret keys (rotate).
    *
    * @param force boolean flag that forcefully rotates the key on demand
-   * @return
    * @throws IOException
    */
   boolean rotateSecretKeys(boolean force) throws IOException;
diff --git a/hadoop-hdds/common/src/main/java/org/apache/hadoop/hdds/scm/container/ReplicationManagerReport.java b/hadoop-hdds/common/src/main/java/org/apache/hadoop/hdds/scm/container/ReplicationManagerReport.java
index df8e9d45e13..d3ac5c89f03 100644
--- a/hadoop-hdds/common/src/main/java/org/apache/hadoop/hdds/scm/container/ReplicationManagerReport.java
+++ b/hadoop-hdds/common/src/main/java/org/apache/hadoop/hdds/scm/container/ReplicationManagerReport.java
@@ -146,7 +146,7 @@ public long getReportTimeStamp() {
 
   /**
    * Return a map of all stats and their value as a long.
-   * @return
+   * @return {@code Map<String, Long>}
    */
   public Map<String, Long> getStats() {
     Map<String, Long> result = new HashMap<>();
@@ -159,7 +159,7 @@ public Map<String, Long> getStats() {
   /**
    * Return a map of all samples, with the stat as the key and the samples
    * for the stat as a List of Long.
-   * @return
+   * @return {@code Map<String, List<Long>>}
    */
   public Map<String, List<Long>> getSamples() {
     Map<String, List<Long>> result = new HashMap<>();
diff --git a/hadoop-hdds/common/src/main/java/org/apache/hadoop/hdds/scm/ha/SCMNodeInfo.java b/hadoop-hdds/common/src/main/java/org/apache/hadoop/hdds/scm/ha/SCMNodeInfo.java
index a5e443a598d..7ca7775f473 100644
--- a/hadoop-hdds/common/src/main/java/org/apache/hadoop/hdds/scm/ha/SCMNodeInfo.java
+++ b/hadoop-hdds/common/src/main/java/org/apache/hadoop/hdds/scm/ha/SCMNodeInfo.java
@@ -67,7 +67,7 @@ public class SCMNodeInfo {
   /**
    * Build SCM Node information from configuration.
    * @param conf
-   * @return
+   * @return {@code List<SCMNodeInfo>}
    */
   public static List<SCMNodeInfo> buildNodeInfo(ConfigurationSource conf) {
 
diff --git a/hadoop-hdds/common/src/main/java/org/apache/hadoop/hdds/scm/pipeline/Pipeline.java b/hadoop-hdds/common/src/main/java/org/apache/hadoop/hdds/scm/pipeline/Pipeline.java
index 1486f05f55c..52ee8e6ee0d 100644
--- a/hadoop-hdds/common/src/main/java/org/apache/hadoop/hdds/scm/pipeline/Pipeline.java
+++ b/hadoop-hdds/common/src/main/java/org/apache/hadoop/hdds/scm/pipeline/Pipeline.java
@@ -243,7 +243,7 @@ public int getReplicaIndex(DatanodeDetails dn) {
 
   /**
    * Get the replicaIndex Map.
-   * @return
+   * @return {@code Map<DatanodeDetails, Integer>}
    */
   public Map<DatanodeDetails, Integer> getReplicaIndexes() {
     return this.getNodes().stream().collect(Collectors.toMap(Function.identity(), this::getReplicaIndex));
diff --git a/hadoop-hdds/common/src/main/java/org/apache/hadoop/hdds/server/ServerUtils.java b/hadoop-hdds/common/src/main/java/org/apache/hadoop/hdds/server/ServerUtils.java
index 31aaca568e4..66685b4bbbd 100644
--- a/hadoop-hdds/common/src/main/java/org/apache/hadoop/hdds/server/ServerUtils.java
+++ b/hadoop-hdds/common/src/main/java/org/apache/hadoop/hdds/server/ServerUtils.java
@@ -131,7 +131,7 @@ public static InetSocketAddress updateListenAddress(OzoneConfiguration conf,
    * Fall back to OZONE_METADATA_DIRS if not defined.
    *
    * @param conf
-   * @return
+   * @return File
    */
   public static File getScmDbDir(ConfigurationSource conf) {
     File metadataDir = getDirectoryFromConfig(conf,
diff --git a/hadoop-hdds/common/src/main/java/org/apache/hadoop/hdds/utils/db/DelegatedCodec.java b/hadoop-hdds/common/src/main/java/org/apache/hadoop/hdds/utils/db/DelegatedCodec.java
index dff0b015ed5..8d6f3c32e53 100644
--- a/hadoop-hdds/common/src/main/java/org/apache/hadoop/hdds/utils/db/DelegatedCodec.java
+++ b/hadoop-hdds/common/src/main/java/org/apache/hadoop/hdds/utils/db/DelegatedCodec.java
@@ -23,9 +23,9 @@
 import java.io.IOException;
 
 /**
- * A {@link Codec} to serialize/deserialize objects by delegation.
+ * A {@link org.apache.hadoop.hdds.utils.db.Codec} to serialize/deserialize objects by delegation.
  *
- * @param <T>        The object type of this {@link Codec}.
+ * @param <T>        The object type of this {@link org.apache.hadoop.hdds.utils.db.Codec}.
  * @param <DELEGATE> The object type of the {@link #delegate}.
  */
 public class DelegatedCodec<T, DELEGATE> implements Codec<T> {
@@ -53,8 +53,8 @@ public enum CopyType {
    * Construct a {@link Codec} using the given delegate.
    *
    * @param delegate the delegate {@link Codec}
-   * @param forward a function to convert {@link DELEGATE} to {@link T}.
-   * @param backward a function to convert {@link T} back to {@link DELEGATE}.
+   * @param forward a function to convert {@code DELEGATE} to {@code T}.
+   * @param backward a function to convert {@code T} back to {@code DELEGATE}.
    * @param copyType How to {@link #copyObject(Object)}?
    */
   public DelegatedCodec(Codec<DELEGATE> delegate,
diff --git a/hadoop-hdds/common/src/main/java/org/apache/hadoop/ozone/container/common/helpers/ChunkInfoList.java b/hadoop-hdds/common/src/main/java/org/apache/hadoop/ozone/container/common/helpers/ChunkInfoList.java
index fdf40af9e09..832ab40d30f 100644
--- a/hadoop-hdds/common/src/main/java/org/apache/hadoop/ozone/container/common/helpers/ChunkInfoList.java
+++ b/hadoop-hdds/common/src/main/java/org/apache/hadoop/ozone/container/common/helpers/ChunkInfoList.java
@@ -27,7 +27,7 @@
 
 /**
  * Helper class to convert between protobuf lists and Java lists of
- * {@link ContainerProtos.ChunkInfo} objects.
+ * {@link org.apache.hadoop.hdds.protocol.datanode.proto.ContainerProtos.ChunkInfo} objects.
  * <p>
  * This class is immutable.
  */
@@ -49,7 +49,7 @@ public ChunkInfoList(List<ContainerProtos.ChunkInfo> chunks) {
   }
 
   /**
-   * @return A new {@link ChunkInfoList} created from protobuf data.
+   * @return A new {@link #ChunkInfoList} created from protobuf data.
    */
   public static ChunkInfoList getFromProtoBuf(
           ContainerProtos.ChunkInfoList chunksProto) {
diff --git a/hadoop-hdds/common/src/main/java/org/apache/hadoop/ozone/upgrade/LayoutVersionManager.java b/hadoop-hdds/common/src/main/java/org/apache/hadoop/ozone/upgrade/LayoutVersionManager.java
index 3137d756e6b..a765c2c9455 100644
--- a/hadoop-hdds/common/src/main/java/org/apache/hadoop/ozone/upgrade/LayoutVersionManager.java
+++ b/hadoop-hdds/common/src/main/java/org/apache/hadoop/ozone/upgrade/LayoutVersionManager.java
@@ -74,7 +74,6 @@ public interface LayoutVersionManager {
   /**
    * Generic API for returning a registered handler for a given type.
    * @param type String type
-   * @return
    */
   default Object getHandler(String type) {
     return null;

From 4a1b4c43b163a7292ba7812e4285cf8fc92d9cc5 Mon Sep 17 00:00:00 2001
From: daniilchik <dprizva55@gmail.com>
Date: Sat, 28 Sep 2024 13:16:14 +0300
Subject: [PATCH 18/50] HDDS-11484. Add check for javadoc correctness

---
 .../common/src/main/java/org/apache/hadoop/hdds/HddsUtils.java | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

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 ee57a30888f..662f4b39640 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
@@ -680,7 +680,8 @@ public static int roundupMb(long bytes) {
 
   /**
    * Unwrap exception to check if it is some kind of access control problem
-   * ({@link org.apache.hadoop.security.AccessControlException} or {@link org.apache.hadoop.security.token.SecretManager.InvalidToken})
+   * ({@link org.apache.hadoop.security.AccessControlException} or
+   * {@link org.apache.hadoop.security.token.SecretManager.InvalidToken})
    * or a RpcException.
    */
   public static Throwable getUnwrappedException(Exception ex) {

From fbb6bb0dc375eb1cbc9acc4d07acc56b71cd4380 Mon Sep 17 00:00:00 2001
From: daniilchik <dprizva55@gmail.com>
Date: Sat, 28 Sep 2024 13:53:43 +0300
Subject: [PATCH 19/50] HDDS-11484. Add check for javadoc correctness

---
 .../hadoop/hdds/scm/storage/ExtendedInputStream.java   |  2 +-
 .../hadoop/ozone/client/io/ECBlockInputStream.java     | 10 +++++-----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/hadoop-hdds/client/src/main/java/org/apache/hadoop/hdds/scm/storage/ExtendedInputStream.java b/hadoop-hdds/client/src/main/java/org/apache/hadoop/hdds/scm/storage/ExtendedInputStream.java
index 3e78abbf485..18a9450bb01 100644
--- a/hadoop-hdds/client/src/main/java/org/apache/hadoop/hdds/scm/storage/ExtendedInputStream.java
+++ b/hadoop-hdds/client/src/main/java/org/apache/hadoop/hdds/scm/storage/ExtendedInputStream.java
@@ -75,7 +75,7 @@ public synchronized int read(ByteBuffer byteBuffer) throws IOException {
    * readWithStrategy implementation, as it will never be called by the tests.
    *
    * @param strategy
-   * @return
+   * @return {@code int}
    * @throws IOException
    */
   protected abstract int readWithStrategy(ByteReaderStrategy strategy) throws
diff --git a/hadoop-hdds/client/src/main/java/org/apache/hadoop/ozone/client/io/ECBlockInputStream.java b/hadoop-hdds/client/src/main/java/org/apache/hadoop/ozone/client/io/ECBlockInputStream.java
index 6342de2c338..82547e18ed3 100644
--- a/hadoop-hdds/client/src/main/java/org/apache/hadoop/ozone/client/io/ECBlockInputStream.java
+++ b/hadoop-hdds/client/src/main/java/org/apache/hadoop/ozone/client/io/ECBlockInputStream.java
@@ -152,7 +152,7 @@ protected int calculateExpectedDataBlocks(ECReplicationConfig rConfig) {
    * Using the current position, returns the index of the blockStream we should
    * be reading from. This is the index in the internal array holding the
    * stream reference. The block group index will be one greater than this.
-   * @return
+   * @return {@code int}
    */
   protected int currentStreamIndex() {
     return (int)((position / ecChunkSize) % repConfig.getData());
@@ -206,7 +206,7 @@ protected BlockExtendedInputStream getOrOpenStream(int locationIndex) throws IOE
    * to the replicaIndex given based on the EC pipeline fetched from SCM.
    * @param replicaIndex
    * @param refreshFunc
-   * @return
+   * @return {@code Function<BlockID, BlockLocationInfo>}
    */
   protected Function<BlockID, BlockLocationInfo> ecPipelineRefreshFunction(
       int replicaIndex, Function<BlockID, BlockLocationInfo> refreshFunc) {
@@ -241,7 +241,7 @@ protected Function<BlockID, BlockLocationInfo> ecPipelineRefreshFunction(
    * potentially partial last stripe. Note that the internal block index is
    * numbered starting from 1.
    * @param index - Index number of the internal block, starting from 1
-   * @return
+   * @return {@code long}
    */
   protected long internalBlockLength(int index) {
     long lastStripe = blockInfo.getLength() % stripeSize;
@@ -344,7 +344,7 @@ protected boolean shouldRetryFailedRead(int failedIndex) {
    * strategy buffer. This call may read from several internal BlockInputStreams
    * if there is sufficient space in the buffer.
    * @param strategy
-   * @return
+   * @return {@code int}
    * @throws IOException
    */
   @Override
@@ -409,7 +409,7 @@ protected void seekStreamIfNecessary(BlockExtendedInputStream stream,
    * group length.
    * @param stream Stream to read from
    * @param strategy The ReaderStrategy to read data into
-   * @return
+   * @return {@code int}
    * @throws IOException
    */
   private int readFromStream(BlockExtendedInputStream stream,

From 4d8a118690b8b579b591697d8ed83858e2a2de04 Mon Sep 17 00:00:00 2001
From: daniilchik <dprizva55@gmail.com>
Date: Sat, 28 Sep 2024 14:34:46 +0300
Subject: [PATCH 20/50] HDDS-11484. Add check for javadoc correctness

---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 0692efa1e32..a5384a1ccdd 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1893,7 +1893,7 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xs
             <artifactId>maven-javadoc-plugin</artifactId>
             <configuration>
               <additionalJOption>-Xdoclint:none</additionalJOption>
-              <failOnWarnings>true</failOnWarnings>
+              <failOnWarnings>false</failOnWarnings>
             </configuration>
             <executions>
               <execution>

From c6502343a211301188049afc32f84cb0e43bb921 Mon Sep 17 00:00:00 2001
From: daniilchik <dprizva55@gmail.com>
Date: Sat, 28 Sep 2024 14:34:55 +0300
Subject: [PATCH 21/50] HHDS-11484. Add check for javadoc correctness


From 6f60dcb9e877a372d2065ed1a8801340a117dd35 Mon Sep 17 00:00:00 2001
From: daniilchik <dprizva55@gmail.com>
Date: Sat, 28 Sep 2024 15:53:33 +0300
Subject: [PATCH 22/50] HDDS-11484. Add check for javadoc correctness

---
 .../container/common/impl/OpenContainerBlockMap.java      | 2 +-
 .../container/common/interfaces/ContainerDispatcher.java  | 2 +-
 .../transport/server/ratis/ContainerStateMachine.java     | 2 +-
 .../ozone/container/keyvalue/KeyValueContainer.java       | 2 +-
 .../ozone/container/keyvalue/KeyValueContainerData.java   | 4 ++--
 .../ozone/container/keyvalue/helpers/BlockUtils.java      | 2 +-
 .../container/keyvalue/impl/ChunkManagerFactory.java      | 2 +-
 .../container/keyvalue/impl/StreamDataChannelBase.java    | 4 +++-
 .../ozone/container/metadata/AbstractDatanodeStore.java   | 8 ++++----
 .../container/metadata/SchemaOneChunkInfoListCodec.java   | 2 +-
 .../hadoop/ozone/container/stream/StreamingSource.java    | 2 +-
 .../apache/hadoop/hdds/protocol/SCMSecurityProtocol.java  | 2 +-
 .../SCMSecurityProtocolClientSideTranslatorPB.java        | 2 +-
 .../apache/hadoop/hdds/security/token/TokenVerifier.java  | 3 +--
 .../x509/certificate/client/DefaultCertificateClient.java | 2 +-
 .../java/org/apache/hadoop/hdds/utils/HddsServerUtil.java | 2 +-
 .../org/apache/hadoop/hdds/utils/db/RocksDatabase.java    | 2 +-
 .../main/java/org/apache/hadoop/hdds/utils/db/Table.java  | 8 ++++----
 .../java/org/apache/hadoop/hdds/scm/PlacementPolicy.java  | 6 +++---
 .../apache/hadoop/hdds/scm/SCMCommonPlacementPolicy.java  | 6 +++---
 .../scm/container/replication/ContainerHealthResult.java  | 2 +-
 .../scm/container/replication/health/HealthCheck.java     | 2 +-
 .../org/apache/hadoop/hdds/scm/ha/HASecurityUtils.java    | 4 ++--
 .../java/org/apache/hadoop/hdds/scm/ha/SCMHAManager.java  | 1 -
 .../org/apache/hadoop/hdds/scm/node/SCMNodeManager.java   | 4 ++--
 .../hadoop/hdds/scm/server/SCMDatanodeProtocolServer.java | 2 +-
 .../hadoop/hdds/scm/server/SCMSecurityProtocolServer.java | 2 +-
 .../apache/hadoop/ozone/client/OzoneClientFactory.java    | 2 +-
 .../hadoop/ozone/client/io/SelectorOutputStream.java      | 2 +-
 .../org/apache/hadoop/ozone/om/helpers/OmKeyInfo.java     | 4 ++--
 .../hadoop/ozone/om/helpers/OzoneIdentityProvider.java    | 2 +-
 .../apache/hadoop/ozone/om/helpers/RepeatedOmKeyInfo.java | 4 ++--
 .../hadoop/ozone/om/multitenant/AccountNameSpace.java     | 4 ++--
 .../hadoop/ozone/om/multitenant/BucketNameSpace.java      | 4 ++--
 .../hadoop/ozone/om/protocol/OzoneManagerProtocol.java    | 2 +-
 .../ozone/om/ratis/utils/OzoneManagerRatisUtils.java      | 2 +-
 .../apache/hadoop/ozone/om/request/RequestAuditor.java    | 1 -
 .../ozone/om/request/file/OMDirectoryCreateRequest.java   | 2 +-
 .../hadoop/ozone/om/request/file/OMFileRequest.java       | 2 +-
 .../ozone/om/request/key/OMKeyCreateRequestWithFSO.java   | 2 +-
 .../ozone/om/request/key/OMKeyRenameRequestWithFSO.java   | 4 ++--
 .../apache/hadoop/ozone/om/request/key/OMKeyRequest.java  | 4 ++--
 .../apache/hadoop/ozone/om/snapshot/SnapshotUtils.java    | 2 +-
 .../apache/hadoop/ozone/protocolPB/RequestHandler.java    | 2 +-
 .../fs/ozone/BasicRootedOzoneClientAdapterImpl.java       | 2 +-
 .../java/org/apache/hadoop/ozone/recon/ReconUtils.java    | 2 +-
 .../ozone/recon/recovery/ReconOMMetadataManager.java      | 2 +-
 .../org/apache/hadoop/ozone/shell/StoreTypeOption.java    | 2 +-
 48 files changed, 67 insertions(+), 68 deletions(-)

diff --git a/hadoop-hdds/container-service/src/main/java/org/apache/hadoop/ozone/container/common/impl/OpenContainerBlockMap.java b/hadoop-hdds/container-service/src/main/java/org/apache/hadoop/ozone/container/common/impl/OpenContainerBlockMap.java
index d6ca2d120e6..2e11cde3d9e 100644
--- a/hadoop-hdds/container-service/src/main/java/org/apache/hadoop/ozone/container/common/impl/OpenContainerBlockMap.java
+++ b/hadoop-hdds/container-service/src/main/java/org/apache/hadoop/ozone/container/common/impl/OpenContainerBlockMap.java
@@ -35,7 +35,7 @@
 /**
  * Map: containerId {@literal ->} (localId {@literal ->} {@link BlockData}).
  * The outer container map does not entail locking for a better performance.
- * The inner {@link BlockDataMap} is synchronized.
+ * The inner {@code BlockDataMap} is synchronized.
  *
  * This class will maintain list of open keys per container when closeContainer
  * command comes, it should autocommit all open keys of a open container before
diff --git a/hadoop-hdds/container-service/src/main/java/org/apache/hadoop/ozone/container/common/interfaces/ContainerDispatcher.java b/hadoop-hdds/container-service/src/main/java/org/apache/hadoop/ozone/container/common/interfaces/ContainerDispatcher.java
index d02bae0a35a..2682cf7a3e8 100644
--- a/hadoop-hdds/container-service/src/main/java/org/apache/hadoop/ozone/container/common/interfaces/ContainerDispatcher.java
+++ b/hadoop-hdds/container-service/src/main/java/org/apache/hadoop/ozone/container/common/interfaces/ContainerDispatcher.java
@@ -75,7 +75,7 @@ void validateContainerCommand(
   /**
    * Returns the handler for the specified containerType.
    * @param containerType
-   * @return
+   * @return {@code Handler}
    */
   Handler getHandler(ContainerProtos.ContainerType containerType);
 
diff --git a/hadoop-hdds/container-service/src/main/java/org/apache/hadoop/ozone/container/common/transport/server/ratis/ContainerStateMachine.java b/hadoop-hdds/container-service/src/main/java/org/apache/hadoop/ozone/container/common/transport/server/ratis/ContainerStateMachine.java
index 9dc6af19353..80852f11263 100644
--- a/hadoop-hdds/container-service/src/main/java/org/apache/hadoop/ozone/container/common/transport/server/ratis/ContainerStateMachine.java
+++ b/hadoop-hdds/container-service/src/main/java/org/apache/hadoop/ozone/container/common/transport/server/ratis/ContainerStateMachine.java
@@ -707,7 +707,7 @@ private ExecutorService getChunkExecutor(WriteChunkRequestProto req) {
   /**
    * {@link #writeStateMachineData(ContainerCommandRequestProto, long, long, long)}
    * calls are not synchronized with each other
-   * and also with {@link #applyTransaction(TransactionContext)}.
+   * and also with {@code applyTransaction(TransactionContext)}.
    */
   @Override
   public CompletableFuture<Message> write(LogEntryProto entry, TransactionContext trx) {
diff --git a/hadoop-hdds/container-service/src/main/java/org/apache/hadoop/ozone/container/keyvalue/KeyValueContainer.java b/hadoop-hdds/container-service/src/main/java/org/apache/hadoop/ozone/container/keyvalue/KeyValueContainer.java
index 98d81c15d0a..a4f28cadf53 100644
--- a/hadoop-hdds/container-service/src/main/java/org/apache/hadoop/ozone/container/keyvalue/KeyValueContainer.java
+++ b/hadoop-hdds/container-service/src/main/java/org/apache/hadoop/ozone/container/keyvalue/KeyValueContainer.java
@@ -932,7 +932,7 @@ private ContainerReplicaProto.State getHddsState()
 
   /**
    * Returns container DB file.
-   * @return
+   * @return {@code File}
    */
   public File getContainerDBFile() {
     return KeyValueContainerLocationUtil.getContainerDBFile(containerData);
diff --git a/hadoop-hdds/container-service/src/main/java/org/apache/hadoop/ozone/container/keyvalue/KeyValueContainerData.java b/hadoop-hdds/container-service/src/main/java/org/apache/hadoop/ozone/container/keyvalue/KeyValueContainerData.java
index 47d4f3f9e70..03af99a0de6 100644
--- a/hadoop-hdds/container-service/src/main/java/org/apache/hadoop/ozone/container/keyvalue/KeyValueContainerData.java
+++ b/hadoop-hdds/container-service/src/main/java/org/apache/hadoop/ozone/container/keyvalue/KeyValueContainerData.java
@@ -430,7 +430,7 @@ public KeyPrefixFilter getDeletingBlockKeyFilter() {
   /**
    * Schema v3 use a prefix as startKey,
    * for other schemas just return null.
-   * @return
+   * @return {@code String}
    */
   public String startKeyEmpty() {
     if (hasSchema(SCHEMA_V3)) {
@@ -442,7 +442,7 @@ public String startKeyEmpty() {
   /**
    * Schema v3 use containerID as key prefix,
    * for other schemas just return null.
-   * @return
+   * @return {@code String}
    */
   public String containerPrefix() {
     if (hasSchema(SCHEMA_V3)) {
diff --git a/hadoop-hdds/container-service/src/main/java/org/apache/hadoop/ozone/container/keyvalue/helpers/BlockUtils.java b/hadoop-hdds/container-service/src/main/java/org/apache/hadoop/ozone/container/keyvalue/helpers/BlockUtils.java
index 7773b54f794..59485029913 100644
--- a/hadoop-hdds/container-service/src/main/java/org/apache/hadoop/ozone/container/keyvalue/helpers/BlockUtils.java
+++ b/hadoop-hdds/container-service/src/main/java/org/apache/hadoop/ozone/container/keyvalue/helpers/BlockUtils.java
@@ -99,7 +99,7 @@ public static DatanodeStore getUncachedDatanodeStore(
    * opened by this thread, the other thread will get a RocksDB exception.
    * @param containerData The container data
    * @param conf Configuration
-   * @return
+   * @return {@code DatanodeStore}
    * @throws IOException
    */
   public static DatanodeStore getUncachedDatanodeStore(
diff --git a/hadoop-hdds/container-service/src/main/java/org/apache/hadoop/ozone/container/keyvalue/impl/ChunkManagerFactory.java b/hadoop-hdds/container-service/src/main/java/org/apache/hadoop/ozone/container/keyvalue/impl/ChunkManagerFactory.java
index 288a2d3e331..82a6fe1f874 100644
--- a/hadoop-hdds/container-service/src/main/java/org/apache/hadoop/ozone/container/keyvalue/impl/ChunkManagerFactory.java
+++ b/hadoop-hdds/container-service/src/main/java/org/apache/hadoop/ozone/container/keyvalue/impl/ChunkManagerFactory.java
@@ -46,7 +46,7 @@ private ChunkManagerFactory() {
    * @param conf     Configuration
    * @param manager  This parameter will be used only for read data of
    *                 FILE_PER_CHUNK layout file. Can be null for other cases.
-   * @return
+   * @return {@code ChunkManager}
    */
   public static ChunkManager createChunkManager(ConfigurationSource conf,
       BlockManager manager, VolumeSet volSet) {
diff --git a/hadoop-hdds/container-service/src/main/java/org/apache/hadoop/ozone/container/keyvalue/impl/StreamDataChannelBase.java b/hadoop-hdds/container-service/src/main/java/org/apache/hadoop/ozone/container/keyvalue/impl/StreamDataChannelBase.java
index 8df856d4b93..601e7b2712c 100644
--- a/hadoop-hdds/container-service/src/main/java/org/apache/hadoop/ozone/container/keyvalue/impl/StreamDataChannelBase.java
+++ b/hadoop-hdds/container-service/src/main/java/org/apache/hadoop/ozone/container/keyvalue/impl/StreamDataChannelBase.java
@@ -99,7 +99,9 @@ public void setLinked() {
     linked.set(true);
   }
 
-  /** @return true iff {@link StateMachine.DataChannel} is already linked. */
+  /**
+   * @return true if {@link org.apache.ratis.statemachine.StateMachine.DataChannel} is already linked.
+   */
   public boolean cleanUp() {
     if (linked.get()) {
       // already linked, nothing to do.
diff --git a/hadoop-hdds/container-service/src/main/java/org/apache/hadoop/ozone/container/metadata/AbstractDatanodeStore.java b/hadoop-hdds/container-service/src/main/java/org/apache/hadoop/ozone/container/metadata/AbstractDatanodeStore.java
index 26719d7f035..88aeb3c174d 100644
--- a/hadoop-hdds/container-service/src/main/java/org/apache/hadoop/ozone/container/metadata/AbstractDatanodeStore.java
+++ b/hadoop-hdds/container-service/src/main/java/org/apache/hadoop/ozone/container/metadata/AbstractDatanodeStore.java
@@ -300,9 +300,9 @@ protected static void checkTableStatus(Table<?, ?> table, String name)
 
   /**
    * Block Iterator for KeyValue Container. This block iterator returns blocks
-   * which match with the {@link MetadataKeyFilters.KeyPrefixFilter}. If no
+   * which match with the {@link org.apache.hadoop.hdds.utils.MetadataKeyFilters.KeyPrefixFilter}. If no
    * filter is specified, then default filter used is
-   * {@link MetadataKeyFilters#getUnprefixedKeyFilter()}
+   * {@link org.apache.hadoop.hdds.utils.MetadataKeyFilters#getUnprefixedKeyFilter()}
    */
   @InterfaceAudience.Public
   public static class KeyValueBlockIterator implements
@@ -405,9 +405,9 @@ public void close() throws IOException {
   /**
    * Block localId Iterator for KeyValue Container.
    * This Block localId iterator returns localIds
-   * which match with the {@link MetadataKeyFilters.KeyPrefixFilter}. If no
+   * which match with the {@link org.apache.hadoop.hdds.utils.MetadataKeyFilters.KeyPrefixFilter}. If no
    * filter is specified, then default filter used is
-   * {@link MetadataKeyFilters#getUnprefixedKeyFilter()}
+   * {@link org.apache.hadoop.hdds.utils.MetadataKeyFilters#getUnprefixedKeyFilter()}
    */
   @InterfaceAudience.Public
   public static class KeyValueBlockLocalIdIterator implements
diff --git a/hadoop-hdds/container-service/src/main/java/org/apache/hadoop/ozone/container/metadata/SchemaOneChunkInfoListCodec.java b/hadoop-hdds/container-service/src/main/java/org/apache/hadoop/ozone/container/metadata/SchemaOneChunkInfoListCodec.java
index 4beb2075432..fd0de9ea6a5 100644
--- a/hadoop-hdds/container-service/src/main/java/org/apache/hadoop/ozone/container/metadata/SchemaOneChunkInfoListCodec.java
+++ b/hadoop-hdds/container-service/src/main/java/org/apache/hadoop/ozone/container/metadata/SchemaOneChunkInfoListCodec.java
@@ -25,7 +25,7 @@
 import java.io.IOException;
 
 /**
- * Codec for parsing {@link ContainerProtos.ChunkInfoList} objects from data
+ * Codec for parsing {@link org.apache.hadoop.hdds.protocol.datanode.proto.ContainerProtos.ChunkInfoList} objects from data
  * that may have been written using schema version one. Before upgrading
  * schema versions, deleted block IDs were stored with a duplicate copy of
  * their ID as the value in the database. After upgrading the code, any
diff --git a/hadoop-hdds/container-service/src/main/java/org/apache/hadoop/ozone/container/stream/StreamingSource.java b/hadoop-hdds/container-service/src/main/java/org/apache/hadoop/ozone/container/stream/StreamingSource.java
index 58b5cf11622..e49f3c3d6e5 100644
--- a/hadoop-hdds/container-service/src/main/java/org/apache/hadoop/ozone/container/stream/StreamingSource.java
+++ b/hadoop-hdds/container-service/src/main/java/org/apache/hadoop/ozone/container/stream/StreamingSource.java
@@ -27,7 +27,7 @@ public interface StreamingSource {
 
   /**
    *
-   * @param id: custom identifier
+   * @param id custom identifier
    *
    * @return map of files which should be copied (logical name -&gt; real path)
    */
diff --git a/hadoop-hdds/framework/src/main/java/org/apache/hadoop/hdds/protocol/SCMSecurityProtocol.java b/hadoop-hdds/framework/src/main/java/org/apache/hadoop/hdds/protocol/SCMSecurityProtocol.java
index cbb4f3fc2ee..caf53e395bf 100644
--- a/hadoop-hdds/framework/src/main/java/org/apache/hadoop/hdds/protocol/SCMSecurityProtocol.java
+++ b/hadoop-hdds/framework/src/main/java/org/apache/hadoop/hdds/protocol/SCMSecurityProtocol.java
@@ -118,7 +118,7 @@ String getSCMCertificate(ScmNodeDetailsProto scmNodeDetails,
 
   /**
    * Get Root CA certificate.
-   * @return
+   * @return {@code String}
    * @throws IOException
    */
   String getRootCACertificate() throws IOException;
diff --git a/hadoop-hdds/framework/src/main/java/org/apache/hadoop/hdds/protocolPB/SCMSecurityProtocolClientSideTranslatorPB.java b/hadoop-hdds/framework/src/main/java/org/apache/hadoop/hdds/protocolPB/SCMSecurityProtocolClientSideTranslatorPB.java
index a938d53c7c4..46eac7b37ef 100644
--- a/hadoop-hdds/framework/src/main/java/org/apache/hadoop/hdds/protocolPB/SCMSecurityProtocolClientSideTranslatorPB.java
+++ b/hadoop-hdds/framework/src/main/java/org/apache/hadoop/hdds/protocolPB/SCMSecurityProtocolClientSideTranslatorPB.java
@@ -330,7 +330,7 @@ public SCMGetCertResponseProto getCACert() throws IOException {
    * @param role          - node type: OM/SCM/DN.
    * @param startSerialId - start cert serial id.
    * @param count         - max number of certificates returned in a batch.
-   * @return
+   * @return {@code List<String>}
    * @throws IOException
    */
   @Override
diff --git a/hadoop-hdds/framework/src/main/java/org/apache/hadoop/hdds/security/token/TokenVerifier.java b/hadoop-hdds/framework/src/main/java/org/apache/hadoop/hdds/security/token/TokenVerifier.java
index e7e029f7087..da651160d04 100644
--- a/hadoop-hdds/framework/src/main/java/org/apache/hadoop/hdds/security/token/TokenVerifier.java
+++ b/hadoop-hdds/framework/src/main/java/org/apache/hadoop/hdds/security/token/TokenVerifier.java
@@ -50,8 +50,7 @@ void verify(Token<?> token,
       ContainerCommandRequestProtoOrBuilder cmd)
       throws SCMSecurityException;
 
-  /** Same as {@link #verify(Token,
-   * ContainerCommandRequestProtoOrBuilder)}, but with encoded token. */
+  /** Same as {@link #verify}, but with encoded token. */
   default void verify(ContainerCommandRequestProtoOrBuilder cmd,
       String encodedToken) throws SCMSecurityException {
 
diff --git a/hadoop-hdds/framework/src/main/java/org/apache/hadoop/hdds/security/x509/certificate/client/DefaultCertificateClient.java b/hadoop-hdds/framework/src/main/java/org/apache/hadoop/hdds/security/x509/certificate/client/DefaultCertificateClient.java
index 719ed0d43e9..42292b9663f 100644
--- a/hadoop-hdds/framework/src/main/java/org/apache/hadoop/hdds/security/x509/certificate/client/DefaultCertificateClient.java
+++ b/hadoop-hdds/framework/src/main/java/org/apache/hadoop/hdds/security/x509/certificate/client/DefaultCertificateClient.java
@@ -1086,7 +1086,7 @@ public Duration timeBeforeExpiryGracePeriod(X509Certificate certificate) {
    * Renew keys and certificate. Save the keys are certificate to disk in new
    * directories, swap the current key directory and certs directory with the
    * new directories.
-   * @param force, check certificate expiry time again if force is false.
+   * @param force check certificate expiry time again if force is false.
    * @return String, new certificate ID
    * */
   public String renewAndStoreKeyAndCertificate(boolean force)
diff --git a/hadoop-hdds/framework/src/main/java/org/apache/hadoop/hdds/utils/HddsServerUtil.java b/hadoop-hdds/framework/src/main/java/org/apache/hadoop/hdds/utils/HddsServerUtil.java
index 3bcd5532b98..32dcc2019c4 100644
--- a/hadoop-hdds/framework/src/main/java/org/apache/hadoop/hdds/utils/HddsServerUtil.java
+++ b/hadoop-hdds/framework/src/main/java/org/apache/hadoop/hdds/utils/HddsServerUtil.java
@@ -125,7 +125,7 @@ private HddsServerUtil() {
       HddsServerUtil.class);
 
   /**
-   * Add protobuf-based protocol to the {@link RPC.Server}.
+   * Add protobuf-based protocol to the {@link org.apache.hadoop.ipc.RPC.Server}.
    * @param conf configuration
    * @param protocol Protocol interface
    * @param service service that implements the protocol
diff --git a/hadoop-hdds/framework/src/main/java/org/apache/hadoop/hdds/utils/db/RocksDatabase.java b/hadoop-hdds/framework/src/main/java/org/apache/hadoop/hdds/utils/db/RocksDatabase.java
index c441ec929c7..c156b8e4d67 100644
--- a/hadoop-hdds/framework/src/main/java/org/apache/hadoop/hdds/utils/db/RocksDatabase.java
+++ b/hadoop-hdds/framework/src/main/java/org/apache/hadoop/hdds/utils/db/RocksDatabase.java
@@ -841,7 +841,7 @@ private int getLastLevel() throws IOException {
   /**
    * Deletes sst files which do not correspond to prefix
    * for given table.
-   * @param prefixPairs, a map of TableName to prefixUsed.
+   * @param prefixPairs a map of TableName to prefixUsed.
    */
   public void deleteFilesNotMatchingPrefix(Map<String, String> prefixPairs)
       throws IOException, RocksDBException {
diff --git a/hadoop-hdds/framework/src/main/java/org/apache/hadoop/hdds/utils/db/Table.java b/hadoop-hdds/framework/src/main/java/org/apache/hadoop/hdds/utils/db/Table.java
index 5cfdcdb8a03..e101e1c935f 100644
--- a/hadoop-hdds/framework/src/main/java/org/apache/hadoop/hdds/utils/db/Table.java
+++ b/hadoop-hdds/framework/src/main/java/org/apache/hadoop/hdds/utils/db/Table.java
@@ -170,7 +170,7 @@ default VALUE getReadCopy(KEY key) throws IOException {
   /**
    * Returns a prefixed iterator for this metadata store.
    * @param prefix
-   * @return
+   * @return MetaStoreIterator
    */
   TableIterator<KEY, ? extends KeyValue<KEY, VALUE>> iterator(KEY prefix)
       throws IOException;
@@ -262,7 +262,7 @@ default TableCacheMetrics createCacheMetrics() throws IOException {
    * the value for count must be an integer greater than 0.
    * <p>
    * This method allows to specify one or more
-   * {@link MetadataKeyFilters.MetadataKeyFilter}
+   * {@link org.apache.hadoop.hdds.utils.MetadataKeyFilters.MetadataKeyFilter}
    * to filter keys by certain condition. Once given, only the entries
    * whose key passes all the filters will be included in the result.
    *
@@ -270,7 +270,7 @@ default TableCacheMetrics createCacheMetrics() throws IOException {
    * @param count max number of entries to return.
    * @param prefix fixed key schema specific prefix
    * @param filters customized one or more
-   * {@link MetadataKeyFilters.MetadataKeyFilter}.
+   * {@link org.apache.hadoop.hdds.utils.MetadataKeyFilters.MetadataKeyFilter}.
    * @return a list of entries found in the database or an empty list if the
    * startKey is invalid.
    * @throws IOException if there are I/O errors.
@@ -293,7 +293,7 @@ List<? extends KeyValue<KEY, VALUE>> getRangeKVs(KEY startKey,
    * @param count max number of entries to return.
    * @param prefix fixed key schema specific prefix
    * @param filters customized one or more
-   * {@link MetadataKeyFilters.MetadataKeyFilter}.
+   * {@link org.apache.hadoop.hdds.utils.MetadataKeyFilters.MetadataKeyFilter}.
    * @return a list of entries found in the database.
    * @throws IOException
    * @throws IllegalArgumentException
diff --git a/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/PlacementPolicy.java b/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/PlacementPolicy.java
index a792e2cea6b..05eb32722e7 100644
--- a/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/PlacementPolicy.java
+++ b/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/PlacementPolicy.java
@@ -73,7 +73,7 @@ ContainerPlacementStatus validateContainerPlacement(
    * Given a set of replicas of a container which are
    * neither over underreplicated nor overreplicated,
    * return a set of replicas to copy to another node to fix misreplication.
-   * @param replicas: Map of replicas with value signifying if
+   * @param replicas Map of replicas with value signifying if
    *                  replica can be copied
    */
   Set<ContainerReplica> replicasToCopyToFixMisreplication(
@@ -82,8 +82,8 @@ Set<ContainerReplica> replicasToCopyToFixMisreplication(
   /**
    * Given a set of replicas of a container which are overreplicated,
    * return a set of replicas to delete to fix overreplication.
-   * @param replicas: Set of existing replicas of the container
-   * @param expectedCountPerUniqueReplica: Replication factor of each
+   * @param replicas Set of existing replicas of the container
+   * @param expectedCountPerUniqueReplica Replication factor of each
    *                                     unique replica
    */
   Set<ContainerReplica> replicasToRemoveToFixOverreplication(
diff --git a/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/SCMCommonPlacementPolicy.java b/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/SCMCommonPlacementPolicy.java
index 6489eeffe81..b603ba11b15 100644
--- a/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/SCMCommonPlacementPolicy.java
+++ b/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/SCMCommonPlacementPolicy.java
@@ -525,7 +525,7 @@ public boolean isValidNode(DatanodeDetails datanodeDetails,
    * Given a set of replicas of a container which are
    * neither over underreplicated nor overreplicated,
    * return a set of replicas to copy to another node to fix misreplication.
-   * @param replicas: Map of replicas with value signifying if
+   * @param replicas Map of replicas with value signifying if
    *                  replica can be copied
    */
   @Override
@@ -595,8 +595,8 @@ protected Node getPlacementGroup(DatanodeDetails dn) {
    * to be removed is also removed from the maps created above &amp;
    * the count for rack is reduced.
    * The set of replicas computed are then returned by the function.
-   * @param replicas: Set of existing replicas of the container
-   * @param expectedCountPerUniqueReplica: Replication factor of each
+   * @param replicas Set of existing replicas of the container
+   * @param expectedCountPerUniqueReplica Replication factor of each
    *    *                                     unique replica
    * @return Set of replicas to be removed are computed.
    */
diff --git a/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/container/replication/ContainerHealthResult.java b/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/container/replication/ContainerHealthResult.java
index 0abe8f6ea34..22065556414 100644
--- a/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/container/replication/ContainerHealthResult.java
+++ b/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/container/replication/ContainerHealthResult.java
@@ -248,7 +248,7 @@ public void setOfflineIndexesOkAfterPending(boolean val) {
     /**
      * Returns true if a container has under-replication caused by offline
      * indexes, but it is corrected by a pending add.
-     * @return
+     * @return {@code boolean}
      */
     public boolean offlineIndexesOkAfterPending() {
       return offlineIndexesOkAfterPending;
diff --git a/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/container/replication/health/HealthCheck.java b/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/container/replication/health/HealthCheck.java
index a95c0d39945..da9f72d230e 100644
--- a/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/container/replication/health/HealthCheck.java
+++ b/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/container/replication/health/HealthCheck.java
@@ -49,7 +49,7 @@ public interface HealthCheck {
    * returns false. This allows handlers to be chained together, and each will
    * be tried in turn until one succeeds.
    * @param handler
-   * @return
+   * @return {@code HealthCheck}
    */
   HealthCheck addNext(HealthCheck handler);
 
diff --git a/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/ha/HASecurityUtils.java b/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/ha/HASecurityUtils.java
index f0d78b23079..b08269e14c9 100644
--- a/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/ha/HASecurityUtils.java
+++ b/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/ha/HASecurityUtils.java
@@ -58,7 +58,7 @@
 /**
  * Utilities for SCM HA security.
  */
-public final class HASecurityUtils {
+public final class  HASecurityUtils {
 
   private HASecurityUtils() {
   }
@@ -150,7 +150,7 @@ public static CertificateServer initializeRootCertificateServer(
    *
    * @param conf
    * @param certificateClient
-   * @return
+   * @return {@code GrpcTlsConfig}
    */
   public static GrpcTlsConfig createSCMRatisTLSConfig(SecurityConfig conf,
       CertificateClient certificateClient) throws IOException {
diff --git a/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/ha/SCMHAManager.java b/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/ha/SCMHAManager.java
index 03f6ae293b2..92a5140ff2a 100644
--- a/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/ha/SCMHAManager.java
+++ b/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/ha/SCMHAManager.java
@@ -55,7 +55,6 @@ public interface SCMHAManager extends AutoCloseable {
   /**
    * Returns the DBTransactionBuffer as SCMHADBTransactionBuffer if its
    * valid.
-   * @return
    */
   SCMHADBTransactionBuffer asSCMHADBTransactionBuffer();
 
diff --git a/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/node/SCMNodeManager.java b/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/node/SCMNodeManager.java
index 7121d8f7a9d..bedb09b6957 100644
--- a/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/node/SCMNodeManager.java
+++ b/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/node/SCMNodeManager.java
@@ -1166,7 +1166,7 @@ public Map<String, Map<String, String>> getNodeStatusInfo() {
    * Calculate the storage capacity of the DataNode node.
    * @param storageReports Calculate the storage capacity corresponding
    *                       to the storage collection.
-   * @return
+   * @return {@code String}
    */
   public static String calculateStorageCapacity(
       List<StorageReportProto> storageReports) {
@@ -1214,7 +1214,7 @@ private static String convertUnit(double value) {
    * Calculate the storage usage percentage of a DataNode node.
    * @param storageReports Calculate the storage percentage corresponding
    *                       to the storage collection.
-   * @return
+   * @return {@code String[]}
    */
   public static String[] calculateStoragePercentage(
       List<StorageReportProto> storageReports) {
diff --git a/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/server/SCMDatanodeProtocolServer.java b/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/server/SCMDatanodeProtocolServer.java
index 0cc6ab7ab9d..4db50e2a0ac 100644
--- a/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/server/SCMDatanodeProtocolServer.java
+++ b/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/server/SCMDatanodeProtocolServer.java
@@ -483,7 +483,7 @@ private static String flatten(String input) {
 
   /**
    * Get Key associated with Datanode address for this server.
-   * @return
+   * @return {@code String}
    */
   protected String getDatanodeAddressKey() {
     return this.scm.getScmNodeDetails().getDatanodeAddressKey();
diff --git a/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/server/SCMSecurityProtocolServer.java b/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/server/SCMSecurityProtocolServer.java
index 88b3c887746..2875e926d58 100644
--- a/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/server/SCMSecurityProtocolServer.java
+++ b/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/server/SCMSecurityProtocolServer.java
@@ -430,7 +430,7 @@ public String getCACertificate() throws IOException {
    * @param role          - node role: OM/SCM/DN.
    * @param startSerialId - start certificate serial id.
    * @param count         - max number of certificates returned in a batch.
-   * @return
+   * @return {@code List<String>}
    * @throws IOException
    */
   @Override
diff --git a/hadoop-ozone/client/src/main/java/org/apache/hadoop/ozone/client/OzoneClientFactory.java b/hadoop-ozone/client/src/main/java/org/apache/hadoop/ozone/client/OzoneClientFactory.java
index 44239aafceb..80a495a1d12 100644
--- a/hadoop-ozone/client/src/main/java/org/apache/hadoop/ozone/client/OzoneClientFactory.java
+++ b/hadoop-ozone/client/src/main/java/org/apache/hadoop/ozone/client/OzoneClientFactory.java
@@ -170,7 +170,7 @@ private static OzoneClient getRpcClient(ClientProtocol clientProtocol,
    * Create OzoneClient for token renew/cancel operations.
    * @param conf Configuration to be used for OzoneCient creation
    * @param token ozone token is involved
-   * @return
+   * @return OzoneClient
    * @throws IOException
    */
   public static OzoneClient getOzoneClient(Configuration conf,
diff --git a/hadoop-ozone/common/src/main/java/org/apache/hadoop/ozone/client/io/SelectorOutputStream.java b/hadoop-ozone/common/src/main/java/org/apache/hadoop/ozone/client/io/SelectorOutputStream.java
index 8ffa3c45c09..c7e20fb7e8b 100644
--- a/hadoop-ozone/common/src/main/java/org/apache/hadoop/ozone/client/io/SelectorOutputStream.java
+++ b/hadoop-ozone/common/src/main/java/org/apache/hadoop/ozone/client/io/SelectorOutputStream.java
@@ -27,7 +27,7 @@
 
 /**
  * An {@link OutputStream} first write data to a buffer up to the capacity.
- * Then, select {@link Underlying} by the number of bytes written.
+ * Then, select {@code Underlying} by the number of bytes written.
  * When {@link #flush()}, {@link #hflush()}, {@link #hsync()}
  * or {@link #close()} is invoked,
  * it will force flushing the buffer and {@link OutputStream} selection.
diff --git a/hadoop-ozone/common/src/main/java/org/apache/hadoop/ozone/om/helpers/OmKeyInfo.java b/hadoop-ozone/common/src/main/java/org/apache/hadoop/ozone/om/helpers/OmKeyInfo.java
index f52a142239b..b12e59da38f 100644
--- a/hadoop-ozone/common/src/main/java/org/apache/hadoop/ozone/om/helpers/OmKeyInfo.java
+++ b/hadoop-ozone/common/src/main/java/org/apache/hadoop/ozone/om/helpers/OmKeyInfo.java
@@ -628,7 +628,7 @@ public OmKeyInfo build() {
 
   /**
    * For network transmit.
-   * @return
+   * @return KeyInfo
    */
   public KeyInfo getProtobuf(int clientVersion) {
     return getProtobuf(false, clientVersion);
@@ -660,7 +660,7 @@ public KeyInfo getNetworkProtobuf(String fullKeyName, int clientVersion,
   /**
    *
    * @param ignorePipeline true for persist to DB, false for network transmit.
-   * @return
+   * @return KeyInfo
    */
   public KeyInfo getProtobuf(boolean ignorePipeline, int clientVersion) {
     return getProtobuf(ignorePipeline, null, clientVersion, false);
diff --git a/hadoop-ozone/common/src/main/java/org/apache/hadoop/ozone/om/helpers/OzoneIdentityProvider.java b/hadoop-ozone/common/src/main/java/org/apache/hadoop/ozone/om/helpers/OzoneIdentityProvider.java
index 6bab1025b13..2b31f484c1a 100644
--- a/hadoop-ozone/common/src/main/java/org/apache/hadoop/ozone/om/helpers/OzoneIdentityProvider.java
+++ b/hadoop-ozone/common/src/main/java/org/apache/hadoop/ozone/om/helpers/OzoneIdentityProvider.java
@@ -43,7 +43,7 @@ public OzoneIdentityProvider() {
   }
 
   /**
-   * If schedulable isn't instance of {@link Server.Call},
+   * If schedulable isn't instance of {@link org.apache.hadoop.ipc.Server.Call},
    * then trying to access getCallerContext() method, will
    * result in an exception.
    *
diff --git a/hadoop-ozone/common/src/main/java/org/apache/hadoop/ozone/om/helpers/RepeatedOmKeyInfo.java b/hadoop-ozone/common/src/main/java/org/apache/hadoop/ozone/om/helpers/RepeatedOmKeyInfo.java
index 6dc17d5bc26..d7ee3728433 100644
--- a/hadoop-ozone/common/src/main/java/org/apache/hadoop/ozone/om/helpers/RepeatedOmKeyInfo.java
+++ b/hadoop-ozone/common/src/main/java/org/apache/hadoop/ozone/om/helpers/RepeatedOmKeyInfo.java
@@ -111,8 +111,8 @@ public static RepeatedOmKeyInfo getFromProto(RepeatedKeyInfo
 
   /**
    *
-   * @param compact, true for persistence, false for network transmit
-   * @return
+   * @param compact  true for persistence, false for network transmit
+   * @return RepeatedKeyInfo
    */
   public RepeatedKeyInfo getProto(boolean compact, int clientVersion) {
     List<KeyInfo> list = new ArrayList<>();
diff --git a/hadoop-ozone/common/src/main/java/org/apache/hadoop/ozone/om/multitenant/AccountNameSpace.java b/hadoop-ozone/common/src/main/java/org/apache/hadoop/ozone/om/multitenant/AccountNameSpace.java
index 753d528cb05..a715bfbc153 100644
--- a/hadoop-ozone/common/src/main/java/org/apache/hadoop/ozone/om/multitenant/AccountNameSpace.java
+++ b/hadoop-ozone/common/src/main/java/org/apache/hadoop/ozone/om/multitenant/AccountNameSpace.java
@@ -57,7 +57,7 @@ public interface AccountNameSpace {
    * Get Space Usage Information for this AccountNameSpace. This can be
    * used for billing purpose. Such Aggregation can also be done lazily
    * by a Recon job. Implementations can decide.
-   * @return
+   * @return SpaceUsage
    */
   SpaceUsageSource getSpaceUsage();
 
@@ -71,7 +71,7 @@ public interface AccountNameSpace {
 
   /**
    * Get Quota Information for this AccountNameSpace.
-   * @return
+   * @return OzoneQuota
    */
   OzoneQuota getQuota();
 }
diff --git a/hadoop-ozone/common/src/main/java/org/apache/hadoop/ozone/om/multitenant/BucketNameSpace.java b/hadoop-ozone/common/src/main/java/org/apache/hadoop/ozone/om/multitenant/BucketNameSpace.java
index 1481f1b466b..d5ecf7bba80 100644
--- a/hadoop-ozone/common/src/main/java/org/apache/hadoop/ozone/om/multitenant/BucketNameSpace.java
+++ b/hadoop-ozone/common/src/main/java/org/apache/hadoop/ozone/om/multitenant/BucketNameSpace.java
@@ -74,7 +74,7 @@ public interface BucketNameSpace {
    * Get Space Usage Information for this BucketNameSpace. This can be
    * used for billing purpose. Such Aggregation can also be done lazily
    * by a Recon job. Implementations can decide.
-   * @return
+   * @return SpaceUsageSource
    */
   SpaceUsageSource getSpaceUsage();
 
@@ -88,7 +88,7 @@ public interface BucketNameSpace {
 
   /**
    * Get Quota Information for this BucketNameSpace.
-   * @return
+   * @return OzoneQuota
    */
   OzoneQuota getQuota();
 }
diff --git a/hadoop-ozone/common/src/main/java/org/apache/hadoop/ozone/om/protocol/OzoneManagerProtocol.java b/hadoop-ozone/common/src/main/java/org/apache/hadoop/ozone/om/protocol/OzoneManagerProtocol.java
index 37481b00ea2..c1aee11559e 100644
--- a/hadoop-ozone/common/src/main/java/org/apache/hadoop/ozone/om/protocol/OzoneManagerProtocol.java
+++ b/hadoop-ozone/common/src/main/java/org/apache/hadoop/ozone/om/protocol/OzoneManagerProtocol.java
@@ -1062,7 +1062,7 @@ DBUpdates getDBUpdates(
    * @param txnApplyCheckIntervalSeconds Time in SECONDS to wait between
    *                                     successive checks for all transactions
    *                                     to be applied to the OM DB.
-   * @return
+   * @return {@code long}
    */
   default long prepareOzoneManager(
       long txnApplyWaitTimeoutSeconds, long txnApplyCheckIntervalSeconds)
diff --git a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/ratis/utils/OzoneManagerRatisUtils.java b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/ratis/utils/OzoneManagerRatisUtils.java
index 5e324b376fb..e32867d067d 100644
--- a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/ratis/utils/OzoneManagerRatisUtils.java
+++ b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/ratis/utils/OzoneManagerRatisUtils.java
@@ -409,7 +409,7 @@ private static OMClientRequest getOMAclRequest(OMRequest omRequest,
   /**
    * Convert exception result to {@link OzoneManagerProtocolProtos.Status}.
    * @param exception
-   * @return OzoneManagerProtocolProtos.Status
+   * @return Status
    */
   public static Status exceptionToResponseStatus(Exception exception) {
     if (exception instanceof OMException) {
diff --git a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/RequestAuditor.java b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/RequestAuditor.java
index 9ae6b7e5d50..f73255da117 100644
--- a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/RequestAuditor.java
+++ b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/RequestAuditor.java
@@ -45,7 +45,6 @@ public interface RequestAuditor {
    * @param auditMap
    * @param throwable
    * @param userInfo
-   * @return
    */
   OMAuditLogger.Builder buildAuditMessage(
       AuditAction op, Map<String, String> auditMap, Throwable throwable, UserInfo userInfo);
diff --git a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/file/OMDirectoryCreateRequest.java b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/file/OMDirectoryCreateRequest.java
index 53d4c83c3a9..802cfa54e60 100644
--- a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/file/OMDirectoryCreateRequest.java
+++ b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/file/OMDirectoryCreateRequest.java
@@ -257,7 +257,7 @@ dirKeyInfo, missingParentInfos, result, getBucketLayout(),
    * @param bucketInfo
    * @param omPathInfo
    * @param trxnLogIndex
-   * @return
+   * @return {@code List<OmKeyInfo>}
    * @throws IOException
    */
   public static List<OmKeyInfo> getAllParentInfo(OzoneManager ozoneManager,
diff --git a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/file/OMFileRequest.java b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/file/OMFileRequest.java
index 3e7549b176e..8f2a768c525 100644
--- a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/file/OMFileRequest.java
+++ b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/file/OMFileRequest.java
@@ -1050,7 +1050,7 @@ public static long getParentID(long volumeId, long bucketId, String keyName,
    * @param volumeName        - volume name.
    * @param bucketName        - bucket name.
    * @param keyName           - key name.
-   * @return
+   * @return {@code long}
    * @throws IOException
    */
   public static long getParentId(OMMetadataManager omMetadataManager,
diff --git a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/key/OMKeyCreateRequestWithFSO.java b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/key/OMKeyCreateRequestWithFSO.java
index b370c286e0f..f40adb7495f 100644
--- a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/key/OMKeyCreateRequestWithFSO.java
+++ b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/key/OMKeyCreateRequestWithFSO.java
@@ -246,7 +246,7 @@ public OMClientResponse validateAndUpdateCache(OzoneManager ozoneManager, TermIn
    * @param keyName           - key name.
    * @param uploadID          - Multi part upload ID for this key.
    * @param omMetadataManager
-   * @return
+   * @return {@code String}
    * @throws IOException
    */
   @Override
diff --git a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/key/OMKeyRenameRequestWithFSO.java b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/key/OMKeyRenameRequestWithFSO.java
index 72365221d3b..e57b6d99fd4 100644
--- a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/key/OMKeyRenameRequestWithFSO.java
+++ b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/key/OMKeyRenameRequestWithFSO.java
@@ -395,7 +395,7 @@ private Map<String, String> buildAuditMap(
    * level, e.g. source is /vol1/buck1/dir1/key1 and dest is /vol1/buck1).
    *
    * @param request
-   * @return
+   * @return {@code String}
    * @throws OMException
    */
   @Override
@@ -410,7 +410,7 @@ protected String extractDstKey(RenameKeyRequest request) throws OMException {
    * Returns the validated and normalized source key name.
    *
    * @param keyArgs
-   * @return
+   * @return {@code String}
    * @throws OMException
    */
   @Override
diff --git a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/key/OMKeyRequest.java b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/key/OMKeyRequest.java
index 729ec57283f..88c5ad91405 100644
--- a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/key/OMKeyRequest.java
+++ b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/key/OMKeyRequest.java
@@ -611,7 +611,7 @@ protected void getFileEncryptionInfoForMpuKey(KeyArgs keyArgs,
   /**
    * Get FileEncryptionInfoProto from KeyArgs.
    * @param keyArgs
-   * @return
+   * @return FileEncryptionInfo
    */
   protected FileEncryptionInfo getFileEncryptionInfo(KeyArgs keyArgs) {
     FileEncryptionInfo encryptionInfo = null;
@@ -911,7 +911,7 @@ private OmKeyInfo prepareMultipartFileInfo(
    * @param keyName           - key name.
    * @param uploadID          - Multi part upload ID for this key.
    * @param omMetadataManager
-   * @return
+   * @return {@code String}
    * @throws IOException
    */
   protected String getDBMultipartOpenKey(String volumeName, String bucketName,
diff --git a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/snapshot/SnapshotUtils.java b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/snapshot/SnapshotUtils.java
index d89799a8437..4a8f0bc9b22 100644
--- a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/snapshot/SnapshotUtils.java
+++ b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/snapshot/SnapshotUtils.java
@@ -247,7 +247,7 @@ public static String getOzonePathKeyForFso(OMMetadataManager metadataManager,
    * Returns merged repeatedKeyInfo entry with the existing deleted entry in the table.
    * @param snapshotMoveKeyInfos keyInfos to be added.
    * @param metadataManager metadataManager for a store.
-   * @return
+   * @return RepeatedOmKeyInfo
    * @throws IOException
    */
   public static RepeatedOmKeyInfo createMergedRepeatedOmKeyInfoFromDeletedTableEntry(
diff --git a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/protocolPB/RequestHandler.java b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/protocolPB/RequestHandler.java
index e60362a1ebb..76546f2e480 100644
--- a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/protocolPB/RequestHandler.java
+++ b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/protocolPB/RequestHandler.java
@@ -68,7 +68,7 @@ default OMClientResponse handleWriteRequest(OMRequest omRequest, TermIndex termI
   }
 
   /**
-   * Implementation of {@link #handleWriteRequest(OMRequest, TermIndex, OzoneManagerDoubleBuffer)}.
+   * Implementation of {@link #handleWriteRequest}.
    *
    * @param omRequest the write request
    * @param termIndex - ratis transaction term and index
diff --git a/hadoop-ozone/ozonefs-common/src/main/java/org/apache/hadoop/fs/ozone/BasicRootedOzoneClientAdapterImpl.java b/hadoop-ozone/ozonefs-common/src/main/java/org/apache/hadoop/fs/ozone/BasicRootedOzoneClientAdapterImpl.java
index da278f17fbf..31889ed2a58 100644
--- a/hadoop-ozone/ozonefs-common/src/main/java/org/apache/hadoop/fs/ozone/BasicRootedOzoneClientAdapterImpl.java
+++ b/hadoop-ozone/ozonefs-common/src/main/java/org/apache/hadoop/fs/ozone/BasicRootedOzoneClientAdapterImpl.java
@@ -714,7 +714,7 @@ private FileStatusAdapter getFileStatusForKeyOrSnapshot(OFSPath ofsPath, URI uri
    *
    * @param allUsers return trashRoots of all users if true, used by emptier
    * @param fs Pointer to the current OFS FileSystem
-   * @return
+   * @return {@code Collection<FileStatus>}
    */
   public Collection<FileStatus> getTrashRoots(boolean allUsers,
       BasicRootedOzoneFileSystem fs) {
diff --git a/hadoop-ozone/recon/src/main/java/org/apache/hadoop/ozone/recon/ReconUtils.java b/hadoop-ozone/recon/src/main/java/org/apache/hadoop/ozone/recon/ReconUtils.java
index baf3acce9cd..e16fc8deb9d 100644
--- a/hadoop-ozone/recon/src/main/java/org/apache/hadoop/ozone/recon/ReconUtils.java
+++ b/hadoop-ozone/recon/src/main/java/org/apache/hadoop/ozone/recon/ReconUtils.java
@@ -369,7 +369,7 @@ public HttpURLConnection makeHttpCall(URLConnectionFactory connectionFactory,
    *
    * @param reconDbDir
    * @param fileNamePrefix
-   * @return
+   * @return File
    */
   public File getLastKnownDB(File reconDbDir, String fileNamePrefix) {
     String lastKnownSnapshotFileName = null;
diff --git a/hadoop-ozone/recon/src/main/java/org/apache/hadoop/ozone/recon/recovery/ReconOMMetadataManager.java b/hadoop-ozone/recon/src/main/java/org/apache/hadoop/ozone/recon/recovery/ReconOMMetadataManager.java
index 1fc114eabd7..14ae997073c 100644
--- a/hadoop-ozone/recon/src/main/java/org/apache/hadoop/ozone/recon/recovery/ReconOMMetadataManager.java
+++ b/hadoop-ozone/recon/src/main/java/org/apache/hadoop/ozone/recon/recovery/ReconOMMetadataManager.java
@@ -109,7 +109,7 @@ List<OmBucketInfo> listBucketsUnderVolume(
 
   /**
    * Return the OzoneConfiguration instance used by Recon.
-   * @return
+   * @return OzoneConfiguration
    */
   OzoneConfiguration getOzoneConfiguration();
 
diff --git a/hadoop-ozone/tools/src/main/java/org/apache/hadoop/ozone/shell/StoreTypeOption.java b/hadoop-ozone/tools/src/main/java/org/apache/hadoop/ozone/shell/StoreTypeOption.java
index 8fbab644c0e..c06d29a7f93 100644
--- a/hadoop-ozone/tools/src/main/java/org/apache/hadoop/ozone/shell/StoreTypeOption.java
+++ b/hadoop-ozone/tools/src/main/java/org/apache/hadoop/ozone/shell/StoreTypeOption.java
@@ -21,7 +21,7 @@
 import picocli.CommandLine;
 
 /**
- * Option for {@link OzoneObj.StoreType}.
+ * Option for {@link org.apache.hadoop.ozone.security.acl.OzoneObj.StoreType}.
  */
 public class StoreTypeOption
     implements CommandLine.ITypeConverter<OzoneObj.StoreType> {

From 3ae1f5e1385b570011f2f360802c8b5eb6ee927f Mon Sep 17 00:00:00 2001
From: daniilchik <dprizva55@gmail.com>
Date: Sat, 28 Sep 2024 16:02:07 +0300
Subject: [PATCH 23/50] HDDS-11484. Add check for javadoc correctness

---
 .../ozone/container/metadata/SchemaOneChunkInfoListCodec.java  | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/hadoop-hdds/container-service/src/main/java/org/apache/hadoop/ozone/container/metadata/SchemaOneChunkInfoListCodec.java b/hadoop-hdds/container-service/src/main/java/org/apache/hadoop/ozone/container/metadata/SchemaOneChunkInfoListCodec.java
index fd0de9ea6a5..1be5a3819c8 100644
--- a/hadoop-hdds/container-service/src/main/java/org/apache/hadoop/ozone/container/metadata/SchemaOneChunkInfoListCodec.java
+++ b/hadoop-hdds/container-service/src/main/java/org/apache/hadoop/ozone/container/metadata/SchemaOneChunkInfoListCodec.java
@@ -25,7 +25,8 @@
 import java.io.IOException;
 
 /**
- * Codec for parsing {@link org.apache.hadoop.hdds.protocol.datanode.proto.ContainerProtos.ChunkInfoList} objects from data
+ * Codec for parsing {@link org.apache.hadoop.hdds.protocol.datanode.proto.ContainerProtos.ChunkInfoList}
+ * objects from data
  * that may have been written using schema version one. Before upgrading
  * schema versions, deleted block IDs were stored with a duplicate copy of
  * their ID as the value in the database. After upgrading the code, any

From 8a53c5d2a87c63cb49a428aea5bc3ad7c7783595 Mon Sep 17 00:00:00 2001
From: daniilchik <dprizva55@gmail.com>
Date: Sat, 28 Sep 2024 16:06:48 +0300
Subject: [PATCH 24/50] HDDS-11484. Add check for javadoc correctness

---
 .../apache/hadoop/ozone/om/helpers/OzoneIdentityProvider.java    | 1 -
 1 file changed, 1 deletion(-)

diff --git a/hadoop-ozone/common/src/main/java/org/apache/hadoop/ozone/om/helpers/OzoneIdentityProvider.java b/hadoop-ozone/common/src/main/java/org/apache/hadoop/ozone/om/helpers/OzoneIdentityProvider.java
index 2b31f484c1a..ed3d3ee25c2 100644
--- a/hadoop-ozone/common/src/main/java/org/apache/hadoop/ozone/om/helpers/OzoneIdentityProvider.java
+++ b/hadoop-ozone/common/src/main/java/org/apache/hadoop/ozone/om/helpers/OzoneIdentityProvider.java
@@ -21,7 +21,6 @@
 import org.apache.hadoop.ipc.CallerContext;
 import org.apache.hadoop.ipc.IdentityProvider;
 import org.apache.hadoop.ipc.Schedulable;
-import org.apache.hadoop.ipc.Server;
 import org.apache.hadoop.security.UserGroupInformation;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;

From 1959040ed0fd5a7ef395188758a2d5daa4d60fae Mon Sep 17 00:00:00 2001
From: daniilchik <dprizva55@gmail.com>
Date: Sun, 29 Sep 2024 00:28:08 +0300
Subject: [PATCH 25/50] HDDS-11484. Add check for javadoc correctness

---
 .github/workflows/ci.yml | 2 +-
 pom.xml                  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index bd0a12edd93..19b7a1fba16 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -142,7 +142,7 @@ jobs:
           distribution: 'temurin'
           java-version: ${{ matrix.java }}
       - name: Run a full build
-        run: hadoop-ozone/dev-support/checks/build.sh -Pdist -Psrc -Dmaven.javadoc.skip=true ${{ inputs.ratis_args }}
+        run: hadoop-ozone/dev-support/checks/build.sh -Pdist -Psrc -Dmaven.javadoc.skip=false ${{ inputs.ratis_args }}
         env:
           DEVELOCITY_ACCESS_KEY: ${{ secrets.GE_ACCESS_TOKEN }}
       - name: Store binaries for tests
diff --git a/pom.xml b/pom.xml
index a5384a1ccdd..0692efa1e32 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1893,7 +1893,7 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xs
             <artifactId>maven-javadoc-plugin</artifactId>
             <configuration>
               <additionalJOption>-Xdoclint:none</additionalJOption>
-              <failOnWarnings>false</failOnWarnings>
+              <failOnWarnings>true</failOnWarnings>
             </configuration>
             <executions>
               <execution>

From 1fa208229ba9b71b0ec06bf4ef21bc6d0b4a4a52 Mon Sep 17 00:00:00 2001
From: daniilchik <dprizva55@gmail.com>
Date: Sun, 29 Sep 2024 00:28:41 +0300
Subject: [PATCH 26/50] HDDS-11484. Add check for javadoc correctness

---
 .../src/main/java/org/apache/hadoop/hdds/HddsConfigKeys.java    | 1 +
 .../common/transport/server/ratis/ContainerStateMachine.java    | 2 +-
 .../src/main/java/org/apache/hadoop/hdds/utils/db/Table.java    | 2 +-
 .../hadoop/ozone/om/ratis/utils/OzoneManagerRatisUtils.java     | 2 +-
 4 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/hadoop-hdds/common/src/main/java/org/apache/hadoop/hdds/HddsConfigKeys.java b/hadoop-hdds/common/src/main/java/org/apache/hadoop/hdds/HddsConfigKeys.java
index 87707f75dc4..36a42f46f39 100644
--- a/hadoop-hdds/common/src/main/java/org/apache/hadoop/hdds/HddsConfigKeys.java
+++ b/hadoop-hdds/common/src/main/java/org/apache/hadoop/hdds/HddsConfigKeys.java
@@ -19,6 +19,7 @@
 /**
  * This class contains constants for configuration keys and default values
  * used in hdds.
+ * @param @throws @lol <<< >>>
  */
 public final class HddsConfigKeys {
 
diff --git a/hadoop-hdds/container-service/src/main/java/org/apache/hadoop/ozone/container/common/transport/server/ratis/ContainerStateMachine.java b/hadoop-hdds/container-service/src/main/java/org/apache/hadoop/ozone/container/common/transport/server/ratis/ContainerStateMachine.java
index 80852f11263..873096a024d 100644
--- a/hadoop-hdds/container-service/src/main/java/org/apache/hadoop/ozone/container/common/transport/server/ratis/ContainerStateMachine.java
+++ b/hadoop-hdds/container-service/src/main/java/org/apache/hadoop/ozone/container/common/transport/server/ratis/ContainerStateMachine.java
@@ -705,7 +705,7 @@ private ExecutorService getChunkExecutor(WriteChunkRequestProto req) {
   }
 
   /**
-   * {@link #writeStateMachineData(ContainerCommandRequestProto, long, long, long)}
+   * {@link #writeStateMachineData}
    * calls are not synchronized with each other
    * and also with {@code applyTransaction(TransactionContext)}.
    */
diff --git a/hadoop-hdds/framework/src/main/java/org/apache/hadoop/hdds/utils/db/Table.java b/hadoop-hdds/framework/src/main/java/org/apache/hadoop/hdds/utils/db/Table.java
index e101e1c935f..c7055267052 100644
--- a/hadoop-hdds/framework/src/main/java/org/apache/hadoop/hdds/utils/db/Table.java
+++ b/hadoop-hdds/framework/src/main/java/org/apache/hadoop/hdds/utils/db/Table.java
@@ -246,7 +246,7 @@ default TableCacheMetrics createCacheMetrics() throws IOException {
 
   /**
    * Returns a certain range of key value pairs as a list based on a
-   * startKey or count. Further a {@link MetadataKeyFilters.MetadataKeyFilter}
+   * startKey or count. Further a {@link org.apache.hadoop.hdds.utils.MetadataKeyFilters.MetadataKeyFilter}
    * can be added to * filter keys if necessary.
    * To prevent race conditions while listing
    * entries, this implementation takes a snapshot and lists the entries from
diff --git a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/ratis/utils/OzoneManagerRatisUtils.java b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/ratis/utils/OzoneManagerRatisUtils.java
index e32867d067d..5a1612e021a 100644
--- a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/ratis/utils/OzoneManagerRatisUtils.java
+++ b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/ratis/utils/OzoneManagerRatisUtils.java
@@ -407,7 +407,7 @@ private static OMClientRequest getOMAclRequest(OMRequest omRequest,
   }
 
   /**
-   * Convert exception result to {@link OzoneManagerProtocolProtos.Status}.
+   * Convert exception result to {@link org.apache.hadoop.ozone.protocol.proto.OzoneManagerProtocolProtos.Status}.
    * @param exception
    * @return Status
    */

From b0b5a380b2421af30b3b127724278b727e4fc0bd Mon Sep 17 00:00:00 2001
From: daniilchik <dprizva55@gmail.com>
Date: Sun, 29 Sep 2024 00:32:22 +0300
Subject: [PATCH 27/50] HDDS-11484. Add check for javadoc correctness

---
 .../src/main/java/org/apache/hadoop/hdds/HddsConfigKeys.java     | 1 -
 1 file changed, 1 deletion(-)

diff --git a/hadoop-hdds/common/src/main/java/org/apache/hadoop/hdds/HddsConfigKeys.java b/hadoop-hdds/common/src/main/java/org/apache/hadoop/hdds/HddsConfigKeys.java
index 36a42f46f39..87707f75dc4 100644
--- a/hadoop-hdds/common/src/main/java/org/apache/hadoop/hdds/HddsConfigKeys.java
+++ b/hadoop-hdds/common/src/main/java/org/apache/hadoop/hdds/HddsConfigKeys.java
@@ -19,7 +19,6 @@
 /**
  * This class contains constants for configuration keys and default values
  * used in hdds.
- * @param @throws @lol <<< >>>
  */
 public final class HddsConfigKeys {
 

From db6296b69be5a1da3b1a5be556e93ead87551430 Mon Sep 17 00:00:00 2001
From: daniilchik <dprizva55@gmail.com>
Date: Sun, 29 Sep 2024 00:55:24 +0300
Subject: [PATCH 28/50] HDDS-11484. Add check for javadoc correctness

---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 0692efa1e32..65729343649 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1899,7 +1899,7 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xs
               <execution>
                 <!-- build javadoc jars per jar for publishing to maven -->
                 <id>module-javadocs</id>
-                <phase>package</phase>
+                <phase>install</phase>
                 <goals>
                   <goal>jar</goal>
                 </goals>

From f5957411e70d4c6a275f611d261c017ffbe9a9be Mon Sep 17 00:00:00 2001
From: daniilchik <dprizva55@gmail.com>
Date: Sun, 29 Sep 2024 00:56:02 +0300
Subject: [PATCH 29/50] HHDS-11484. Add check for javadoc correctness


From 3ab7fea9096b0eb49d93555ffa246ec7a38e4437 Mon Sep 17 00:00:00 2001
From: daniilchik <dprizva55@gmail.com>
Date: Sun, 29 Sep 2024 01:21:50 +0300
Subject: [PATCH 30/50] HDDS-11484. Add check for javadoc correctness

---
 pom.xml | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/pom.xml b/pom.xml
index 65729343649..6971ad31e58 100644
--- a/pom.xml
+++ b/pom.xml
@@ -256,7 +256,7 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xs
 
     <maven-clean-plugin.version>3.4.0</maven-clean-plugin.version>
     <maven-compiler-plugin.version>3.9.0</maven-compiler-plugin.version>
-    <maven-install-plugin.version>3.1.2</maven-install-plugin.version>
+    <maven-install-plugin.version>3.1.3</maven-install-plugin.version>
     <maven-resources-plugin.version>3.1.0</maven-resources-plugin.version>
     <maven-shade-plugin.version>3.6.0</maven-shade-plugin.version>
     <maven-jar-plugin.version>3.4.2</maven-jar-plugin.version>
@@ -265,7 +265,7 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xs
     <maven-pdf-plugin.version>1.6.1</maven-pdf-plugin.version>
     <maven-remote-resources-plugin.version>1.7.0</maven-remote-resources-plugin.version>
     <maven-enforcer-plugin.version>3.5.0</maven-enforcer-plugin.version>
-    <maven-javadoc-plugin.version>3.7.0</maven-javadoc-plugin.version>
+    <maven-javadoc-plugin.version>3.10.0</maven-javadoc-plugin.version>
     <maven-assembly-plugin.version>3.7.1</maven-assembly-plugin.version>
     <apache-rat-plugin.version>0.16.1</apache-rat-plugin.version>
     <maven-deploy-plugin.version>3.1.3</maven-deploy-plugin.version>
@@ -1892,14 +1892,13 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xs
             <groupId>org.apache.maven.plugins</groupId>
             <artifactId>maven-javadoc-plugin</artifactId>
             <configuration>
-              <additionalJOption>-Xdoclint:none</additionalJOption>
               <failOnWarnings>true</failOnWarnings>
             </configuration>
             <executions>
               <execution>
                 <!-- build javadoc jars per jar for publishing to maven -->
                 <id>module-javadocs</id>
-                <phase>install</phase>
+                <phase>package</phase>
                 <goals>
                   <goal>jar</goal>
                 </goals>

From 7daaeb51664d6f2442afd4ad735c874ad37a588b Mon Sep 17 00:00:00 2001
From: daniilchik <dprizva55@gmail.com>
Date: Sun, 29 Sep 2024 01:22:16 +0300
Subject: [PATCH 31/50] HHDS-11484. Add check for javadoc correctness


From 1e01abbcec8041f96307cea38ea447cda451fbf8 Mon Sep 17 00:00:00 2001
From: daniilchik <dprizva55@gmail.com>
Date: Sun, 29 Sep 2024 01:59:53 +0300
Subject: [PATCH 32/50] HDDS-11484. Add check for javadoc correctness

---
 .github/workflows/ci.yml | 67 +++++++++++++++++++++++++++++++++++++++-
 1 file changed, 66 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 19b7a1fba16..d9045742206 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -142,7 +142,7 @@ jobs:
           distribution: 'temurin'
           java-version: ${{ matrix.java }}
       - name: Run a full build
-        run: hadoop-ozone/dev-support/checks/build.sh -Pdist -Psrc -Dmaven.javadoc.skip=false ${{ inputs.ratis_args }}
+        run: hadoop-ozone/dev-support/checks/build.sh -Pdist -Psrc -Dmaven.javadoc.skip=true ${{ inputs.ratis_args }}
         env:
           DEVELOCITY_ACCESS_KEY: ${{ secrets.GE_ACCESS_TOKEN }}
       - name: Store binaries for tests
@@ -222,6 +222,71 @@ jobs:
         env:
           OZONE_WITH_COVERAGE: false
           DEVELOCITY_ACCESS_KEY: ${{ secrets.GE_ACCESS_TOKEN }}
+  javadoc:
+    needs:
+      - build-info
+    runs-on: ubuntu-20.04
+    timeout-minutes: 30
+    steps:
+      - name: Checkout project
+        uses: actions/checkout@v4
+        with:
+          ref: ${{ needs.build-info.outputs.sha }}
+      - name: Cache for npm dependencies
+        uses: actions/cache@v4
+        with:
+          path: |
+            ~/.pnpm-store
+            **/node_modules
+          key: ${{ runner.os }}-pnpm-${{ hashFiles('**/pnpm-lock.yaml') }}
+          restore-keys: |
+            ${{ runner.os }}-pnpm-
+      - name: Cache for maven dependencies
+        uses: actions/cache/restore@v4
+        with:
+          path: |
+            ~/.m2/repository/*/*/*
+            !~/.m2/repository/org/apache/ozone
+          key: maven-repo-${{ hashFiles('**/pom.xml') }}
+          restore-keys: |
+            maven-repo-
+      - name: Download Ratis repo
+        if: ${{ inputs.ratis_args != '' }}
+        uses: actions/download-artifact@v4
+        with:
+          name: ratis-jars
+          path: |
+            ~/.m2/repository/org/apache/ratis
+      - name: Setup java
+        uses: actions/setup-java@v4
+        with:
+          distribution: 'temurin'
+          java-version: 11
+      - name: Run a full build with javadocs generation
+        run: hadoop-ozone/dev-support/checks/build.sh -Pdocs -Dmaven.javadoc.skip=false
+        env:
+          DEVELOCITY_ACCESS_KEY: ${{ secrets.GE_ACCESS_TOKEN }}
+      - name: Store binaries for tests
+        uses: actions/upload-artifact@v4
+        with:
+          name: ozone-bin
+          path: |
+            hadoop-ozone/dist/target/ozone-*.tar.gz
+            !hadoop-ozone/dist/target/ozone-*-src.tar.gz
+          retention-days: 1
+      - name: Store source tarball for compilation
+        uses: actions/upload-artifact@v4
+        with:
+          name: ozone-src
+          path: hadoop-ozone/dist/target/ozone-*-src.tar.gz
+          retention-days: 1
+      - name: Store Maven repo for tests
+        uses: actions/upload-artifact@v4
+        with:
+          name: ozone-repo
+          path: |
+            ~/.m2/repository/org/apache/ozone
+          retention-days: 1
   basic:
     needs:
       - build-info

From 2bacc6375bc54a6dbf75894079abb7dfe68ab1ca Mon Sep 17 00:00:00 2001
From: daniilchik <dprizva55@gmail.com>
Date: Sun, 29 Sep 2024 02:00:57 +0300
Subject: [PATCH 33/50] HHDS-11484. Add check for javadoc correctness


From e95918505ca55fa18b4463cd868e643ab1c3c204 Mon Sep 17 00:00:00 2001
From: daniilchik <dprizva55@gmail.com>
Date: Sun, 29 Sep 2024 02:03:37 +0300
Subject: [PATCH 34/50] HDDS-11484. Add check for javadoc correctness

---
 pom.xml | 25 ++++++++++++++++++++++++-
 1 file changed, 24 insertions(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 6971ad31e58..835a19c539b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1885,7 +1885,7 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xs
 
   <profiles>
     <profile>
-      <id>dist</id>
+      <id>docs</id>
       <build>
         <plugins>
           <plugin>
@@ -1894,6 +1894,29 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xs
             <configuration>
               <failOnWarnings>true</failOnWarnings>
             </configuration>
+            <executions>
+              <execution>
+                <id>module-javadocs</id>
+                <phase>package</phase>
+                <goals>
+                  <goal>jar</goal>
+                </goals>
+              </execution>
+            </executions>
+          </plugin>
+        </plugins>
+      </build>
+    </profile>
+    <profile>
+      <id>dist</id>
+      <build>
+        <plugins>
+          <plugin>
+            <groupId>org.apache.maven.plugins</groupId>
+            <artifactId>maven-javadoc-plugin</artifactId>
+            <configuration>
+              <failOnWarnings>false</failOnWarnings>
+            </configuration>
             <executions>
               <execution>
                 <!-- build javadoc jars per jar for publishing to maven -->

From d353bedf2c5546a327ab183e277e9b38ac7d0a22 Mon Sep 17 00:00:00 2001
From: daniilchik <dprizva55@gmail.com>
Date: Sun, 29 Sep 2024 02:04:05 +0300
Subject: [PATCH 35/50] HHDS-11484. Add check for javadoc correctness


From e09a5d155ee46b02e2b0aabb1ec931834a72f954 Mon Sep 17 00:00:00 2001
From: daniilchik <dprizva55@gmail.com>
Date: Sun, 29 Sep 2024 02:34:25 +0300
Subject: [PATCH 36/50] HDDS-11484. Add check for javadoc correctness

---
 .github/workflows/ci.yml | 32 +-------------------------------
 1 file changed, 1 insertion(+), 31 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index d9045742206..4bf0cf4fc92 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -232,15 +232,6 @@ jobs:
         uses: actions/checkout@v4
         with:
           ref: ${{ needs.build-info.outputs.sha }}
-      - name: Cache for npm dependencies
-        uses: actions/cache@v4
-        with:
-          path: |
-            ~/.pnpm-store
-            **/node_modules
-          key: ${{ runner.os }}-pnpm-${{ hashFiles('**/pnpm-lock.yaml') }}
-          restore-keys: |
-            ${{ runner.os }}-pnpm-
       - name: Cache for maven dependencies
         uses: actions/cache/restore@v4
         with:
@@ -263,30 +254,9 @@ jobs:
           distribution: 'temurin'
           java-version: 11
       - name: Run a full build with javadocs generation
-        run: hadoop-ozone/dev-support/checks/build.sh -Pdocs -Dmaven.javadoc.skip=false
+        run: hadoop-ozone/dev-support/checks/build.sh -Pdocs -Dmaven.javadoc.skip=false -Dskip.npx -Dskip.installnpx
         env:
           DEVELOCITY_ACCESS_KEY: ${{ secrets.GE_ACCESS_TOKEN }}
-      - name: Store binaries for tests
-        uses: actions/upload-artifact@v4
-        with:
-          name: ozone-bin
-          path: |
-            hadoop-ozone/dist/target/ozone-*.tar.gz
-            !hadoop-ozone/dist/target/ozone-*-src.tar.gz
-          retention-days: 1
-      - name: Store source tarball for compilation
-        uses: actions/upload-artifact@v4
-        with:
-          name: ozone-src
-          path: hadoop-ozone/dist/target/ozone-*-src.tar.gz
-          retention-days: 1
-      - name: Store Maven repo for tests
-        uses: actions/upload-artifact@v4
-        with:
-          name: ozone-repo
-          path: |
-            ~/.m2/repository/org/apache/ozone
-          retention-days: 1
   basic:
     needs:
       - build-info

From a43c9dcb606227d00f37391fb4be4aea883bb122 Mon Sep 17 00:00:00 2001
From: daniilchik <dprizva55@gmail.com>
Date: Sun, 29 Sep 2024 02:34:38 +0300
Subject: [PATCH 37/50] HHDS-11484. Add check for javadoc correctness


From 86dac52d81e74857d5473a55adf0862755232224 Mon Sep 17 00:00:00 2001
From: daniilchik <dprizva55@gmail.com>
Date: Sun, 29 Sep 2024 12:39:45 +0300
Subject: [PATCH 38/50] HDDS-11484. Add check for javadoc correctness

---
 .../hadoop/hdds/scm/storage/ExtendedInputStream.java     | 1 -
 .../hadoop/ozone/client/io/ECBlockInputStream.java       | 5 -----
 .../org/apache/hadoop/hdds/client/DecommissionUtils.java | 2 --
 .../org/apache/hadoop/hdds/recon/ReconConfigKeys.java    | 9 +++------
 .../hdds/scm/container/ReplicationManagerReport.java     | 2 --
 .../java/org/apache/hadoop/hdds/scm/ha/SCMNodeInfo.java  | 1 -
 .../org/apache/hadoop/hdds/scm/pipeline/Pipeline.java    | 1 -
 .../container/common/interfaces/ContainerDispatcher.java | 1 -
 .../ozone/container/keyvalue/KeyValueContainer.java      | 1 -
 .../ozone/container/keyvalue/KeyValueContainerData.java  | 2 --
 .../ozone/container/keyvalue/helpers/BlockUtils.java     | 1 -
 .../container/keyvalue/impl/ChunkManagerFactory.java     | 1 -
 .../apache/hadoop/hdds/protocol/SCMSecurityProtocol.java | 1 -
 .../SCMSecurityProtocolClientSideTranslatorPB.java       | 1 -
 .../scm/container/replication/ContainerHealthResult.java | 1 -
 .../scm/container/replication/health/HealthCheck.java    | 1 -
 .../org/apache/hadoop/hdds/scm/ha/HASecurityUtils.java   | 1 -
 .../org/apache/hadoop/hdds/scm/node/SCMNodeManager.java  | 2 --
 .../hdds/scm/server/SCMDatanodeProtocolServer.java       | 1 -
 .../hdds/scm/server/SCMSecurityProtocolServer.java       | 1 -
 .../hadoop/ozone/client/rpc/read/TestKeyInputStream.java | 2 +-
 21 files changed, 4 insertions(+), 34 deletions(-)

diff --git a/hadoop-hdds/client/src/main/java/org/apache/hadoop/hdds/scm/storage/ExtendedInputStream.java b/hadoop-hdds/client/src/main/java/org/apache/hadoop/hdds/scm/storage/ExtendedInputStream.java
index 18a9450bb01..e3f7f043a9e 100644
--- a/hadoop-hdds/client/src/main/java/org/apache/hadoop/hdds/scm/storage/ExtendedInputStream.java
+++ b/hadoop-hdds/client/src/main/java/org/apache/hadoop/hdds/scm/storage/ExtendedInputStream.java
@@ -75,7 +75,6 @@ public synchronized int read(ByteBuffer byteBuffer) throws IOException {
    * readWithStrategy implementation, as it will never be called by the tests.
    *
    * @param strategy
-   * @return {@code int}
    * @throws IOException
    */
   protected abstract int readWithStrategy(ByteReaderStrategy strategy) throws
diff --git a/hadoop-hdds/client/src/main/java/org/apache/hadoop/ozone/client/io/ECBlockInputStream.java b/hadoop-hdds/client/src/main/java/org/apache/hadoop/ozone/client/io/ECBlockInputStream.java
index 82547e18ed3..83abb937b03 100644
--- a/hadoop-hdds/client/src/main/java/org/apache/hadoop/ozone/client/io/ECBlockInputStream.java
+++ b/hadoop-hdds/client/src/main/java/org/apache/hadoop/ozone/client/io/ECBlockInputStream.java
@@ -152,7 +152,6 @@ protected int calculateExpectedDataBlocks(ECReplicationConfig rConfig) {
    * Using the current position, returns the index of the blockStream we should
    * be reading from. This is the index in the internal array holding the
    * stream reference. The block group index will be one greater than this.
-   * @return {@code int}
    */
   protected int currentStreamIndex() {
     return (int)((position / ecChunkSize) % repConfig.getData());
@@ -206,7 +205,6 @@ protected BlockExtendedInputStream getOrOpenStream(int locationIndex) throws IOE
    * to the replicaIndex given based on the EC pipeline fetched from SCM.
    * @param replicaIndex
    * @param refreshFunc
-   * @return {@code Function<BlockID, BlockLocationInfo>}
    */
   protected Function<BlockID, BlockLocationInfo> ecPipelineRefreshFunction(
       int replicaIndex, Function<BlockID, BlockLocationInfo> refreshFunc) {
@@ -241,7 +239,6 @@ protected Function<BlockID, BlockLocationInfo> ecPipelineRefreshFunction(
    * potentially partial last stripe. Note that the internal block index is
    * numbered starting from 1.
    * @param index - Index number of the internal block, starting from 1
-   * @return {@code long}
    */
   protected long internalBlockLength(int index) {
     long lastStripe = blockInfo.getLength() % stripeSize;
@@ -344,7 +341,6 @@ protected boolean shouldRetryFailedRead(int failedIndex) {
    * strategy buffer. This call may read from several internal BlockInputStreams
    * if there is sufficient space in the buffer.
    * @param strategy
-   * @return {@code int}
    * @throws IOException
    */
   @Override
@@ -409,7 +405,6 @@ protected void seekStreamIfNecessary(BlockExtendedInputStream stream,
    * group length.
    * @param stream Stream to read from
    * @param strategy The ReaderStrategy to read data into
-   * @return {@code int}
    * @throws IOException
    */
   private int readFromStream(BlockExtendedInputStream stream,
diff --git a/hadoop-hdds/common/src/main/java/org/apache/hadoop/hdds/client/DecommissionUtils.java b/hadoop-hdds/common/src/main/java/org/apache/hadoop/hdds/client/DecommissionUtils.java
index eb9f39f86de..20755a6e0ec 100644
--- a/hadoop-hdds/common/src/main/java/org/apache/hadoop/hdds/client/DecommissionUtils.java
+++ b/hadoop-hdds/common/src/main/java/org/apache/hadoop/hdds/client/DecommissionUtils.java
@@ -97,7 +97,6 @@ public static JsonNode getBeansJsonNode(String metricsJson) throws IOException {
    * Returns the number of decommissioning nodes.
    *
    * @param jsonNode
-   * @return {@code int}
    */
   public static int getNumDecomNodes(JsonNode jsonNode) {
     int numDecomNodes;
@@ -118,7 +117,6 @@ public static int getNumDecomNodes(JsonNode jsonNode) {
    * @param numDecomNodes
    * @param countsMap
    * @param errMsg
-   * @return {@code Map<String, Object>}
    * @throws IOException
    */
   @Nullable
diff --git a/hadoop-hdds/common/src/main/java/org/apache/hadoop/hdds/recon/ReconConfigKeys.java b/hadoop-hdds/common/src/main/java/org/apache/hadoop/hdds/recon/ReconConfigKeys.java
index 26790e36458..57b95fafca7 100644
--- a/hadoop-hdds/common/src/main/java/org/apache/hadoop/hdds/recon/ReconConfigKeys.java
+++ b/hadoop-hdds/common/src/main/java/org/apache/hadoop/hdds/recon/ReconConfigKeys.java
@@ -18,14 +18,11 @@
 
 package org.apache.hadoop.hdds.recon;
 
-/**
- * This class contains constants for Recon related configuration keys used in
- * SCM &amp; Datanode.
- */
 public final class ReconConfigKeys {
 
-  /**This class contains constants for Recon related configuration keys used in
-   * SCM &amp; Datanode.
+  /*
+   * This class contains constants for Recon related configuration keys used in
+   * SCM and Datanode.
    * Never constructed.
    */
   private ReconConfigKeys() {
diff --git a/hadoop-hdds/common/src/main/java/org/apache/hadoop/hdds/scm/container/ReplicationManagerReport.java b/hadoop-hdds/common/src/main/java/org/apache/hadoop/hdds/scm/container/ReplicationManagerReport.java
index d3ac5c89f03..45bc77d1d8f 100644
--- a/hadoop-hdds/common/src/main/java/org/apache/hadoop/hdds/scm/container/ReplicationManagerReport.java
+++ b/hadoop-hdds/common/src/main/java/org/apache/hadoop/hdds/scm/container/ReplicationManagerReport.java
@@ -146,7 +146,6 @@ public long getReportTimeStamp() {
 
   /**
    * Return a map of all stats and their value as a long.
-   * @return {@code Map<String, Long>}
    */
   public Map<String, Long> getStats() {
     Map<String, Long> result = new HashMap<>();
@@ -159,7 +158,6 @@ public Map<String, Long> getStats() {
   /**
    * Return a map of all samples, with the stat as the key and the samples
    * for the stat as a List of Long.
-   * @return {@code Map<String, List<Long>>}
    */
   public Map<String, List<Long>> getSamples() {
     Map<String, List<Long>> result = new HashMap<>();
diff --git a/hadoop-hdds/common/src/main/java/org/apache/hadoop/hdds/scm/ha/SCMNodeInfo.java b/hadoop-hdds/common/src/main/java/org/apache/hadoop/hdds/scm/ha/SCMNodeInfo.java
index 7ca7775f473..66fe7d18783 100644
--- a/hadoop-hdds/common/src/main/java/org/apache/hadoop/hdds/scm/ha/SCMNodeInfo.java
+++ b/hadoop-hdds/common/src/main/java/org/apache/hadoop/hdds/scm/ha/SCMNodeInfo.java
@@ -67,7 +67,6 @@ public class SCMNodeInfo {
   /**
    * Build SCM Node information from configuration.
    * @param conf
-   * @return {@code List<SCMNodeInfo>}
    */
   public static List<SCMNodeInfo> buildNodeInfo(ConfigurationSource conf) {
 
diff --git a/hadoop-hdds/common/src/main/java/org/apache/hadoop/hdds/scm/pipeline/Pipeline.java b/hadoop-hdds/common/src/main/java/org/apache/hadoop/hdds/scm/pipeline/Pipeline.java
index 52ee8e6ee0d..54a32e9c340 100644
--- a/hadoop-hdds/common/src/main/java/org/apache/hadoop/hdds/scm/pipeline/Pipeline.java
+++ b/hadoop-hdds/common/src/main/java/org/apache/hadoop/hdds/scm/pipeline/Pipeline.java
@@ -243,7 +243,6 @@ public int getReplicaIndex(DatanodeDetails dn) {
 
   /**
    * Get the replicaIndex Map.
-   * @return {@code Map<DatanodeDetails, Integer>}
    */
   public Map<DatanodeDetails, Integer> getReplicaIndexes() {
     return this.getNodes().stream().collect(Collectors.toMap(Function.identity(), this::getReplicaIndex));
diff --git a/hadoop-hdds/container-service/src/main/java/org/apache/hadoop/ozone/container/common/interfaces/ContainerDispatcher.java b/hadoop-hdds/container-service/src/main/java/org/apache/hadoop/ozone/container/common/interfaces/ContainerDispatcher.java
index 2682cf7a3e8..f075b6f67ca 100644
--- a/hadoop-hdds/container-service/src/main/java/org/apache/hadoop/ozone/container/common/interfaces/ContainerDispatcher.java
+++ b/hadoop-hdds/container-service/src/main/java/org/apache/hadoop/ozone/container/common/interfaces/ContainerDispatcher.java
@@ -75,7 +75,6 @@ void validateContainerCommand(
   /**
    * Returns the handler for the specified containerType.
    * @param containerType
-   * @return {@code Handler}
    */
   Handler getHandler(ContainerProtos.ContainerType containerType);
 
diff --git a/hadoop-hdds/container-service/src/main/java/org/apache/hadoop/ozone/container/keyvalue/KeyValueContainer.java b/hadoop-hdds/container-service/src/main/java/org/apache/hadoop/ozone/container/keyvalue/KeyValueContainer.java
index a4f28cadf53..ae3288a3e98 100644
--- a/hadoop-hdds/container-service/src/main/java/org/apache/hadoop/ozone/container/keyvalue/KeyValueContainer.java
+++ b/hadoop-hdds/container-service/src/main/java/org/apache/hadoop/ozone/container/keyvalue/KeyValueContainer.java
@@ -932,7 +932,6 @@ private ContainerReplicaProto.State getHddsState()
 
   /**
    * Returns container DB file.
-   * @return {@code File}
    */
   public File getContainerDBFile() {
     return KeyValueContainerLocationUtil.getContainerDBFile(containerData);
diff --git a/hadoop-hdds/container-service/src/main/java/org/apache/hadoop/ozone/container/keyvalue/KeyValueContainerData.java b/hadoop-hdds/container-service/src/main/java/org/apache/hadoop/ozone/container/keyvalue/KeyValueContainerData.java
index 03af99a0de6..4ea8552e780 100644
--- a/hadoop-hdds/container-service/src/main/java/org/apache/hadoop/ozone/container/keyvalue/KeyValueContainerData.java
+++ b/hadoop-hdds/container-service/src/main/java/org/apache/hadoop/ozone/container/keyvalue/KeyValueContainerData.java
@@ -430,7 +430,6 @@ public KeyPrefixFilter getDeletingBlockKeyFilter() {
   /**
    * Schema v3 use a prefix as startKey,
    * for other schemas just return null.
-   * @return {@code String}
    */
   public String startKeyEmpty() {
     if (hasSchema(SCHEMA_V3)) {
@@ -442,7 +441,6 @@ public String startKeyEmpty() {
   /**
    * Schema v3 use containerID as key prefix,
    * for other schemas just return null.
-   * @return {@code String}
    */
   public String containerPrefix() {
     if (hasSchema(SCHEMA_V3)) {
diff --git a/hadoop-hdds/container-service/src/main/java/org/apache/hadoop/ozone/container/keyvalue/helpers/BlockUtils.java b/hadoop-hdds/container-service/src/main/java/org/apache/hadoop/ozone/container/keyvalue/helpers/BlockUtils.java
index 59485029913..945efbcf6ea 100644
--- a/hadoop-hdds/container-service/src/main/java/org/apache/hadoop/ozone/container/keyvalue/helpers/BlockUtils.java
+++ b/hadoop-hdds/container-service/src/main/java/org/apache/hadoop/ozone/container/keyvalue/helpers/BlockUtils.java
@@ -99,7 +99,6 @@ public static DatanodeStore getUncachedDatanodeStore(
    * opened by this thread, the other thread will get a RocksDB exception.
    * @param containerData The container data
    * @param conf Configuration
-   * @return {@code DatanodeStore}
    * @throws IOException
    */
   public static DatanodeStore getUncachedDatanodeStore(
diff --git a/hadoop-hdds/container-service/src/main/java/org/apache/hadoop/ozone/container/keyvalue/impl/ChunkManagerFactory.java b/hadoop-hdds/container-service/src/main/java/org/apache/hadoop/ozone/container/keyvalue/impl/ChunkManagerFactory.java
index 82a6fe1f874..aa5d52f3cee 100644
--- a/hadoop-hdds/container-service/src/main/java/org/apache/hadoop/ozone/container/keyvalue/impl/ChunkManagerFactory.java
+++ b/hadoop-hdds/container-service/src/main/java/org/apache/hadoop/ozone/container/keyvalue/impl/ChunkManagerFactory.java
@@ -46,7 +46,6 @@ private ChunkManagerFactory() {
    * @param conf     Configuration
    * @param manager  This parameter will be used only for read data of
    *                 FILE_PER_CHUNK layout file. Can be null for other cases.
-   * @return {@code ChunkManager}
    */
   public static ChunkManager createChunkManager(ConfigurationSource conf,
       BlockManager manager, VolumeSet volSet) {
diff --git a/hadoop-hdds/framework/src/main/java/org/apache/hadoop/hdds/protocol/SCMSecurityProtocol.java b/hadoop-hdds/framework/src/main/java/org/apache/hadoop/hdds/protocol/SCMSecurityProtocol.java
index caf53e395bf..0cb39482e98 100644
--- a/hadoop-hdds/framework/src/main/java/org/apache/hadoop/hdds/protocol/SCMSecurityProtocol.java
+++ b/hadoop-hdds/framework/src/main/java/org/apache/hadoop/hdds/protocol/SCMSecurityProtocol.java
@@ -118,7 +118,6 @@ String getSCMCertificate(ScmNodeDetailsProto scmNodeDetails,
 
   /**
    * Get Root CA certificate.
-   * @return {@code String}
    * @throws IOException
    */
   String getRootCACertificate() throws IOException;
diff --git a/hadoop-hdds/framework/src/main/java/org/apache/hadoop/hdds/protocolPB/SCMSecurityProtocolClientSideTranslatorPB.java b/hadoop-hdds/framework/src/main/java/org/apache/hadoop/hdds/protocolPB/SCMSecurityProtocolClientSideTranslatorPB.java
index 46eac7b37ef..71918308f14 100644
--- a/hadoop-hdds/framework/src/main/java/org/apache/hadoop/hdds/protocolPB/SCMSecurityProtocolClientSideTranslatorPB.java
+++ b/hadoop-hdds/framework/src/main/java/org/apache/hadoop/hdds/protocolPB/SCMSecurityProtocolClientSideTranslatorPB.java
@@ -330,7 +330,6 @@ public SCMGetCertResponseProto getCACert() throws IOException {
    * @param role          - node type: OM/SCM/DN.
    * @param startSerialId - start cert serial id.
    * @param count         - max number of certificates returned in a batch.
-   * @return {@code List<String>}
    * @throws IOException
    */
   @Override
diff --git a/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/container/replication/ContainerHealthResult.java b/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/container/replication/ContainerHealthResult.java
index 22065556414..fcfef7de6e6 100644
--- a/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/container/replication/ContainerHealthResult.java
+++ b/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/container/replication/ContainerHealthResult.java
@@ -248,7 +248,6 @@ public void setOfflineIndexesOkAfterPending(boolean val) {
     /**
      * Returns true if a container has under-replication caused by offline
      * indexes, but it is corrected by a pending add.
-     * @return {@code boolean}
      */
     public boolean offlineIndexesOkAfterPending() {
       return offlineIndexesOkAfterPending;
diff --git a/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/container/replication/health/HealthCheck.java b/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/container/replication/health/HealthCheck.java
index da9f72d230e..f271b8a863c 100644
--- a/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/container/replication/health/HealthCheck.java
+++ b/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/container/replication/health/HealthCheck.java
@@ -49,7 +49,6 @@ public interface HealthCheck {
    * returns false. This allows handlers to be chained together, and each will
    * be tried in turn until one succeeds.
    * @param handler
-   * @return {@code HealthCheck}
    */
   HealthCheck addNext(HealthCheck handler);
 
diff --git a/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/ha/HASecurityUtils.java b/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/ha/HASecurityUtils.java
index b08269e14c9..5eeb489f677 100644
--- a/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/ha/HASecurityUtils.java
+++ b/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/ha/HASecurityUtils.java
@@ -150,7 +150,6 @@ public static CertificateServer initializeRootCertificateServer(
    *
    * @param conf
    * @param certificateClient
-   * @return {@code GrpcTlsConfig}
    */
   public static GrpcTlsConfig createSCMRatisTLSConfig(SecurityConfig conf,
       CertificateClient certificateClient) throws IOException {
diff --git a/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/node/SCMNodeManager.java b/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/node/SCMNodeManager.java
index bedb09b6957..7db0c88e173 100644
--- a/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/node/SCMNodeManager.java
+++ b/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/node/SCMNodeManager.java
@@ -1166,7 +1166,6 @@ public Map<String, Map<String, String>> getNodeStatusInfo() {
    * Calculate the storage capacity of the DataNode node.
    * @param storageReports Calculate the storage capacity corresponding
    *                       to the storage collection.
-   * @return {@code String}
    */
   public static String calculateStorageCapacity(
       List<StorageReportProto> storageReports) {
@@ -1214,7 +1213,6 @@ private static String convertUnit(double value) {
    * Calculate the storage usage percentage of a DataNode node.
    * @param storageReports Calculate the storage percentage corresponding
    *                       to the storage collection.
-   * @return {@code String[]}
    */
   public static String[] calculateStoragePercentage(
       List<StorageReportProto> storageReports) {
diff --git a/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/server/SCMDatanodeProtocolServer.java b/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/server/SCMDatanodeProtocolServer.java
index 4db50e2a0ac..105e7ac3486 100644
--- a/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/server/SCMDatanodeProtocolServer.java
+++ b/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/server/SCMDatanodeProtocolServer.java
@@ -483,7 +483,6 @@ private static String flatten(String input) {
 
   /**
    * Get Key associated with Datanode address for this server.
-   * @return {@code String}
    */
   protected String getDatanodeAddressKey() {
     return this.scm.getScmNodeDetails().getDatanodeAddressKey();
diff --git a/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/server/SCMSecurityProtocolServer.java b/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/server/SCMSecurityProtocolServer.java
index 2875e926d58..17318107e3d 100644
--- a/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/server/SCMSecurityProtocolServer.java
+++ b/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/server/SCMSecurityProtocolServer.java
@@ -430,7 +430,6 @@ public String getCACertificate() throws IOException {
    * @param role          - node role: OM/SCM/DN.
    * @param startSerialId - start certificate serial id.
    * @param count         - max number of certificates returned in a batch.
-   * @return {@code List<String>}
    * @throws IOException
    */
   @Override
diff --git a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/client/rpc/read/TestKeyInputStream.java b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/client/rpc/read/TestKeyInputStream.java
index 3ab8ae31188..278465d16b4 100644
--- a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/client/rpc/read/TestKeyInputStream.java
+++ b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/client/rpc/read/TestKeyInputStream.java
@@ -63,7 +63,7 @@
 /**
  * Tests {@link KeyInputStream}.
  */
-class TestKeyInputStream extends TestInputStreamBase {
+class fTestKeyInputStream extends TestInputStreamBase {
 
   /**
    * This method does random seeks and reads and validates the reads are

From f377ac0c33f7f88ef6b092ad14bec7c9b4f7707d Mon Sep 17 00:00:00 2001
From: daniilchik <dprizva55@gmail.com>
Date: Sun, 29 Sep 2024 12:48:13 +0300
Subject: [PATCH 39/50] HDDS-11484. Add check for javadoc correctness

---
 .github/workflows/ci.yml | 35 -----------------------------------
 pom.xml                  | 23 -----------------------
 2 files changed, 58 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 4bf0cf4fc92..bd0a12edd93 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -222,41 +222,6 @@ jobs:
         env:
           OZONE_WITH_COVERAGE: false
           DEVELOCITY_ACCESS_KEY: ${{ secrets.GE_ACCESS_TOKEN }}
-  javadoc:
-    needs:
-      - build-info
-    runs-on: ubuntu-20.04
-    timeout-minutes: 30
-    steps:
-      - name: Checkout project
-        uses: actions/checkout@v4
-        with:
-          ref: ${{ needs.build-info.outputs.sha }}
-      - name: Cache for maven dependencies
-        uses: actions/cache/restore@v4
-        with:
-          path: |
-            ~/.m2/repository/*/*/*
-            !~/.m2/repository/org/apache/ozone
-          key: maven-repo-${{ hashFiles('**/pom.xml') }}
-          restore-keys: |
-            maven-repo-
-      - name: Download Ratis repo
-        if: ${{ inputs.ratis_args != '' }}
-        uses: actions/download-artifact@v4
-        with:
-          name: ratis-jars
-          path: |
-            ~/.m2/repository/org/apache/ratis
-      - name: Setup java
-        uses: actions/setup-java@v4
-        with:
-          distribution: 'temurin'
-          java-version: 11
-      - name: Run a full build with javadocs generation
-        run: hadoop-ozone/dev-support/checks/build.sh -Pdocs -Dmaven.javadoc.skip=false -Dskip.npx -Dskip.installnpx
-        env:
-          DEVELOCITY_ACCESS_KEY: ${{ secrets.GE_ACCESS_TOKEN }}
   basic:
     needs:
       - build-info
diff --git a/pom.xml b/pom.xml
index 835a19c539b..72668f952a3 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1884,29 +1884,6 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xs
   </build>
 
   <profiles>
-    <profile>
-      <id>docs</id>
-      <build>
-        <plugins>
-          <plugin>
-            <groupId>org.apache.maven.plugins</groupId>
-            <artifactId>maven-javadoc-plugin</artifactId>
-            <configuration>
-              <failOnWarnings>true</failOnWarnings>
-            </configuration>
-            <executions>
-              <execution>
-                <id>module-javadocs</id>
-                <phase>package</phase>
-                <goals>
-                  <goal>jar</goal>
-                </goals>
-              </execution>
-            </executions>
-          </plugin>
-        </plugins>
-      </build>
-    </profile>
     <profile>
       <id>dist</id>
       <build>

From 96e349bd3048279638fe55a500f30cb043d3bec7 Mon Sep 17 00:00:00 2001
From: daniilchik <dprizva55@gmail.com>
Date: Sun, 29 Sep 2024 12:51:00 +0300
Subject: [PATCH 40/50] HDDS-11484. Add check for javadoc correctness

---
 .github/workflows/ci.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index bd0a12edd93..42ef94a0b36 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -218,7 +218,7 @@ jobs:
           distribution: 'temurin'
           java-version: ${{ matrix.java }}
       - name: Compile Ozone using Java ${{ matrix.java }}
-        run: hadoop-ozone/dev-support/checks/build.sh -Pdist -Dskip.npx -Dskip.installnpx -Djavac.version=${{ matrix.java }} ${{ inputs.ratis_args }}
+        run: hadoop-ozone/dev-support/checks/build.sh -Pdist -Dskip.npx -Dskip.installnpx -Dmaven.javadoc.failOnWarnings=${{ matrix.java != 8 }} -Djavac.version=${{ matrix.java }} ${{ inputs.ratis_args }}
         env:
           OZONE_WITH_COVERAGE: false
           DEVELOCITY_ACCESS_KEY: ${{ secrets.GE_ACCESS_TOKEN }}

From 18c7e2f3c77302ff8485ed97139914676c5a3e84 Mon Sep 17 00:00:00 2001
From: daniilchik <dprizva55@gmail.com>
Date: Sun, 29 Sep 2024 12:56:29 +0300
Subject: [PATCH 41/50] HDDS-11484. Add check for javadoc correctness

---
 .../org/apache/hadoop/hdds/recon/ReconConfigKeys.java | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/hadoop-hdds/common/src/main/java/org/apache/hadoop/hdds/recon/ReconConfigKeys.java b/hadoop-hdds/common/src/main/java/org/apache/hadoop/hdds/recon/ReconConfigKeys.java
index 57b95fafca7..e2903f44a65 100644
--- a/hadoop-hdds/common/src/main/java/org/apache/hadoop/hdds/recon/ReconConfigKeys.java
+++ b/hadoop-hdds/common/src/main/java/org/apache/hadoop/hdds/recon/ReconConfigKeys.java
@@ -18,13 +18,14 @@
 
 package org.apache.hadoop.hdds.recon;
 
+/**
+ * This class contains constants for Recon related configuration keys used in
+ * SCM and Datanode.
+ */
 public final class ReconConfigKeys {
 
-  /*
-   * This class contains constants for Recon related configuration keys used in
-   * SCM and Datanode.
-   * Never constructed.
-   */
+
+  /** Never constructed. **/
   private ReconConfigKeys() {
   }
 

From cb84092d16d4dc06ca1954a06da1c2a43766e103 Mon Sep 17 00:00:00 2001
From: daniilchik <dprizva55@gmail.com>
Date: Sun, 29 Sep 2024 13:03:33 +0300
Subject: [PATCH 42/50] HDDS-11484. Add check for javadoc correctness

---
 .../apache/hadoop/ozone/client/rpc/read/TestKeyInputStream.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/client/rpc/read/TestKeyInputStream.java b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/client/rpc/read/TestKeyInputStream.java
index 278465d16b4..3ab8ae31188 100644
--- a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/client/rpc/read/TestKeyInputStream.java
+++ b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/client/rpc/read/TestKeyInputStream.java
@@ -63,7 +63,7 @@
 /**
  * Tests {@link KeyInputStream}.
  */
-class fTestKeyInputStream extends TestInputStreamBase {
+class TestKeyInputStream extends TestInputStreamBase {
 
   /**
    * This method does random seeks and reads and validates the reads are

From 499b2d829f2a3e7337b6b841621c912b3e97e279 Mon Sep 17 00:00:00 2001
From: daniilchik <dprizva55@gmail.com>
Date: Sun, 29 Sep 2024 15:27:15 +0300
Subject: [PATCH 43/50] HDDS-11484. Add check for javadoc correctness

---
 dev-support/ci/selective_ci_checks.bats       |  12 ++
 dev-support/ci/selective_ci_checks.sh         |   1 +
 .../hadoop/hdds/recon/ReconConfigKeys.java    |   5 +-
 .../upgrade/LayoutVersionInstanceFactory.java |  10 +-
 .../src/main/resources/ozone-default.xml      |   9 +
 .../container/common/volume/HddsVolume.java   |   2 +-
 .../container/common/volume/VolumeInfo.java   |  14 +-
 .../container/common/volume/VolumeUsage.java  |   4 +
 .../helpers/KeyValueContainerUtil.java        |   3 +-
 hadoop-hdds/docs/content/concept/Datanodes.md |  12 ++
 .../docs/content/concept/Datanodes.zh.md      |  12 ++
 ...ocationProtocolClientSideTranslatorPB.java |   2 +-
 .../authority/DefaultApprover.java            |   2 +-
 .../authority/DefaultCAServer.java            |   2 -
 .../hdds/server/http/ProfileServlet.java      |   7 +-
 .../hadoop/hdds/utils/HddsServerUtil.java     |   4 +-
 .../hadoop/ozone/audit/package-info.java      |   2 +-
 .../hdds/utils/NativeLibraryLoader.java       |  13 +-
 .../hdds/scm/SCMCommonPlacementPolicy.java    |  14 +-
 .../hadoop/hdds/scm/node/NodeManager.java     |   1 -
 .../hdds/scm/node/NodeManagerMXBean.java      |   2 +-
 .../scm/pipeline/PipelineStateManager.java    |   2 +-
 .../scm/security/RootCARotationManager.java   |   2 +-
 .../resources/webapps/scm/scm-overview.html   | 108 ++++++++++++
 .../src/main/resources/webapps/scm/scm.js     |  68 ++++++++
 .../hadoop/ozone/client/rpc/RpcClient.java    |  20 ++-
 .../java/org/apache/hadoop/ozone/OFSPath.java |   2 +-
 .../java/org/apache/hadoop/ozone/OmUtils.java |   1 -
 .../apache/hadoop/ozone/om/OMConfigKeys.java  |   2 +
 .../hadoop/ozone/om/helpers/OmKeyInfo.java    |   1 -
 .../ozone/om/helpers/RepeatedOmKeyInfo.java   |   6 +-
 .../hadoop/ozone/om/helpers/ServiceInfo.java  |  46 ++++-
 .../hadoop/ozone/om/helpers/SnapshotInfo.java |   2 +-
 .../om/protocol/OzoneManagerProtocol.java     |   9 -
 ...ManagerProtocolClientSideTranslatorPB.java |  19 --
 .../dist/src/main/compose/common/s3a-test.sh  |   3 +-
 .../dist/src/main/compose/upgrade/testlib.sh  |   4 +-
 .../dist/src/main/compose/xcompat/.env        |   2 +
 .../src/main/compose/xcompat/clients.yaml     |  22 ++-
 .../src/main/compose/xcompat/docker-config    |  94 +++++++++-
 .../dist/src/main/compose/xcompat/krb5.conf   |  41 +++++
 .../src/main/compose/xcompat/new-cluster.yaml |  33 +++-
 .../src/main/compose/xcompat/old-cluster.yaml |  33 +++-
 .../dist/src/main/compose/xcompat/test.sh     |  29 +++-
 .../TestDirectoryDeletingServiceWithFSO.java  | 140 +++++++++++++++
 ...napshotDeletingServiceIntegrationTest.java |   6 +-
 .../TestSnapshotDirectoryCleaningService.java |   2 +
 .../src/main/proto/OmClientProtocol.proto     |  19 +-
 .../hadoop/ozone/om/OMMetadataManager.java    |   2 +-
 .../apache/hadoop/ozone/om/KeyManager.java    |   1 -
 .../hadoop/ozone/om/KeyManagerImpl.java       |   8 +-
 .../apache/hadoop/ozone/om/ListIterator.java  |   2 +-
 .../hadoop/ozone/om/OMMultiTenantManager.java |   2 +-
 .../ozone/om/OmMetadataManagerImpl.java       |  96 ++++-------
 .../apache/hadoop/ozone/om/OzoneManager.java  |  28 ++-
 .../om/ratis/OzoneManagerDoubleBuffer.java    |   2 +-
 .../ozone/om/request/OMClientRequest.java     |   1 -
 .../key/OMDirectoriesPurgeRequestWithFSO.java |  41 +++--
 .../om/request/key/OMKeyPurgeRequest.java     |  56 ++++--
 .../OMSnapshotMoveDeletedKeysRequest.java     |   4 +-
 .../snapshot/OMSnapshotPurgeRequest.java      |   6 +-
 .../om/request/volume/OMVolumeRequest.java    |   1 -
 .../OMDirectoriesPurgeResponseWithFSO.java    |   4 +
 .../service/AbstractKeyDeletingService.java   |  49 +++---
 .../om/service/DirectoryDeletingService.java  |  40 ++++-
 .../ozone/om/service/KeyDeletingService.java  |  41 +++--
 .../SnapshotDirectoryCleaningService.java     |   9 +-
 .../ozone/om/snapshot/SnapshotUtils.java      |  71 +++++++-
 .../OzoneManagerRequestHandler.java           |   7 -
 .../om/service/TestKeyDeletingService.java    | 162 ++++++++++++++++--
 .../apache/hadoop/ozone/recon/ReconUtils.java |   6 +-
 .../ozone/recon/api/ContainerEndpoint.java    |   8 +-
 .../ozone/recon/api/OMDBInsightEndpoint.java  |   5 +-
 .../recon/tasks/OmUpdateEventValidator.java   |   2 -
 .../recon/ozone-recon-web/package.json        |   2 +-
 .../recon/ozone-recon-web/pnpm-lock.yaml      | 100 +++++++----
 .../ozone/s3/endpoint/BucketEndpoint.java     |   4 +
 .../hadoop/ozone/s3/signature/Credential.java |   3 +-
 .../ozone/admin/nssummary/NSSummaryAdmin.java |   1 -
 .../hadoop/ozone/fsck/ContainerMapper.java    |   2 +-
 .../ozone/shell/checknative/CheckNative.java  |  22 ++-
 .../ozone/checknative/TestCheckNative.java    |  18 ++
 pom.xml                                       |   6 +-
 83 files changed, 1294 insertions(+), 367 deletions(-)
 create mode 100644 hadoop-ozone/dist/src/main/compose/xcompat/krb5.conf

diff --git a/dev-support/ci/selective_ci_checks.bats b/dev-support/ci/selective_ci_checks.bats
index a95a981bdd3..12a7987ffb4 100644
--- a/dev-support/ci/selective_ci_checks.bats
+++ b/dev-support/ci/selective_ci_checks.bats
@@ -429,3 +429,15 @@ load bats-assert/load.bash
   assert_output -p needs-integration-tests=false
   assert_output -p needs-kubernetes-tests=false
 }
+
+@test "properties file in resources" {
+  run dev-support/ci/selective_ci_checks.sh 71b8bdd8becf72d6f7d4e7986895504b8259b3e5
+
+  assert_output -p 'basic-checks=["rat","checkstyle","native"]'
+  assert_output -p needs-build=false
+  assert_output -p needs-compile=false
+  assert_output -p needs-compose-tests=false
+  assert_output -p needs-dependency-check=false
+  assert_output -p needs-integration-tests=true
+  assert_output -p needs-kubernetes-tests=false
+}
diff --git a/dev-support/ci/selective_ci_checks.sh b/dev-support/ci/selective_ci_checks.sh
index e512b4a5d62..f6b06326a32 100755
--- a/dev-support/ci/selective_ci_checks.sh
+++ b/dev-support/ci/selective_ci_checks.sh
@@ -373,6 +373,7 @@ function check_needs_checkstyle() {
         "^hadoop-hdds/dev-support/checkstyle"
         "pom.xml"
         "src/..../java"
+        "src/..../resources/.*\.properties"
     )
     local ignore_array=(
         "^hadoop-ozone/dist"
diff --git a/hadoop-hdds/common/src/main/java/org/apache/hadoop/hdds/recon/ReconConfigKeys.java b/hadoop-hdds/common/src/main/java/org/apache/hadoop/hdds/recon/ReconConfigKeys.java
index e2903f44a65..fb6120a8925 100644
--- a/hadoop-hdds/common/src/main/java/org/apache/hadoop/hdds/recon/ReconConfigKeys.java
+++ b/hadoop-hdds/common/src/main/java/org/apache/hadoop/hdds/recon/ReconConfigKeys.java
@@ -24,8 +24,9 @@
  */
 public final class ReconConfigKeys {
 
-
-  /** Never constructed. **/
+  /**
+   * Never constructed.
+   */
   private ReconConfigKeys() {
   }
 
diff --git a/hadoop-hdds/common/src/main/java/org/apache/hadoop/ozone/upgrade/LayoutVersionInstanceFactory.java b/hadoop-hdds/common/src/main/java/org/apache/hadoop/ozone/upgrade/LayoutVersionInstanceFactory.java
index 796c8d8cdcf..e528425453d 100644
--- a/hadoop-hdds/common/src/main/java/org/apache/hadoop/ozone/upgrade/LayoutVersionInstanceFactory.java
+++ b/hadoop-hdds/common/src/main/java/org/apache/hadoop/ozone/upgrade/LayoutVersionInstanceFactory.java
@@ -37,7 +37,7 @@
 
 /**
  * Generic factory which stores different instances of Type 'T' sharded by
- * a key &amp; version. A single key can be associated with different versions
+ * a key and version. A single key can be associated with different versions
  * of 'T'.
  * Why does this class exist?
  * A typical use case during upgrade is to have multiple versions of a class
@@ -46,7 +46,7 @@
  * needed, and after finalize, a newer version is needed. This class serves
  * this purpose in a generic way.
  * For example, we can create a Factory to create multiple versions of
- * OMRequests sharded by Request Type &amp; Layout Version Supported.
+ * OMRequests sharded by Request Type and Layout Version Supported.
  */
 public class LayoutVersionInstanceFactory<T> {
 
@@ -69,7 +69,7 @@ public class LayoutVersionInstanceFactory<T> {
   /**
    * Register an instance with a given factory key (key + version).
    * For safety reasons we dont allow (1) re-registering, (2) registering an
-   * instance with version &gt; SLV.
+   * instance with version > SLV.
    *
    * @param lvm LayoutVersionManager
    * @param key VersionFactoryKey key to associate with instance.
@@ -138,8 +138,8 @@ private boolean isValid(LayoutVersionManager lvm, int version) {
   /**
    * From the list of versioned instances for a given "key", this
    * returns the "floor" value corresponding to the given version.
-   * For example, if we have key = "CreateKey",  entry -&gt; [(1, CreateKeyV1),
-   * (3, CreateKeyV2), and if the passed in key = CreateKey &amp; version = 2, we
+   * For example, if we have key = "CreateKey",  entry -> [(1, CreateKeyV1),
+   * (3, CreateKeyV2), and if the passed in key = CreateKey & version = 2, we
    * return CreateKeyV1.
    * Since this is a priority queue based implementation, we use a O(1) peek()
    * lookup to get the current valid version.
diff --git a/hadoop-hdds/common/src/main/resources/ozone-default.xml b/hadoop-hdds/common/src/main/resources/ozone-default.xml
index fd601e1a7d3..9b0ff0e9625 100644
--- a/hadoop-hdds/common/src/main/resources/ozone-default.xml
+++ b/hadoop-hdds/common/src/main/resources/ozone-default.xml
@@ -3743,6 +3743,15 @@
     </description>
   </property>
 
+  <property>
+    <name>ozone.snapshot.deep.cleaning.enabled</name>
+    <value>false</value>
+    <tag>OZONE, PERFORMANCE, OM</tag>
+    <description>
+      Flag to enable/disable snapshot deep cleaning.
+    </description>
+  </property>
+
   <property>
     <name>ozone.scm.event.ContainerReport.thread.pool.size</name>
     <value>10</value>
diff --git a/hadoop-hdds/container-service/src/main/java/org/apache/hadoop/ozone/container/common/volume/HddsVolume.java b/hadoop-hdds/container-service/src/main/java/org/apache/hadoop/ozone/container/common/volume/HddsVolume.java
index efdecc65ffb..c58aab2e5ba 100644
--- a/hadoop-hdds/container-service/src/main/java/org/apache/hadoop/ozone/container/common/volume/HddsVolume.java
+++ b/hadoop-hdds/container-service/src/main/java/org/apache/hadoop/ozone/container/common/volume/HddsVolume.java
@@ -199,7 +199,7 @@ public void shutdown() {
 
   /**
    * Delete all files under
-   * &lt;volume&gt;/hdds/&lt;cluster-id&gt;/tmp/deleted-containers.
+   * volume/hdds/cluster-id/tmp/deleted-containers.
    * This is the directory where containers are moved when they are deleted
    * from the system, but before being removed from the filesystem. This
    * makes the deletion atomic.
diff --git a/hadoop-hdds/container-service/src/main/java/org/apache/hadoop/ozone/container/common/volume/VolumeInfo.java b/hadoop-hdds/container-service/src/main/java/org/apache/hadoop/ozone/container/common/volume/VolumeInfo.java
index 0bedd4a089c..a7e7b752ee2 100644
--- a/hadoop-hdds/container-service/src/main/java/org/apache/hadoop/ozone/container/common/volume/VolumeInfo.java
+++ b/hadoop-hdds/container-service/src/main/java/org/apache/hadoop/ozone/container/common/volume/VolumeInfo.java
@@ -46,15 +46,17 @@
  * - fsCapacity: reported total capacity from local fs.
  * - minVolumeFreeSpace (mvfs) : determines the free space for closing
      containers.This is like adding a few reserved bytes to reserved space.
-     Dn's will send close container action to SCM at this limit &amp; it is
+     Dn's will send close container action to SCM at this limit, and it is
      configurable.
 
  *
- *
+ * <pre>
+ * {@code
  * |----used----|   (avail)   |++mvfs++|++++reserved+++++++|
- * |&lt;-     capacity                  -&gt;|
+ * |<-     capacity                  ->|
  *              |     fsAvail      |-------other-----------|
- * |&lt;-                   fsCapacity                      -&gt;|
+ * |<-                   fsCapacity                      ->|
+ * }</pre>
  *
  * What we could directly get from local fs:
  *     fsCapacity, fsAvail, (fsUsed = fsCapacity - fsAvail)
@@ -80,7 +82,7 @@
  * Then it is much simpler, since we don't care about other usage:
  *
  *  |----used----|             (avail)/fsAvail              |
- *  |&lt;-              capacity/fsCapacity                  -&gt;|
+ *  |<-              capacity/fsCapacity                  ->|
  *
  *  We have avail == fsAvail.
  */
@@ -155,7 +157,7 @@ public long getCapacity() {
   /**
    * Calculate available space use method A.
    * |----used----|   (avail)   |++++++++reserved++++++++|
-   * |&lt;-     capacity         -&gt;|
+   * |<-     capacity         ->|
    *
    * A) avail = capacity - used
    */
diff --git a/hadoop-hdds/container-service/src/main/java/org/apache/hadoop/ozone/container/common/volume/VolumeUsage.java b/hadoop-hdds/container-service/src/main/java/org/apache/hadoop/ozone/container/common/volume/VolumeUsage.java
index f0625464755..733dc7964f1 100644
--- a/hadoop-hdds/container-service/src/main/java/org/apache/hadoop/ozone/container/common/volume/VolumeUsage.java
+++ b/hadoop-hdds/container-service/src/main/java/org/apache/hadoop/ozone/container/common/volume/VolumeUsage.java
@@ -77,11 +77,15 @@ public long getUsedSpace() {
   }
 
   /**
+   * <pre>
+   * {@code
    * Calculate available space use method B.
    * |----used----|   (avail)   |++++++++reserved++++++++|
    *              |     fsAvail      |-------other-------|
    *                          -&gt;|~~~~|&lt;-
    *                      remainingReserved
+   * }
+   * </pre>
    * B) avail = fsAvail - Max(reserved - other, 0);
    */
   public SpaceUsageSource getCurrentUsage() {
diff --git a/hadoop-hdds/container-service/src/main/java/org/apache/hadoop/ozone/container/keyvalue/helpers/KeyValueContainerUtil.java b/hadoop-hdds/container-service/src/main/java/org/apache/hadoop/ozone/container/keyvalue/helpers/KeyValueContainerUtil.java
index dfd0b51775d..37da1ea3d8b 100644
--- a/hadoop-hdds/container-service/src/main/java/org/apache/hadoop/ozone/container/keyvalue/helpers/KeyValueContainerUtil.java
+++ b/hadoop-hdds/container-service/src/main/java/org/apache/hadoop/ozone/container/keyvalue/helpers/KeyValueContainerUtil.java
@@ -439,7 +439,7 @@ public static boolean isSameSchemaVersion(String schema, String other) {
 
   /**
    * Moves container directory to a new location
-   * under "&lt;volume&gt;/hdds/&lt;cluster-id&gt;/tmp/deleted-containers"
+   * under "volume/hdds/cluster-id/tmp/deleted-containers"
    * and updates metadata and chunks path.
    * Containers will be moved under it before getting deleted
    * to avoid, in case of failure, having artifact leftovers
@@ -460,6 +460,7 @@ public static boolean isSameSchemaVersion(String schema, String other) {
    * 5. Container is deleted from tmp directory.
    *
    * @param keyValueContainerData
+   * @return true if renaming was successful
    */
   public static void moveToDeletedContainerDir(
       KeyValueContainerData keyValueContainerData,
diff --git a/hadoop-hdds/docs/content/concept/Datanodes.md b/hadoop-hdds/docs/content/concept/Datanodes.md
index 47c09a798fc..cf246712f68 100644
--- a/hadoop-hdds/docs/content/concept/Datanodes.md
+++ b/hadoop-hdds/docs/content/concept/Datanodes.md
@@ -76,3 +76,15 @@ blocks that get reported. That is a 40x reduction in the block reports.
 This extra indirection helps tremendously with scaling Ozone. SCM has far
 less block data to process and the namespace service (Ozone Manager) as a
 different service are critical to scaling Ozone.
+
+
+## Notable configurations
+
+key | default | <div style="width: 300px;">description</div>
+----|---------|------------
+dfs.container.ratis.datanode.storage.dir | none | This directory is used for storing Ratis metadata like logs.
+ozone.scm.datanode.id.dir | none | The path that datanodes will use to store the datanode ID.
+hdds.datanode.dir | none | Determines where HDDS data will be stored on the local filesystem.
+hdds.datanode.dir.du.reserved | none | Reserved space in bytes per volume. Always leave this much space free for non dfs use.
+ozone.metadata.dirs | none | Directory to store persisted data (RocksDB).
+ozone.recon.address | 0.0.0.0:9891 | RPC address of the Recon. Use <host:port> to connect Recon.
diff --git a/hadoop-hdds/docs/content/concept/Datanodes.zh.md b/hadoop-hdds/docs/content/concept/Datanodes.zh.md
index 8f129df7b9b..32071c9e51e 100644
--- a/hadoop-hdds/docs/content/concept/Datanodes.zh.md
+++ b/hadoop-hdds/docs/content/concept/Datanodes.zh.md
@@ -49,3 +49,15 @@ Ozone 的存储容器是一个自包含的超级块，容器中包含一系列
 SCM 如何获得容器的位置？这一点和现有的 HDFS 十分相似。数据节点会定期发送类似于块报告的容器报告，容器报告比块报告的内容简洁的多，比如，对于一个存储容量为 196 TB 的集群，Ozone 大概会拥有四万个容器，相比于 HDFS 的一百五十万个块，块报告数量缩减为四十分之一。
 
 这种间接管理的方式大大地提高了 Ozone 的扩展性，因为 SCM 需要处理的块数据大大减少，且命名服务（OM）作为一个独特的服务主体对于扩展 Ozone 具有重要意义。
+
+
+## 需要关注的配置项
+
+配置项 |默认值 | <div style="width:300px;">描述</div>
+----|---------|------------
+dfs.container.ratis.datanode.storage.dir | none | 该目录用于存储 Ratis 元数据，如日志。
+ozone.scm.datanode.id.dir | none | 数据节点上用于存储数据节点 ID 的路径。 
+hdds.datanode.dir | none | 此配置决定数据节点上的数据将存储在本地文件系统的哪个位置。
+hdds.datanode.dir.du.reserved | none | 每个卷保留的存储空间（以字节为单位）。始终为非DFS用途保留这么多空闲空间。
+ozone.metadata.dirs | none | 用于存储持久化数据（RocksDB）的目录。
+ozone.recon.address | 0.0.0.0:9891 | Recon的RPC地址。 使用 <host:port> 连接到Recon。
\ No newline at end of file
diff --git a/hadoop-hdds/framework/src/main/java/org/apache/hadoop/hdds/scm/protocolPB/ScmBlockLocationProtocolClientSideTranslatorPB.java b/hadoop-hdds/framework/src/main/java/org/apache/hadoop/hdds/scm/protocolPB/ScmBlockLocationProtocolClientSideTranslatorPB.java
index 3c6222049b4..d9b198d4b14 100644
--- a/hadoop-hdds/framework/src/main/java/org/apache/hadoop/hdds/scm/protocolPB/ScmBlockLocationProtocolClientSideTranslatorPB.java
+++ b/hadoop-hdds/framework/src/main/java/org/apache/hadoop/hdds/scm/protocolPB/ScmBlockLocationProtocolClientSideTranslatorPB.java
@@ -307,7 +307,7 @@ public boolean addSCM(AddSCMRequest request) throws IOException {
   }
   /**
    * Sort the datanodes based on distance from client.
-   * @return List&lt;DatanodeDetails&gt;
+   * @return list of datanodes;
    * @throws IOException
    */
   @Override
diff --git a/hadoop-hdds/framework/src/main/java/org/apache/hadoop/hdds/security/x509/certificate/authority/DefaultApprover.java b/hadoop-hdds/framework/src/main/java/org/apache/hadoop/hdds/security/x509/certificate/authority/DefaultApprover.java
index b2d62443b77..5a39d0f1dd0 100644
--- a/hadoop-hdds/framework/src/main/java/org/apache/hadoop/hdds/security/x509/certificate/authority/DefaultApprover.java
+++ b/hadoop-hdds/framework/src/main/java/org/apache/hadoop/hdds/security/x509/certificate/authority/DefaultApprover.java
@@ -104,7 +104,7 @@ public DefaultApprover(PKIProfile pkiProfile, SecurityConfig config) {
    * @param certSerialId - the new certificate id.
    * @return Signed Certificate.
    * @throws IOException - On Error
-   * @throws OperatorCreationException - on Error.
+   * @throws CertificateException - on Error.
    */
   @SuppressWarnings("ParameterNumber")
   @Override
diff --git a/hadoop-hdds/framework/src/main/java/org/apache/hadoop/hdds/security/x509/certificate/authority/DefaultCAServer.java b/hadoop-hdds/framework/src/main/java/org/apache/hadoop/hdds/security/x509/certificate/authority/DefaultCAServer.java
index a93bdb4e3d6..118aa826013 100644
--- a/hadoop-hdds/framework/src/main/java/org/apache/hadoop/hdds/security/x509/certificate/authority/DefaultCAServer.java
+++ b/hadoop-hdds/framework/src/main/java/org/apache/hadoop/hdds/security/x509/certificate/authority/DefaultCAServer.java
@@ -195,8 +195,6 @@ public CertPath getCaCertPath()
    *
    * @param certSerialId         - Certificate for this CA.
    * @return X509Certificate
-   * @throws CertificateException - usually thrown if this CA is not
-   * initialized.
    * @throws IOException - on Error.
    */
   @Override
diff --git a/hadoop-hdds/framework/src/main/java/org/apache/hadoop/hdds/server/http/ProfileServlet.java b/hadoop-hdds/framework/src/main/java/org/apache/hadoop/hdds/server/http/ProfileServlet.java
index 34d6dfb9661..5ca32c9d407 100644
--- a/hadoop-hdds/framework/src/main/java/org/apache/hadoop/hdds/server/http/ProfileServlet.java
+++ b/hadoop-hdds/framework/src/main/java/org/apache/hadoop/hdds/server/http/ProfileServlet.java
@@ -41,11 +41,12 @@
 import org.slf4j.LoggerFactory;
 
 /**
+ * <pre>
  * Servlet that runs async-profiler as web-endpoint.
- * <p>
+ *
  * Source: https://github.com/apache/hive/blob/master/common/src/java/org
  * /apache/hive/http/ProfileServlet.java
- * <p>
+ *
  * Following options from async-profiler can be specified as query parameter.
  * //  -e event          profiling event: cpu|alloc|lock|cache-misses etc.
  * //  -d duration       run profiling for <duration> seconds
@@ -79,7 +80,7 @@
  * curl "http://localhost:10002/prof"
  * - To collect 1 minute CPU profile of current process and output in tree
  * format (html)
- * curl {@literal "http://localhost:10002/prof?output=tree&duration=60"}
+ * curl "http://localhost:10002/prof?output=tree&duration=60"
  * - To collect 30 second heap allocation profile of current process (returns
  * FlameGraph svg)
  * curl "http://localhost:10002/prof?event=alloc"
diff --git a/hadoop-hdds/framework/src/main/java/org/apache/hadoop/hdds/utils/HddsServerUtil.java b/hadoop-hdds/framework/src/main/java/org/apache/hadoop/hdds/utils/HddsServerUtil.java
index 32dcc2019c4..41fea63d205 100644
--- a/hadoop-hdds/framework/src/main/java/org/apache/hadoop/hdds/utils/HddsServerUtil.java
+++ b/hadoop-hdds/framework/src/main/java/org/apache/hadoop/hdds/utils/HddsServerUtil.java
@@ -125,11 +125,11 @@ private HddsServerUtil() {
       HddsServerUtil.class);
 
   /**
-   * Add protobuf-based protocol to the {@link org.apache.hadoop.ipc.RPC.Server}.
+   * Add protobuf-based protocol to the {@link RPC.Server}.
    * @param conf configuration
    * @param protocol Protocol interface
    * @param service service that implements the protocol
-   * @param server RPC server to which the protocol &amp; implementation is added to
+   * @param server RPC server to which the protocol and implementation is added to
    */
   public static void addPBProtocol(Configuration conf, Class<?> protocol,
       BlockingService service, RPC.Server server) throws IOException {
diff --git a/hadoop-hdds/framework/src/main/java/org/apache/hadoop/ozone/audit/package-info.java b/hadoop-hdds/framework/src/main/java/org/apache/hadoop/ozone/audit/package-info.java
index 981f168ddba..c428f2860ee 100644
--- a/hadoop-hdds/framework/src/main/java/org/apache/hadoop/ozone/audit/package-info.java
+++ b/hadoop-hdds/framework/src/main/java/org/apache/hadoop/ozone/audit/package-info.java
@@ -48,7 +48,7 @@
  * This interface must be implemented by entities requiring audit logging.
  * For example - OMVolumeArgs, OMBucketArgs.
  * The implementing class must override toAuditMap() to return an
- * instance of Map&lt;Key, Value&gt; where both Key and Value are String.
+ * instance of {@code Map<Key, Value>} where both Key and Value are String.
  *
  * Key: must contain printable US ASCII characters
  * May not contain a space, =, ], or "
diff --git a/hadoop-hdds/rocks-native/src/main/java/org/apache/hadoop/hdds/utils/NativeLibraryLoader.java b/hadoop-hdds/rocks-native/src/main/java/org/apache/hadoop/hdds/utils/NativeLibraryLoader.java
index ce424c930e1..d93933dee36 100644
--- a/hadoop-hdds/rocks-native/src/main/java/org/apache/hadoop/hdds/utils/NativeLibraryLoader.java
+++ b/hadoop-hdds/rocks-native/src/main/java/org/apache/hadoop/hdds/utils/NativeLibraryLoader.java
@@ -36,6 +36,8 @@
 import java.util.Optional;
 import java.util.concurrent.ConcurrentHashMap;
 
+import static org.apache.hadoop.hdds.utils.NativeConstants.ROCKS_TOOLS_NATIVE_LIBRARY_NAME;
+
 /**
  * Class to load Native Libraries.
  */
@@ -67,6 +69,10 @@ public static NativeLibraryLoader getInstance() {
     return instance;
   }
 
+  public static String getJniLibraryFileName() {
+    return appendLibOsSuffix("lib" + ROCKS_TOOLS_NATIVE_LIBRARY_NAME);
+  }
+
   public static String getJniLibraryFileName(String libraryName) {
     return appendLibOsSuffix("lib" + libraryName);
   }
@@ -99,9 +105,12 @@ private static String appendLibOsSuffix(String libraryFileName) {
     return libraryFileName + getLibOsSuffix();
   }
 
+  public static boolean isLibraryLoaded() {
+    return isLibraryLoaded(ROCKS_TOOLS_NATIVE_LIBRARY_NAME);
+  }
+
   public static boolean isLibraryLoaded(final String libraryName) {
-    return getInstance().librariesLoaded
-        .getOrDefault(libraryName, false);
+    return getInstance().librariesLoaded.getOrDefault(libraryName, false);
   }
 
   public synchronized boolean loadLibrary(final String libraryName, final List<String> dependentFiles) {
diff --git a/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/SCMCommonPlacementPolicy.java b/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/SCMCommonPlacementPolicy.java
index b603ba11b15..471a9479412 100644
--- a/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/SCMCommonPlacementPolicy.java
+++ b/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/SCMCommonPlacementPolicy.java
@@ -525,7 +525,7 @@ public boolean isValidNode(DatanodeDetails datanodeDetails,
    * Given a set of replicas of a container which are
    * neither over underreplicated nor overreplicated,
    * return a set of replicas to copy to another node to fix misreplication.
-   * @param replicas Map of replicas with value signifying if
+   * @param replicas: Map of replicas with value signifying if
    *                  replica can be copied
    */
   @Override
@@ -582,7 +582,7 @@ protected Node getPlacementGroup(DatanodeDetails dn) {
    * replication is computed.
    * The algorithm starts with creating a replicaIdMap which contains the
    * replicas grouped by replica Index. A placementGroup Map is created which
-   * groups replicas based on their rack &amp; the replicas within the rack
+   * groups replicas based on their rack & the replicas within the rack
    * are further grouped based on the replica Index.
    * A placement Group Count Map is created which keeps
    * track of the count of replicas in each rack.
@@ -590,13 +590,13 @@ protected Node getPlacementGroup(DatanodeDetails dn) {
    * order based on their current replication factor in a descending factor.
    * For each replica Index the replica is removed from the rack which contains
    * the most replicas, in order to achieve this the racks are put
-   * into priority queue &amp; are based on the number of replicas they have.
-   * The replica is removed from the rack with maximum replicas &amp; the replica
-   * to be removed is also removed from the maps created above &amp;
+   * into priority queue & are based on the number of replicas they have.
+   * The replica is removed from the rack with maximum replicas & the replica
+   * to be removed is also removed from the maps created above &
    * the count for rack is reduced.
    * The set of replicas computed are then returned by the function.
-   * @param replicas Set of existing replicas of the container
-   * @param expectedCountPerUniqueReplica Replication factor of each
+   * @param replicas: Set of existing replicas of the container
+   * @param expectedCountPerUniqueReplica: Replication factor of each
    *    *                                     unique replica
    * @return Set of replicas to be removed are computed.
    */
diff --git a/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/node/NodeManager.java b/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/node/NodeManager.java
index ec148301d73..992dc82582b 100644
--- a/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/node/NodeManager.java
+++ b/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/node/NodeManager.java
@@ -97,7 +97,6 @@ default RegisteredCommand register(
    * @param type The type of the SCMCommand.
    * @param scmCommand A BiConsumer that takes a DatanodeDetails and a
    *                   SCMCommand object and performs the necessary actions.
-   * layout version passed in.
    */
   default void registerSendCommandNotify(SCMCommandProto.Type type,
       BiConsumer<DatanodeDetails, SCMCommand<?>> scmCommand) {
diff --git a/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/node/NodeManagerMXBean.java b/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/node/NodeManagerMXBean.java
index 3b7f8480f57..1bd9677a363 100644
--- a/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/node/NodeManagerMXBean.java
+++ b/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/node/NodeManagerMXBean.java
@@ -45,7 +45,7 @@ public interface NodeManagerMXBean {
 
   /**
    * @return Get the NodeStatus table information  like hostname,
-   * Commissioned State &amp; Operational State column for dataNode
+   * Commissioned State and Operational State column for dataNode
    */
   Map<String, Map<String, String>> getNodeStatusInfo();
 
diff --git a/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/pipeline/PipelineStateManager.java b/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/pipeline/PipelineStateManager.java
index 94b56186a93..d6058877126 100644
--- a/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/pipeline/PipelineStateManager.java
+++ b/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/pipeline/PipelineStateManager.java
@@ -45,7 +45,7 @@ void addPipeline(HddsProtos.Pipeline pipelineProto)
 
   /**
    * Removing pipeline would be replicated to Ratis.
-   * @param pipelineIDProto Pipeline
+   * @param pipelineIDProto
    * @throws IOException
    */
   @Replicate
diff --git a/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/security/RootCARotationManager.java b/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/security/RootCARotationManager.java
index 7f17acbef06..2c979ce3717 100644
--- a/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/security/RootCARotationManager.java
+++ b/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/security/RootCARotationManager.java
@@ -117,6 +117,7 @@ public class RootCARotationManager extends StatefulService {
    * Constructs RootCARotationManager with the specified arguments.
    *
    * @param scm the storage container manager
+   *
    * <pre>
    * {@code
    *                         (1)   (3)(4)
@@ -133,7 +134,6 @@ public class RootCARotationManager extends StatefulService {
    *                   <---------------------------
    * }
    * </pre>
-   *
    *   (1) Rotation Prepare
    *   (2) Rotation Prepare Ack
    *   (3) Rotation Commit
diff --git a/hadoop-hdds/server-scm/src/main/resources/webapps/scm/scm-overview.html b/hadoop-hdds/server-scm/src/main/resources/webapps/scm/scm-overview.html
index 0f233bf4ea1..2748716e67f 100644
--- a/hadoop-hdds/server-scm/src/main/resources/webapps/scm/scm-overview.html
+++ b/hadoop-hdds/server-scm/src/main/resources/webapps/scm/scm-overview.html
@@ -110,6 +110,114 @@ <h2>Space Statistics</h2>
     </tbody>
 </table>
 
+<h2>Pipeline Statistics</h2>
+<table class="table table-bordered table-striped">
+    <tbody>
+    <tr>
+        <th>Pipeline State</th>
+        <th>Size</th>
+    </tr>
+    <tr>
+        <td>Closed</td>
+        <td>{{statistics.pipelines.closed}}</td>
+    </tr>
+    <tr>
+        <td>Allocated</td>
+        <td>{{statistics.pipelines.allocated}}</td>
+    </tr>
+    <tr>
+        <td>Open</td>
+        <td>{{statistics.pipelines.open}}</td>
+    </tr>
+    <tr>
+        <td>Dormant</td>
+        <td>{{statistics.pipelines.dormant}}</td>
+    </tr>
+    </tbody>
+</table>
+
+<h2>Container Statistics</h2>
+<table class="table table-bordered table-striped">
+    <tbody>
+    <tr>
+        <th>Operational State</th>
+        <th>Size</th>
+    </tr>
+    <tr>
+        <td>Open</td>
+        <td>{{statistics.containers.lifecycle.open}}</td>
+    </tr>
+    <tr>
+        <td>Closing</td>
+        <td>{{statistics.containers.lifecycle.closing}}</td>
+    </tr>
+    <tr>
+        <td>Quasi Closed</td>
+        <td>{{statistics.containers.lifecycle.quasi_closed}}</td>
+    </tr>
+    <tr>
+        <td>Closed</td>
+        <td>{{statistics.containers.lifecycle.closed}}</td>
+    </tr>
+    <tr>
+        <td>Deleting</td>
+        <td>{{statistics.containers.lifecycle.deleting}}</td>
+    </tr>
+    <tr>
+        <td>Deleted</td>
+        <td>{{statistics.containers.lifecycle.deleted}}</td>
+    </tr>
+    <tr>
+        <td>Recovering</td>
+        <td>{{statistics.containers.lifecycle.recovering}}</td>
+    </tr>
+    </tbody>
+</table>
+<table class="table table-bordered table-striped">
+    <tbody>
+    <tr>
+        <th>Health</th>
+        <th>Size</th>
+    </tr>
+    <tr>
+        <td>Under Replicated</td>
+        <td>{{statistics.containers.health.under_replicated}}</td>
+    </tr>
+    <tr>
+        <td>Mis Replicated</td>
+        <td>{{statistics.containers.health.mis_replicated}}</td>
+    </tr>
+    <tr>
+        <td>Over Replicated</td>
+        <td>{{statistics.containers.health.over_replicated}}</td>
+    </tr>
+    <tr>
+        <td>Missing</td>
+        <td>{{statistics.containers.health.missing}}</td>
+    </tr>
+    <tr>
+        <td>Unhealthy</td>
+        <td>{{statistics.containers.health.unhealthy}}</td>
+    </tr>
+    <tr>
+        <td>Empty</td>
+        <td>{{statistics.containers.health.empty}}</td>
+    </tr>
+    <tr>
+        <td>Open Unhealthy</td>
+        <td>{{statistics.containers.health.open_unhealthy}}</td>
+    </tr>
+    <tr>
+        <td>Quasi Closed Stuck</td>
+        <td>{{statistics.containers.health.quasi_closed_stuck}}</td>
+    </tr>
+    <tr>
+        <td>Open Without Pipeline</td>
+        <td>{{statistics.containers.health.open_without_pipeline}}</td>
+    </tr>
+    </tbody>
+</table>
+
 <h2>Node Status</h2>
 <div class="row">
     <div class="col-md-6 text-left">
diff --git a/hadoop-hdds/server-scm/src/main/resources/webapps/scm/scm.js b/hadoop-hdds/server-scm/src/main/resources/webapps/scm/scm.js
index e00f8b8ede8..fc216c06862 100644
--- a/hadoop-hdds/server-scm/src/main/resources/webapps/scm/scm.js
+++ b/hadoop-hdds/server-scm/src/main/resources/webapps/scm/scm.js
@@ -53,6 +53,34 @@
                         remaining : "N/A",
                         nonscmused : "N/A"
                     }
+                },
+                pipelines : {
+                    closed : "N/A",
+                    allocated : "N/A",
+                    open : "N/A",
+                    dormant : "N/A"
+                },
+                containers : {
+                    lifecycle : {
+                        open : "N/A",
+                        closing : "N/A",
+                        quasi_closed : "N/A",
+                        closed : "N/A",
+                        deleting : "N/A",
+                        deleted : "N/A",
+                        recovering : "N/A"
+                    },
+                    health : {
+                        under_replicated : "N/A",
+                        mis_replicated : "N/A",
+                        over_replicated : "N/A",
+                        missing : "N/A",
+                        unhealthy : "N/A",
+                        empty : "N/A",
+                        open_unhealthy : "N/A",
+                        quasi_closed_stuck : "N/A",
+                        open_without_pipeline : "N/A"
+                    }
                 }
             }
 
@@ -142,6 +170,46 @@
                         }
                     });
                 });
+
+            $http.get("jmx?qry=Hadoop:service=SCMPipelineManager,name=SCMPipelineManagerInfo")
+                .then(function (result) {
+                    const URLScheme = location.protocol.replace(":" , "");
+                    ctrl.scmpipelinemanager = result.data.beans[0];
+                    ctrl.scmpipelinemanager.PipelineInfo.forEach(({key, value}) => {
+                        if(key == "CLOSED") {
+                            $scope.statistics.pipelines.closed = value;
+                        } else if(key == "ALLOCATED") {
+                            $scope.statistics.pipelines.allocated = value;
+                        } else if(key == "OPEN") {
+                            $scope.statistics.pipelines.open = value;
+                        } else if(key == "DORMANT") {
+                            $scope.statistics.pipelines.dormant = value;
+                        }
+                    });
+                });
+
+            $http.get("jmx?qry=Hadoop:service=StorageContainerManager,name=ReplicationManagerMetrics")
+                .then(function (result) {
+                    const URLScheme = location.protocol.replace(":" , "");
+                    ctrl.scmcontainermanager = result.data.beans[0];
+                    $scope.statistics.containers.lifecycle.open = ctrl.scmcontainermanager.OpenContainers;
+                    $scope.statistics.containers.lifecycle.closing = ctrl.scmcontainermanager.ClosingContainers;
+                    $scope.statistics.containers.lifecycle.quasi_closed = ctrl.scmcontainermanager.QuasiClosedContainers;
+                    $scope.statistics.containers.lifecycle.closed = ctrl.scmcontainermanager.ClosedContainers;
+                    $scope.statistics.containers.lifecycle.deleting = ctrl.scmcontainermanager.DeletingContainers;
+                    $scope.statistics.containers.lifecycle.deleted = ctrl.scmcontainermanager.DeletedContainers;
+                    $scope.statistics.containers.lifecycle.recovering = ctrl.scmcontainermanager.RecoveringContainers;
+                    $scope.statistics.containers.health.under_replicated = ctrl.scmcontainermanager.UnderReplicatedContainers;
+                    $scope.statistics.containers.health.mis_replicated = ctrl.scmcontainermanager.MisReplicatedContainers;
+                    $scope.statistics.containers.health.over_replicated = ctrl.scmcontainermanager.OverReplicatedContainers;
+                    $scope.statistics.containers.health.missing = ctrl.scmcontainermanager.MissingContainers;
+                    $scope.statistics.containers.health.unhealthy = ctrl.scmcontainermanager.UnhealthyContainers;
+                    $scope.statistics.containers.health.empty = ctrl.scmcontainermanager.EmptyContainers;
+                    $scope.statistics.containers.health.open_unhealthy = ctrl.scmcontainermanager.OpenUnhealthyContainers;
+                    $scope.statistics.containers.health.quasi_closed_stuck = ctrl.scmcontainermanager.StuckQuasiClosedContainers;
+                    $scope.statistics.containers.health.open_without_pipeline = ctrl.scmcontainermanager.OpenContainersWithoutPipeline;
+                });
+
             /*if option is 'All' display all records else display specified record on page*/
             $scope.UpdateRecordsToShow = () => {
                 if($scope.RecordsToDisplay == 'All') {
diff --git a/hadoop-ozone/client/src/main/java/org/apache/hadoop/ozone/client/rpc/RpcClient.java b/hadoop-ozone/client/src/main/java/org/apache/hadoop/ozone/client/rpc/RpcClient.java
index 9dc11637f3c..fe986640176 100644
--- a/hadoop-ozone/client/src/main/java/org/apache/hadoop/ozone/client/rpc/RpcClient.java
+++ b/hadoop-ozone/client/src/main/java/org/apache/hadoop/ozone/client/rpc/RpcClient.java
@@ -2590,17 +2590,27 @@ public OzoneFsServerDefaults getServerDefaults() throws IOException {
     long now = Time.monotonicNow();
     if ((serverDefaults == null) ||
         (now - serverDefaultsLastUpdate > serverDefaultsValidityPeriod)) {
-      serverDefaults = ozoneManagerClient.getServerDefaults();
-      serverDefaultsLastUpdate = now;
+      try {
+        for (ServiceInfo si : ozoneManagerClient.getServiceInfo()
+            .getServiceInfoList()) {
+          if (si.getServerDefaults() != null) {
+            serverDefaults = si.getServerDefaults();
+            serverDefaultsLastUpdate = now;
+            break;
+          }
+        }
+      } catch (Exception e) {
+        LOG.warn("Could not get server defaults from OM.", e);
+      }
     }
-    assert serverDefaults != null;
     return serverDefaults;
   }
 
   @Override
   public URI getKeyProviderUri() throws IOException {
-    return OzoneKMSUtil.getKeyProviderUri(ugi,
-        null, getServerDefaults().getKeyProviderUri(), conf);
+    String keyProviderUri = (getServerDefaults() != null) ?
+        serverDefaults.getKeyProviderUri() : null;
+    return OzoneKMSUtil.getKeyProviderUri(ugi, null, keyProviderUri, conf);
   }
 
   @Override
diff --git a/hadoop-ozone/common/src/main/java/org/apache/hadoop/ozone/OFSPath.java b/hadoop-ozone/common/src/main/java/org/apache/hadoop/ozone/OFSPath.java
index c936c143a80..c5985f82093 100644
--- a/hadoop-ozone/common/src/main/java/org/apache/hadoop/ozone/OFSPath.java
+++ b/hadoop-ozone/common/src/main/java/org/apache/hadoop/ozone/OFSPath.java
@@ -214,7 +214,7 @@ public String toString() {
   }
 
   /**
-   * Get the volume &amp; bucket or mount name (non-key path).
+   * Get the volume and bucket or mount name (non-key path).
    * @return String of path excluding key in bucket.
    */
   // Prepend a delimiter at beginning. e.g. /vol1/buc1
diff --git a/hadoop-ozone/common/src/main/java/org/apache/hadoop/ozone/OmUtils.java b/hadoop-ozone/common/src/main/java/org/apache/hadoop/ozone/OmUtils.java
index b5dec2affbc..d6320061253 100644
--- a/hadoop-ozone/common/src/main/java/org/apache/hadoop/ozone/OmUtils.java
+++ b/hadoop-ozone/common/src/main/java/org/apache/hadoop/ozone/OmUtils.java
@@ -278,7 +278,6 @@ public static boolean isReadOnly(
     case SetSafeMode:
     case PrintCompactionLogDag:
     case GetSnapshotInfo:
-    case GetServerDefaults:
     case GetQuotaRepairStatus:
     case StartQuotaRepair:
       return true;
diff --git a/hadoop-ozone/common/src/main/java/org/apache/hadoop/ozone/om/OMConfigKeys.java b/hadoop-ozone/common/src/main/java/org/apache/hadoop/ozone/om/OMConfigKeys.java
index 46becc9e64b..a77bc4f5304 100644
--- a/hadoop-ozone/common/src/main/java/org/apache/hadoop/ozone/om/OMConfigKeys.java
+++ b/hadoop-ozone/common/src/main/java/org/apache/hadoop/ozone/om/OMConfigKeys.java
@@ -403,6 +403,8 @@ private OMConfigKeys() {
   /**
    * Configuration properties for Snapshot Directory Service.
    */
+  public static final String OZONE_SNAPSHOT_DEEP_CLEANING_ENABLED = "ozone.snapshot.deep.cleaning.enabled";
+  public static final boolean OZONE_SNAPSHOT_DEEP_CLEANING_ENABLED_DEFAULT = false;
   public static final String OZONE_SNAPSHOT_DIRECTORY_SERVICE_INTERVAL =
       "ozone.snapshot.directory.service.interval";
   public static final String OZONE_SNAPSHOT_DIRECTORY_SERVICE_INTERVAL_DEFAULT
diff --git a/hadoop-ozone/common/src/main/java/org/apache/hadoop/ozone/om/helpers/OmKeyInfo.java b/hadoop-ozone/common/src/main/java/org/apache/hadoop/ozone/om/helpers/OmKeyInfo.java
index b12e59da38f..0507a27de61 100644
--- a/hadoop-ozone/common/src/main/java/org/apache/hadoop/ozone/om/helpers/OmKeyInfo.java
+++ b/hadoop-ozone/common/src/main/java/org/apache/hadoop/ozone/om/helpers/OmKeyInfo.java
@@ -360,7 +360,6 @@ public synchronized void appendNewBlocks(
    * @param updateTime if true, updates modification time.
    * @param keepOldVersions if false, old blocks won't be kept
    *                        and the new block versions will always be 0
-   * @throws IOException
    */
   public synchronized long addNewVersion(
       List<OmKeyLocationInfo> newLocationList, boolean updateTime,
diff --git a/hadoop-ozone/common/src/main/java/org/apache/hadoop/ozone/om/helpers/RepeatedOmKeyInfo.java b/hadoop-ozone/common/src/main/java/org/apache/hadoop/ozone/om/helpers/RepeatedOmKeyInfo.java
index d7ee3728433..ccc47e7fc68 100644
--- a/hadoop-ozone/common/src/main/java/org/apache/hadoop/ozone/om/helpers/RepeatedOmKeyInfo.java
+++ b/hadoop-ozone/common/src/main/java/org/apache/hadoop/ozone/om/helpers/RepeatedOmKeyInfo.java
@@ -34,7 +34,7 @@
 /**
  * Args for deleted keys. This is written to om metadata deletedTable.
  * Once a key is deleted, it is moved to om metadata deletedTable. Having a
- * label: {@code List<OMKeyInfo>} ensures that if users create &amp; delete keys with
+ * label: {@code List<OMKeyInfo>} ensures that if users create and delete keys with
  * exact same uri multiple times, all the delete instances are bundled under
  * the same key name. This is useful as part of GDPR compliance where an
  * admin wants to confirm if a given key is deleted from deletedTable metadata.
@@ -111,8 +111,8 @@ public static RepeatedOmKeyInfo getFromProto(RepeatedKeyInfo
 
   /**
    *
-   * @param compact  true for persistence, false for network transmit
-   * @return RepeatedKeyInfo
+   * @param compact, true for persistence, false for network transmit
+   * @return
    */
   public RepeatedKeyInfo getProto(boolean compact, int clientVersion) {
     List<KeyInfo> list = new ArrayList<>();
diff --git a/hadoop-ozone/common/src/main/java/org/apache/hadoop/ozone/om/helpers/ServiceInfo.java b/hadoop-ozone/common/src/main/java/org/apache/hadoop/ozone/om/helpers/ServiceInfo.java
index c8bdbf43c42..5dbe3487e19 100644
--- a/hadoop-ozone/common/src/main/java/org/apache/hadoop/ozone/om/helpers/ServiceInfo.java
+++ b/hadoop-ozone/common/src/main/java/org/apache/hadoop/ozone/om/helpers/ServiceInfo.java
@@ -25,6 +25,7 @@
 import java.util.Map;
 
 import org.apache.hadoop.hdds.protocol.proto.HddsProtos.NodeType;
+import org.apache.hadoop.ozone.OzoneFsServerDefaults;
 import org.apache.hadoop.ozone.OzoneManagerVersion;
 import org.apache.hadoop.ozone.protocol.proto.OzoneManagerProtocolProtos;
 import org.apache.hadoop.ozone.protocol.proto.OzoneManagerProtocolProtos.OMRoleInfo;
@@ -59,6 +60,7 @@ public final class ServiceInfo {
   private Map<ServicePort.Type, Integer> ports;
   
   private OMRoleInfo omRoleInfo;
+  private OzoneFsServerDefaults serverDefaults;
 
   /**
    * Default constructor for JSON deserialization.
@@ -76,6 +78,24 @@ private ServiceInfo(NodeType nodeType,
                       List<ServicePort> portList,
                       OzoneManagerVersion omVersion,
                       OMRoleInfo omRole) {
+    this(nodeType, hostname, portList, omVersion, omRole, null);
+  }
+
+  /**
+   * Constructs the ServiceInfo for the {@code nodeType}.
+   * @param nodeType type of node/service
+   * @param hostname hostname of the service
+   * @param portList list of ports the service listens to
+   * @param omVersion Om Version
+   * @param omRole OM role Ino
+   * @param keyProviderUri KMS provider URI
+   */
+  private ServiceInfo(NodeType nodeType,
+                      String hostname,
+                      List<ServicePort> portList,
+                      OzoneManagerVersion omVersion,
+                      OMRoleInfo omRole,
+                      OzoneFsServerDefaults serverDefaults) {
     Preconditions.checkNotNull(nodeType);
     Preconditions.checkNotNull(hostname);
     this.nodeType = nodeType;
@@ -86,6 +106,7 @@ private ServiceInfo(NodeType nodeType,
       ports.put(port.getType(), port.getValue());
     }
     this.omRoleInfo = omRole;
+    this.serverDefaults = serverDefaults;
   }
 
   /**
@@ -143,6 +164,15 @@ public OMRoleInfo getOmRoleInfo() {
     return omRoleInfo;
   }
 
+  /**
+   * Returns the Ozone Server default configuration.
+   * @return OmRoleInfo
+   */
+  @JsonIgnore
+  public OzoneFsServerDefaults getServerDefaults() {
+    return serverDefaults;
+  }
+
   /**
    * Converts {@link ServiceInfo} to OzoneManagerProtocolProtos.ServiceInfo.
    *
@@ -170,6 +200,9 @@ public OzoneManagerProtocolProtos.ServiceInfo getProtobuf() {
     if (nodeType == NodeType.OM && omRoleInfo != null) {
       builder.setOmRole(omRoleInfo);
     }
+    if (serverDefaults != null) {
+      builder.setServerDefaults(serverDefaults.getProtobuf());
+    }
     return builder.build();
   }
 
@@ -185,7 +218,9 @@ public static ServiceInfo getFromProtobuf(
         serviceInfo.getHostname(),
         serviceInfo.getServicePortsList(),
         OzoneManagerVersion.fromProtoValue(serviceInfo.getOMVersion()),
-        serviceInfo.hasOmRole() ? serviceInfo.getOmRole() : null);
+        serviceInfo.hasOmRole() ? serviceInfo.getOmRole() : null,
+        serviceInfo.hasServerDefaults() ? OzoneFsServerDefaults.getFromProtobuf(
+            serviceInfo.getServerDefaults()) : null);
   }
 
   /**
@@ -206,6 +241,7 @@ public static class Builder {
     private List<ServicePort> portList = new ArrayList<>();
     private OMRoleInfo omRoleInfo;
     private OzoneManagerVersion omVersion;
+    private OzoneFsServerDefaults serverDefaults;
 
     /**
      * Gets the Om Client Protocol Version.
@@ -259,6 +295,11 @@ public Builder setOmRoleInfo(OMRoleInfo omRole) {
       return this;
     }
 
+    public Builder setServerDefaults(OzoneFsServerDefaults defaults) {
+      serverDefaults = defaults;
+      return this;
+    }
+
     /**
      * Builds and returns {@link ServiceInfo} with the set values.
      * @return {@link ServiceInfo}
@@ -268,7 +309,8 @@ public ServiceInfo build() {
           host,
           portList,
           omVersion,
-          omRoleInfo);
+          omRoleInfo,
+          serverDefaults);
     }
   }
 
diff --git a/hadoop-ozone/common/src/main/java/org/apache/hadoop/ozone/om/helpers/SnapshotInfo.java b/hadoop-ozone/common/src/main/java/org/apache/hadoop/ozone/om/helpers/SnapshotInfo.java
index 0f5593643c9..7feefdb0b22 100644
--- a/hadoop-ozone/common/src/main/java/org/apache/hadoop/ozone/om/helpers/SnapshotInfo.java
+++ b/hadoop-ozone/common/src/main/java/org/apache/hadoop/ozone/om/helpers/SnapshotInfo.java
@@ -52,7 +52,7 @@
  * Each snapshot created has an associated SnapshotInfo entry
  * containing the snapshotId, snapshot path,
  * snapshot checkpoint directory, previous snapshotId
- * for the snapshot path &amp; global amongst other necessary fields.
+ * for the snapshot path and global amongst other necessary fields.
  */
 public final class SnapshotInfo implements Auditable, CopyObject<SnapshotInfo> {
   private static final Codec<SnapshotInfo> CODEC = new DelegatedCodec<>(
diff --git a/hadoop-ozone/common/src/main/java/org/apache/hadoop/ozone/om/protocol/OzoneManagerProtocol.java b/hadoop-ozone/common/src/main/java/org/apache/hadoop/ozone/om/protocol/OzoneManagerProtocol.java
index c1aee11559e..94822630f8e 100644
--- a/hadoop-ozone/common/src/main/java/org/apache/hadoop/ozone/om/protocol/OzoneManagerProtocol.java
+++ b/hadoop-ozone/common/src/main/java/org/apache/hadoop/ozone/om/protocol/OzoneManagerProtocol.java
@@ -28,7 +28,6 @@
 import org.apache.hadoop.fs.SafeModeAction;
 import org.apache.hadoop.hdds.scm.container.common.helpers.ExcludeList;
 import org.apache.hadoop.ozone.OzoneAcl;
-import org.apache.hadoop.ozone.OzoneFsServerDefaults;
 import org.apache.hadoop.ozone.om.IOmMetadataReader;
 import org.apache.hadoop.ozone.om.OMConfigKeys;
 import org.apache.hadoop.ozone.om.exceptions.OMException;
@@ -1146,14 +1145,6 @@ void setTimes(OmKeyArgs keyArgs, long mtime, long atime)
   boolean setSafeMode(SafeModeAction action, boolean isChecked)
       throws IOException;
 
-  /**
-   * Get server default configurations.
-   *
-   * @return OzoneFsServerDefaults some default configurations from server.
-   * @throws IOException
-   */
-  OzoneFsServerDefaults getServerDefaults() throws IOException;
-
   /**
    * Get status of last triggered quota repair in OM.
    * @return String
diff --git a/hadoop-ozone/common/src/main/java/org/apache/hadoop/ozone/om/protocolPB/OzoneManagerProtocolClientSideTranslatorPB.java b/hadoop-ozone/common/src/main/java/org/apache/hadoop/ozone/om/protocolPB/OzoneManagerProtocolClientSideTranslatorPB.java
index 432b55051da..b140cf95e69 100644
--- a/hadoop-ozone/common/src/main/java/org/apache/hadoop/ozone/om/protocolPB/OzoneManagerProtocolClientSideTranslatorPB.java
+++ b/hadoop-ozone/common/src/main/java/org/apache/hadoop/ozone/om/protocolPB/OzoneManagerProtocolClientSideTranslatorPB.java
@@ -41,7 +41,6 @@
 import org.apache.hadoop.ipc.CallerContext;
 import org.apache.hadoop.ozone.ClientVersion;
 import org.apache.hadoop.ozone.OzoneAcl;
-import org.apache.hadoop.ozone.OzoneFsServerDefaults;
 import org.apache.hadoop.ozone.om.exceptions.OMException;
 import org.apache.hadoop.ozone.om.helpers.BasicOmKeyInfo;
 import org.apache.hadoop.ozone.om.helpers.ErrorInfo;
@@ -193,8 +192,6 @@
 import org.apache.hadoop.ozone.protocol.proto.OzoneManagerProtocolProtos.S3Authentication;
 import org.apache.hadoop.ozone.protocol.proto.OzoneManagerProtocolProtos.S3Secret;
 import org.apache.hadoop.ozone.protocol.proto.OzoneManagerProtocolProtos.SafeMode;
-import org.apache.hadoop.ozone.protocol.proto.OzoneManagerProtocolProtos.ServerDefaultsRequest;
-import org.apache.hadoop.ozone.protocol.proto.OzoneManagerProtocolProtos.ServerDefaultsResponse;
 import org.apache.hadoop.ozone.protocol.proto.OzoneManagerProtocolProtos.ServiceListRequest;
 import org.apache.hadoop.ozone.protocol.proto.OzoneManagerProtocolProtos.ServiceListResponse;
 import org.apache.hadoop.ozone.protocol.proto.OzoneManagerProtocolProtos.SetAclRequest;
@@ -2559,22 +2556,6 @@ public boolean setSafeMode(SafeModeAction action, boolean isChecked)
     return setSafeModeResponse.getResponse();
   }
 
-  @Override
-  public OzoneFsServerDefaults getServerDefaults()
-      throws IOException {
-    ServerDefaultsRequest serverDefaultsRequest =
-        ServerDefaultsRequest.newBuilder().build();
-
-    OMRequest omRequest = createOMRequest(Type.GetServerDefaults)
-        .setServerDefaultsRequest(serverDefaultsRequest).build();
-
-    ServerDefaultsResponse serverDefaultsResponse =
-        handleError(submitRequest(omRequest)).getServerDefaultsResponse();
-
-    return OzoneFsServerDefaults.getFromProtobuf(
-        serverDefaultsResponse.getServerDefaults());
-  }
-
   @Override
   public String getQuotaRepairStatus() throws IOException {
     OzoneManagerProtocolProtos.GetQuotaRepairStatusRequest quotaRepairStatusRequest =
diff --git a/hadoop-ozone/dist/src/main/compose/common/s3a-test.sh b/hadoop-ozone/dist/src/main/compose/common/s3a-test.sh
index 554b22b5a39..e8032068465 100644
--- a/hadoop-ozone/dist/src/main/compose/common/s3a-test.sh
+++ b/hadoop-ozone/dist/src/main/compose/common/s3a-test.sh
@@ -94,10 +94,9 @@ EOF
 
   # Some tests are skipped due to known issues.
   # - ITestS3AContractDistCp: HDDS-10616
-  # - ITestS3AContractGetFileStatusV1List: HDDS-10617
   # - ITestS3AContractRename: HDDS-10665
   mvn -B -V --fail-never --no-transfer-progress \
-    -Dtest='ITestS3AContract*, ITestS3ACommitterMRJob, !ITestS3AContractDistCp, !ITestS3AContractGetFileStatusV1List, !ITestS3AContractRename' \
+    -Dtest='ITestS3AContract*, ITestS3ACommitterMRJob, !ITestS3AContractDistCp, !ITestS3AContractRename' \
     clean test
 
   local target="${RESULT_DIR}/junit/${bucket}/target"
diff --git a/hadoop-ozone/dist/src/main/compose/upgrade/testlib.sh b/hadoop-ozone/dist/src/main/compose/upgrade/testlib.sh
index 69af73f50c9..d2718d04b7d 100755
--- a/hadoop-ozone/dist/src/main/compose/upgrade/testlib.sh
+++ b/hadoop-ozone/dist/src/main/compose/upgrade/testlib.sh
@@ -51,12 +51,12 @@ create_data_dirs() {
 #    be used.
 ##   Else, a binary image will be used.
 prepare_for_image() {
-  local image_version="$1"
+  local image_version="${1}"
 
   if [[ "$image_version" = "$OZONE_CURRENT_VERSION" ]]; then
       prepare_for_runner_image
   else
-      prepare_for_binary_image "$image_version"
+      prepare_for_binary_image "${image_version}-rocky"
   fi
 }
 
diff --git a/hadoop-ozone/dist/src/main/compose/xcompat/.env b/hadoop-ozone/dist/src/main/compose/xcompat/.env
index 140975d4bd0..a673b7f4655 100644
--- a/hadoop-ozone/dist/src/main/compose/xcompat/.env
+++ b/hadoop-ozone/dist/src/main/compose/xcompat/.env
@@ -17,3 +17,5 @@
 HDDS_VERSION=${hdds.version}
 OZONE_RUNNER_VERSION=${docker.ozone-runner.version}
 OZONE_RUNNER_IMAGE=apache/ozone-runner
+HADOOP_VERSION=${hadoop.version}
+OZONE_TESTKRB5_IMAGE=${docker.ozone-testkr5b.image}
diff --git a/hadoop-ozone/dist/src/main/compose/xcompat/clients.yaml b/hadoop-ozone/dist/src/main/compose/xcompat/clients.yaml
index 0bf0f619bd7..eda14353688 100644
--- a/hadoop-ozone/dist/src/main/compose/xcompat/clients.yaml
+++ b/hadoop-ozone/dist/src/main/compose/xcompat/clients.yaml
@@ -16,39 +16,49 @@
 
 services:
   old_client_1_0_0:
-    image: apache/ozone:1.0.0
+    image: apache/ozone:1.0.0-rocky
     env_file:
       - docker-config
     volumes:
       - ../..:/opt/ozone
+      - ../_keytabs:/etc/security/keytabs
+      - ./krb5.conf:/etc/krb5.conf
     command: ["sleep","1000000"]
   old_client_1_1_0:
-    image: apache/ozone:1.1.0
+    image: apache/ozone:1.1.0-rocky
     env_file:
       - docker-config
     volumes:
       - ../..:/opt/ozone
+      - ../_keytabs:/etc/security/keytabs
+      - ./krb5.conf:/etc/krb5.conf
     command: ["sleep","1000000"]
   old_client_1_2_1:
-    image: apache/ozone:1.2.1
+    image: apache/ozone:1.2.1-rocky
     env_file:
       - docker-config
     volumes:
       - ../..:/opt/ozone
+      - ../_keytabs:/etc/security/keytabs
+      - ./krb5.conf:/etc/krb5.conf
     command: ["sleep","1000000"]
   old_client_1_3_0:
-    image: apache/ozone:1.3.0
+    image: apache/ozone:1.3.0-rocky
     env_file:
       - docker-config
     volumes:
       - ../..:/opt/ozone
+      - ../_keytabs:/etc/security/keytabs
+      - ./krb5.conf:/etc/krb5.conf
     command: ["sleep","1000000"]
   old_client_1_4_0:
-    image: apache/ozone:1.4.0
+    image: apache/ozone:1.4.0-rocky
     env_file:
       - docker-config
     volumes:
       - ../..:/opt/ozone
+      - ../_keytabs:/etc/security/keytabs
+      - ./krb5.conf:/etc/krb5.conf
     command: ["sleep","1000000"]
   new_client:
     image: ${OZONE_RUNNER_IMAGE}:${OZONE_RUNNER_VERSION}
@@ -56,6 +66,8 @@ services:
       - docker-config
     volumes:
       - ../..:/opt/hadoop
+      - ../_keytabs:/etc/security/keytabs
+      - ./krb5.conf:/etc/krb5.conf
     environment:
       OZONE_OPTS:
     command: ["sleep","1000000"]
diff --git a/hadoop-ozone/dist/src/main/compose/xcompat/docker-config b/hadoop-ozone/dist/src/main/compose/xcompat/docker-config
index 85099f902d3..1a61aaf4f7e 100644
--- a/hadoop-ozone/dist/src/main/compose/xcompat/docker-config
+++ b/hadoop-ozone/dist/src/main/compose/xcompat/docker-config
@@ -14,6 +14,8 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+CORE-SITE.XML_fs.defaultFS=ofs://om
+CORE-SITE.XML_fs.trash.interval=1
 CORE-SITE.XML_fs.ofs.impl=org.apache.hadoop.fs.ozone.RootedOzoneFileSystem
 
 OZONE-SITE.XML_hdds.datanode.dir=/data/hdds
@@ -22,6 +24,7 @@ OZONE-SITE.XML_hdds.scm.safemode.min.datanode=3
 OZONE-SITE.XML_ozone.metadata.dirs=/data/metadata
 OZONE-SITE.XML_ozone.om.address=om
 OZONE-SITE.XML_ozone.om.http-address=om:9874
+OZONE-SITE.XML_ozone.scm.http-address=scm:9876
 OZONE-SITE.XML_ozone.recon.address=recon:9891
 OZONE-SITE.XML_ozone.recon.db.dir=/data/metadata/recon
 OZONE-SITE.XML_ozone.server.default.replication=3
@@ -31,9 +34,98 @@ OZONE-SITE.XML_ozone.scm.container.size=1GB
 OZONE-SITE.XML_ozone.scm.datanode.ratis.volume.free-space.min=10MB
 OZONE-SITE.XML_ozone.scm.datanode.id.dir=/data
 OZONE-SITE.XML_ozone.scm.names=scm
+OZONE-SITE.XML_ozone.scm.pipeline.creation.interval=30s
 OZONE-SITE.XML_ozone.scm.pipeline.owner.container.count=1
+OZONE-SITE.XML_ozone.datanode.pipeline.limit=1
 OZONE-SITE.XML_recon.om.snapshot.task.interval.delay=1m
 OZONE-SITE.XML_hdds.scmclient.max.retry.timeout=30s
 OZONE-SITE.XML_ozone.default.bucket.layout=LEGACY
 OZONE-SITE.XML_ozone.http.basedir=/tmp/ozone_http
-no_proxy=om,recon,scm,s3g,kdc,localhost,127.0.0.1
+
+OZONE-SITE.XML_hdds.block.token.enabled=true
+OZONE-SITE.XML_hdds.container.token.enabled=true
+OZONE-SITE.XML_hdds.grpc.tls.enabled=true
+
+OZONE-SITE.XML_ozone.security.enabled=true
+OZONE-SITE.XML_ozone.acl.enabled=true
+OZONE-SITE.XML_ozone.acl.authorizer.class=org.apache.hadoop.ozone.security.acl.OzoneNativeAuthorizer
+OZONE-SITE.XML_ozone.administrators="testuser,recon,om"
+OZONE-SITE.XML_ozone.s3.administrators="testuser,recon,om"
+OZONE-SITE.XML_ozone.recon.administrators="testuser2"
+OZONE-SITE.XML_ozone.s3.administrators="testuser,s3g"
+
+HDFS-SITE.XML_dfs.datanode.address=0.0.0.0:1019
+HDFS-SITE.XML_dfs.datanode.http.address=0.0.0.0:1012
+CORE-SITE.XML_dfs.data.transfer.protection=authentication
+CORE-SITE.XML_hadoop.security.authentication=kerberos
+CORE-SITE.XML_hadoop.security.auth_to_local="DEFAULT"
+CORE-SITE.XML_hadoop.security.key.provider.path=kms://http@kms:9600/kms
+
+OZONE-SITE.XML_hdds.scm.kerberos.principal=scm/scm@EXAMPLE.COM
+OZONE-SITE.XML_hdds.scm.kerberos.keytab.file=/etc/security/keytabs/scm.keytab
+OZONE-SITE.XML_ozone.om.kerberos.principal=om/om@EXAMPLE.COM
+OZONE-SITE.XML_ozone.om.kerberos.keytab.file=/etc/security/keytabs/om.keytab
+OZONE-SITE.XML_ozone.recon.kerberos.keytab.file=/etc/security/keytabs/recon.keytab
+OZONE-SITE.XML_ozone.recon.kerberos.principal=recon/recon@EXAMPLE.COM
+
+OZONE-SITE.XML_ozone.s3g.kerberos.keytab.file=/etc/security/keytabs/s3g.keytab
+OZONE-SITE.XML_ozone.s3g.kerberos.principal=s3g/s3g@EXAMPLE.COM
+
+OZONE-SITE.XML_ozone.httpfs.kerberos.keytab.file=/etc/security/keytabs/httpfs.keytab
+OZONE-SITE.XML_ozone.httpfs.kerberos.principal=httpfs/httpfs@EXAMPLE.COM
+
+HDFS-SITE.XML_dfs.datanode.kerberos.principal=dn/dn@EXAMPLE.COM
+HDFS-SITE.XML_dfs.datanode.keytab.file=/etc/security/keytabs/dn.keytab
+HDFS-SITE.XML_dfs.datanode.kerberos.keytab.file=/etc/security/keytabs/dn.keytab
+HDFS-SITE.XML_dfs.web.authentication.kerberos.principal=HTTP/ozone@EXAMPLE.COM
+HDFS-SITE.XML_dfs.web.authentication.kerberos.keytab=/etc/security/keytabs/HTTP.keytab
+
+OZONE-SITE.XML_ozone.security.http.kerberos.enabled=true
+OZONE-SITE.XML_ozone.s3g.secret.http.enabled=true
+OZONE-SITE.XML_ozone.http.filter.initializers=org.apache.hadoop.security.AuthenticationFilterInitializer
+
+OZONE-SITE.XML_ozone.om.http.auth.type=kerberos
+OZONE-SITE.XML_hdds.scm.http.auth.type=kerberos
+OZONE-SITE.XML_hdds.datanode.http.auth.type=kerberos
+OZONE-SITE.XML_ozone.s3g.http.auth.type=kerberos
+OZONE-SITE.XML_ozone.s3g.secret.http.auth.type=kerberos
+OZONE-SITE.XML_ozone.httpfs.http.auth.type=kerberos
+OZONE-SITE.XML_ozone.recon.http.auth.type=kerberos
+
+OZONE-SITE.XML_hdds.scm.http.auth.kerberos.principal=HTTP/scm@EXAMPLE.COM
+OZONE-SITE.XML_hdds.scm.http.auth.kerberos.keytab=/etc/security/keytabs/scm.keytab
+OZONE-SITE.XML_ozone.om.http.auth.kerberos.principal=HTTP/om@EXAMPLE.COM
+OZONE-SITE.XML_ozone.om.http.auth.kerberos.keytab=/etc/security/keytabs/om.keytab
+OZONE-SITE.XML_hdds.datanode.http.auth.kerberos.principal=HTTP/dn@EXAMPLE.COM
+OZONE-SITE.XML_hdds.datanode.http.auth.kerberos.keytab=/etc/security/keytabs/dn.keytab
+OZONE-SITE.XML_ozone.s3g.http.auth.kerberos.keytab=/etc/security/keytabs/s3g.keytab
+OZONE-SITE.XML_ozone.s3g.http.auth.kerberos.principal=HTTP/s3g@EXAMPLE.COM
+OZONE-SITE.XML_ozone.httpfs.http.auth.kerberos.keytab=/etc/security/keytabs/httpfs.keytab
+OZONE-SITE.XML_ozone.httpfs.http.auth.kerberos.principal=HTTP/httpfs@EXAMPLE.COM
+OZONE-SITE.XML_ozone.recon.http.auth.kerberos.principal=*
+OZONE-SITE.XML_ozone.recon.http.auth.kerberos.keytab=/etc/security/keytabs/recon.keytab
+
+CORE-SITE.XML_hadoop.http.authentication.simple.anonymous.allowed=false
+CORE-SITE.XML_hadoop.http.authentication.signature.secret.file=/etc/security/http_secret
+CORE-SITE.XML_hadoop.http.authentication.type=kerberos
+CORE-SITE.XML_hadoop.http.authentication.kerberos.principal=HTTP/ozone@EXAMPLE.COM
+CORE-SITE.XML_hadoop.http.authentication.kerberos.keytab=/etc/security/keytabs/HTTP.keytab
+
+CORE-SITE.XML_hadoop.security.authorization=true
+HADOOP-POLICY.XML_ozone.om.security.client.protocol.acl=*
+HADOOP-POLICY.XML_hdds.security.client.datanode.container.protocol.acl=*
+HADOOP-POLICY.XML_hdds.security.client.scm.container.protocol.acl=*
+HADOOP-POLICY.XML_hdds.security.client.scm.block.protocol.acl=*
+HADOOP-POLICY.XML_hdds.security.client.scm.certificate.protocol.acl=*
+HADOOP-POLICY.XML_ozone.security.reconfigure.protocol.acl=*
+
+KMS-SITE.XML_hadoop.kms.proxyuser.s3g.users=*
+KMS-SITE.XML_hadoop.kms.proxyuser.s3g.groups=*
+KMS-SITE.XML_hadoop.kms.proxyuser.s3g.hosts=*
+
+OZONE_DATANODE_SECURE_USER=root
+JSVC_HOME=/usr/bin
+
+OZONE_LOG_DIR=/var/log/hadoop
+
+no_proxy=om,scm,recon,s3g,kdc,localhost,127.0.0.1
diff --git a/hadoop-ozone/dist/src/main/compose/xcompat/krb5.conf b/hadoop-ozone/dist/src/main/compose/xcompat/krb5.conf
new file mode 100644
index 00000000000..eefc5b9c685
--- /dev/null
+++ b/hadoop-ozone/dist/src/main/compose/xcompat/krb5.conf
@@ -0,0 +1,41 @@
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+[logging]
+default = FILE:/var/log/krb5libs.log
+kdc = FILE:/var/log/krb5kdc.log
+admin_server = FILE:/var/log/kadmind.log
+
+[libdefaults]
+ dns_canonicalize_hostname = false
+ dns_lookup_realm = false
+ ticket_lifetime = 24h
+ renew_lifetime = 7d
+ forwardable = true
+ rdns = false
+ default_realm = EXAMPLE.COM
+
+[realms]
+ EXAMPLE.COM = {
+  kdc = kdc
+  admin_server = kdc
+  max_renewable_life = 7d
+ }
+
+[domain_realm]
+ .example.com = EXAMPLE.COM
+ example.com = EXAMPLE.COM
+
diff --git a/hadoop-ozone/dist/src/main/compose/xcompat/new-cluster.yaml b/hadoop-ozone/dist/src/main/compose/xcompat/new-cluster.yaml
index 6e3ff6cfbc9..32059140ce9 100644
--- a/hadoop-ozone/dist/src/main/compose/xcompat/new-cluster.yaml
+++ b/hadoop-ozone/dist/src/main/compose/xcompat/new-cluster.yaml
@@ -18,14 +18,39 @@
 x-new-config:
   &new-config
   image: ${OZONE_RUNNER_IMAGE}:${OZONE_RUNNER_VERSION}
+  dns_search: .
   env_file:
     - docker-config
   volumes:
     - ../..:/opt/hadoop
+    - ../_keytabs:/etc/security/keytabs
+    - ./krb5.conf:/etc/krb5.conf
 
 services:
+  kdc:
+    image: ${OZONE_TESTKRB5_IMAGE}
+    hostname: kdc
+    dns_search: .
+    volumes:
+      - ../..:/opt/hadoop
+      - ../_keytabs:/etc/security/keytabs
+    command: [ "krb5kdc","-n" ]
+  kms:
+    image: apache/hadoop:${HADOOP_VERSION}
+    hostname: kms
+    dns_search: .
+    ports:
+      - 9600:9600
+    env_file:
+      - ./docker-config
+    environment:
+      HADOOP_CONF_DIR: /opt/hadoop/etc/hadoop
+    volumes:
+      - ../../libexec/transformation.py:/opt/transformation.py
+    command: [ "hadoop", "kms" ]
   datanode:
     <<: *new-config
+    hostname: dn
     ports:
       - 19864
       - 9882
@@ -34,15 +59,17 @@ services:
     command: ["ozone","datanode"]
   om:
     <<: *new-config
+    hostname: om
     environment:
       ENSURE_OM_INITIALIZED: /data/metadata/om/current/VERSION
-      OZONE_OPTS:
+      OZONE_OPTS: -Dcom.sun.net.ssl.checkRevocation=false
     ports:
       - 9874:9874
       - 9862:9862
     command: ["ozone","om"]
   recon:
     <<: *new-config
+    hostname: recon
     ports:
       - 9888:9888
     environment:
@@ -50,6 +77,7 @@ services:
     command: ["ozone","recon"]
   s3g:
     <<: *new-config
+    hostname: s3g
     environment:
       OZONE_OPTS:
     ports:
@@ -57,9 +85,12 @@ services:
     command: ["ozone","s3g"]
   scm:
     <<: *new-config
+    hostname: scm
     ports:
       - 9876:9876
+      - 9860:9860
     environment:
       ENSURE_SCM_INITIALIZED: /data/metadata/scm/current/VERSION
+      OZONE-SITE.XML_hdds.scm.safemode.min.datanode: "${OZONE_SAFEMODE_MIN_DATANODES:-1}"
       OZONE_OPTS:
     command: ["ozone","scm"]
diff --git a/hadoop-ozone/dist/src/main/compose/xcompat/old-cluster.yaml b/hadoop-ozone/dist/src/main/compose/xcompat/old-cluster.yaml
index c603bb51df3..d1b6e56a084 100644
--- a/hadoop-ozone/dist/src/main/compose/xcompat/old-cluster.yaml
+++ b/hadoop-ozone/dist/src/main/compose/xcompat/old-cluster.yaml
@@ -17,15 +17,40 @@
 # reusable fragments (see https://docs.docker.com/compose/compose-file/#extension-fields)
 x-old-config:
   &old-config
-  image: apache/ozone:${OZONE_VERSION}
+  image: apache/ozone:${OZONE_VERSION}-rocky
+  dns_search: .
   env_file:
     - docker-config
   volumes:
     - ../..:/opt/ozone
+    - ../_keytabs:/etc/security/keytabs
+    - ./krb5.conf:/etc/krb5.conf
 
 services:
+  kdc:
+    image: ${OZONE_TESTKRB5_IMAGE}
+    hostname: kdc
+    dns_search: .
+    volumes:
+      - ../..:/opt/ozone
+      - ../_keytabs:/etc/security/keytabs
+    command: [ "krb5kdc","-n" ]
+  kms:
+    image: apache/hadoop:${HADOOP_VERSION}
+    hostname: kms
+    dns_search: .
+    ports:
+      - 9600:9600
+    env_file:
+      - ./docker-config
+    environment:
+      HADOOP_CONF_DIR: /opt/hadoop/etc/hadoop
+    volumes:
+      - ../../libexec/transformation.py:/opt/transformation.py
+    command: [ "hadoop", "kms" ]
   datanode:
     <<: *old-config
+    hostname: dn
     ports:
       - 19864
       - 9882
@@ -34,8 +59,10 @@ services:
     command: ["ozone","datanode"]
   om:
     <<: *old-config
+    hostname: om
     environment:
       ENSURE_OM_INITIALIZED: /data/metadata/om/current/VERSION
+      OZONE_OPTS: -Dcom.sun.net.ssl.checkRevocation=false
       HADOOP_OPTS:
     ports:
       - 9874:9874
@@ -43,6 +70,7 @@ services:
     command: ["ozone","om"]
   recon:
     <<: *old-config
+    hostname: recon
     ports:
       - 9888:9888
     environment:
@@ -50,6 +78,7 @@ services:
     command: ["ozone","recon"]
   s3g:
     <<: *old-config
+    hostname: s3g
     environment:
       HADOOP_OPTS:
     ports:
@@ -57,9 +86,11 @@ services:
     command: ["ozone","s3g"]
   scm:
     <<: *old-config
+    hostname: scm
     ports:
       - 9876:9876
     environment:
       ENSURE_SCM_INITIALIZED: /data/metadata/scm/current/VERSION
+      OZONE-SITE.XML_hdds.scm.safemode.min.datanode: "${OZONE_SAFEMODE_MIN_DATANODES:-1}"
       HADOOP_OPTS:
     command: ["ozone","scm"]
diff --git a/hadoop-ozone/dist/src/main/compose/xcompat/test.sh b/hadoop-ozone/dist/src/main/compose/xcompat/test.sh
index 695d8bf06ab..8774cf2f632 100755
--- a/hadoop-ozone/dist/src/main/compose/xcompat/test.sh
+++ b/hadoop-ozone/dist/src/main/compose/xcompat/test.sh
@@ -22,11 +22,15 @@ export COMPOSE_DIR
 basename=$(basename ${COMPOSE_DIR})
 
 current_version="${ozone.version}"
-old_versions="1.0.0 1.1.0 1.2.1 1.3.0 1.4.0" # container is needed for each version in clients.yaml
+# TODO: debug acceptance test failures for client versions 1.0.0 on secure clusters
+old_versions="1.1.0 1.2.1 1.3.0 1.4.0" # container is needed for each version in clients.yaml
 
 # shellcheck source=hadoop-ozone/dist/src/main/compose/testlib.sh
 source "${COMPOSE_DIR}/../testlib.sh"
 
+export SECURITY_ENABLED=true
+: ${OZONE_BUCKET_KEY_NAME:=key1}
+
 old_client() {
   OZONE_DIR=/opt/ozone
   container=${client}
@@ -40,24 +44,40 @@ new_client() {
   "$@"
 }
 
+_kinit() {
+  execute_command_in_container ${container} kinit -k -t /etc/security/keytabs/testuser.keytab testuser/scm@EXAMPLE.COM
+}
+
 _init() {
+  _kinit
   execute_command_in_container ${container} ozone freon ockg -n1 -t1 -p warmup
 }
 
 _write() {
+  _kinit
   execute_robot_test ${container} -N "xcompat-cluster-${cluster_version}-client-${client_version}-write" -v SUFFIX:${client_version} compatibility/write.robot
 }
 
 _read() {
+  _kinit
   local data_version="$1"
   execute_robot_test ${container} -N "xcompat-cluster-${cluster_version}-client-${client_version}-read-${data_version}" -v SUFFIX:${data_version} compatibility/read.robot
 }
 
+test_bucket_encryption() {
+  _kinit
+  execute_robot_test ${container} -N "xcompat-cluster-${cluster_version}-client-${client_version}" -v SUFFIX:${client_version} security/bucket-encryption.robot
+}
+
 test_cross_compatibility() {
   echo "Starting cluster with COMPOSE_FILE=${COMPOSE_FILE}"
 
   OZONE_KEEP_RESULTS=true start_docker_env
 
+  execute_command_in_container kms hadoop key create ${OZONE_BUCKET_KEY_NAME}
+  new_client test_bucket_encryption
+
+  container=scm _kinit
   execute_command_in_container scm ozone freon ockg -n1 -t1 -p warmup
   new_client _write
   new_client _read ${current_version}
@@ -65,6 +85,8 @@ test_cross_compatibility() {
   for client_version in "$@"; do
     client="old_client_${client_version//./_}"
 
+    old_client test_bucket_encryption
+
     old_client _write
     old_client _read ${client_version}
 
@@ -79,7 +101,8 @@ test_ec_cross_compatibility() {
   echo "Running Erasure Coded storage backward compatibility tests."
   # local cluster_versions_with_ec="1.3.0 1.4.0 ${current_version}"
   local cluster_versions_with_ec="${current_version}" # until HDDS-11334
-  local non_ec_client_versions="1.0.0 1.1.0 1.2.1"
+  # TODO: debug acceptance test failures for client versions 1.0.0 on secure clusters
+  local non_ec_client_versions="1.1.0 1.2.1"
 
   for cluster_version in ${cluster_versions_with_ec}; do
     export COMPOSE_FILE=new-cluster.yaml:clients.yaml cluster_version=${cluster_version}
@@ -102,12 +125,14 @@ test_ec_cross_compatibility() {
 
     local prefix=$(LC_CTYPE=C tr -dc '[:alnum:]' < /dev/urandom | head -c 5 | tr '[:upper:]' '[:lower:]')
     OZONE_DIR=/opt/hadoop
+    new_client _kinit
     execute_robot_test new_client --include setup-ec-data -N "xcompat-cluster-${cluster_version}-setup-data" -v prefix:"${prefix}" ec/backward-compat.robot
      OZONE_DIR=/opt/ozone
 
     for client_version in ${non_ec_client_versions}; do
       client="old_client_${client_version//./_}"
       unset OUTPUT_PATH
+      container="${client}" _kinit
       execute_robot_test "${client}" --include test-ec-compat -N "xcompat-cluster-${cluster_version}-client-${client_version}-read-${cluster_version}" -v prefix:"${prefix}" ec/backward-compat.robot
     done
 
diff --git a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/fs/ozone/TestDirectoryDeletingServiceWithFSO.java b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/fs/ozone/TestDirectoryDeletingServiceWithFSO.java
index 0abfb133654..8d161dedeb3 100644
--- a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/fs/ozone/TestDirectoryDeletingServiceWithFSO.java
+++ b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/fs/ozone/TestDirectoryDeletingServiceWithFSO.java
@@ -18,7 +18,11 @@
 
 package org.apache.hadoop.fs.ozone;
 
+import java.util.List;
+import java.util.Random;
 import java.util.concurrent.CompletableFuture;
+
+import org.apache.commons.lang3.RandomStringUtils;
 import org.apache.hadoop.fs.CommonConfigurationKeysPublic;
 import org.apache.hadoop.fs.FSDataOutputStream;
 import org.apache.hadoop.fs.FileStatus;
@@ -32,10 +36,16 @@
 import org.apache.hadoop.ozone.MiniOzoneCluster;
 import org.apache.hadoop.ozone.OzoneConsts;
 import org.apache.hadoop.ozone.TestDataUtil;
+import org.apache.hadoop.ozone.client.BucketArgs;
+import org.apache.hadoop.ozone.client.ObjectStore;
 import org.apache.hadoop.ozone.client.OzoneBucket;
 import org.apache.hadoop.ozone.client.OzoneClient;
 import org.apache.hadoop.ozone.client.OzoneVolume;
+import org.apache.hadoop.ozone.client.io.OzoneOutputStream;
 import org.apache.hadoop.ozone.om.OMMetadataManager;
+import org.apache.hadoop.ozone.om.OmSnapshotManager;
+import org.apache.hadoop.ozone.om.OzoneManager;
+import org.apache.hadoop.ozone.om.helpers.OmKeyArgs;
 import org.apache.hadoop.ozone.om.helpers.OzoneFileStatus;
 import org.apache.hadoop.ozone.om.helpers.SnapshotInfo;
 import org.apache.hadoop.ozone.om.ratis.OzoneManagerDoubleBuffer;
@@ -48,12 +58,16 @@
 import org.apache.hadoop.ozone.om.helpers.OmDirectoryInfo;
 import org.apache.hadoop.ozone.om.helpers.OmKeyInfo;
 import org.apache.hadoop.ozone.om.helpers.RepeatedOmKeyInfo;
+import org.apache.hadoop.ozone.protocol.proto.OzoneManagerProtocolProtos;
 import org.apache.ozone.test.GenericTestUtils;
 import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.AfterAll;
+import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.BeforeAll;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.Timeout;
+import org.mockito.ArgumentMatchers;
+import org.mockito.Mockito;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -64,6 +78,8 @@
 import java.util.concurrent.atomic.AtomicLong;
 import java.util.function.LongSupplier;
 
+import static java.nio.charset.StandardCharsets.UTF_8;
+import static org.apache.hadoop.ozone.OzoneConfigKeys.OZONE_SNAPSHOT_DELETING_SERVICE_INTERVAL;
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.junit.jupiter.api.Assertions.assertDoesNotThrow;
 import static org.junit.jupiter.api.Assertions.assertEquals;
@@ -72,6 +88,12 @@
 import static org.apache.hadoop.ozone.OzoneConfigKeys.OZONE_ACL_ENABLED;
 import static org.apache.hadoop.ozone.OzoneConfigKeys.OZONE_BLOCK_DELETING_SERVICE_INTERVAL;
 import static org.apache.hadoop.ozone.OzoneConfigKeys.OZONE_FS_ITERATE_BATCH_SIZE;
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.ArgumentMatchers.anyInt;
+import static org.mockito.ArgumentMatchers.anyList;
+import static org.mockito.ArgumentMatchers.anyLong;
+import static org.mockito.ArgumentMatchers.eq;
+import static org.mockito.Mockito.when;
 
 /**
  * Directory deletion service test cases.
@@ -97,6 +119,7 @@ public static void init() throws Exception {
     conf.setInt(OMConfigKeys.OZONE_PATH_DELETING_LIMIT_PER_TASK, 5);
     conf.setTimeDuration(OZONE_BLOCK_DELETING_SERVICE_INTERVAL, 100,
         TimeUnit.MILLISECONDS);
+    conf.setTimeDuration(OZONE_SNAPSHOT_DELETING_SERVICE_INTERVAL, 1000, TimeUnit.MILLISECONDS);
     conf.setBoolean(OMConfigKeys.OZONE_OM_RATIS_ENABLE_KEY, omRatisEnabled);
     conf.setBoolean(OZONE_ACL_ENABLED, true);
     cluster = MiniOzoneCluster.newBuilder(conf)
@@ -460,6 +483,123 @@ public void testDeleteFilesAndSubFiles() throws Exception {
     assertEquals(prevDeletedKeyCount + 5, currentDeletedKeyCount);
   }
 
+  private void createFileKey(OzoneBucket bucket, String key)
+      throws Exception {
+    byte[] value = RandomStringUtils.randomAscii(10240).getBytes(UTF_8);
+    OzoneOutputStream fileKey = bucket.createKey(key, value.length);
+    fileKey.write(value);
+    fileKey.close();
+  }
+
+  /*
+   * Create key d1/k1
+   * Create snap1
+   * Rename dir1 to dir2
+   * Delete dir2
+   * Wait for KeyDeletingService to start processing deleted key k2
+   * Create snap2 by making the KeyDeletingService thread wait till snap2 is flushed
+   * Resume KeyDeletingService thread.
+   * Read d1 from snap1.
+   */
+  @Test
+  public void testAOSKeyDeletingWithSnapshotCreateParallelExecution()
+      throws Exception {
+    OMMetadataManager omMetadataManager = cluster.getOzoneManager().getMetadataManager();
+    Table<String, SnapshotInfo> snapshotInfoTable = omMetadataManager.getSnapshotInfoTable();
+    Table<String, OmKeyInfo> deletedDirTable = omMetadataManager.getDeletedDirTable();
+    Table<String, String> renameTable = omMetadataManager.getSnapshotRenamedTable();
+    cluster.getOzoneManager().getKeyManager().getSnapshotDeletingService().shutdown();
+    DirectoryDeletingService dirDeletingService = cluster.getOzoneManager().getKeyManager().getDirDeletingService();
+    // Suspend KeyDeletingService
+    dirDeletingService.suspend();
+    GenericTestUtils.waitFor(() -> !dirDeletingService.isRunningOnAOS(), 1000, 10000);
+    Random random = new Random();
+    final String testVolumeName = "volume" + random.nextInt();
+    final String testBucketName = "bucket" + random.nextInt();
+    // Create Volume and Buckets
+    ObjectStore store = client.getObjectStore();
+    store.createVolume(testVolumeName);
+    OzoneVolume volume = store.getVolume(testVolumeName);
+    volume.createBucket(testBucketName,
+        BucketArgs.newBuilder().setBucketLayout(BucketLayout.FILE_SYSTEM_OPTIMIZED).build());
+    OzoneBucket bucket = volume.getBucket(testBucketName);
+
+    OzoneManager ozoneManager = Mockito.spy(cluster.getOzoneManager());
+    OmSnapshotManager omSnapshotManager = Mockito.spy(ozoneManager.getOmSnapshotManager());
+    when(ozoneManager.getOmSnapshotManager()).thenAnswer(i -> omSnapshotManager);
+    DirectoryDeletingService service = Mockito.spy(new DirectoryDeletingService(1000, TimeUnit.MILLISECONDS, 1000,
+        ozoneManager,
+        cluster.getConf()));
+    service.shutdown();
+    final int initialSnapshotCount =
+        (int) cluster.getOzoneManager().getMetadataManager().countRowsInTable(snapshotInfoTable);
+    final int initialDeletedCount = (int) omMetadataManager.countRowsInTable(deletedDirTable);
+    final int initialRenameCount = (int) omMetadataManager.countRowsInTable(renameTable);
+    String snap1 = "snap1";
+    String snap2 = "snap2";
+    createFileKey(bucket, "dir1/key1");
+    store.createSnapshot(testVolumeName, testBucketName, "snap1");
+    bucket.renameKey("dir1", "dir2");
+    OmKeyArgs omKeyArgs = new OmKeyArgs.Builder()
+        .setVolumeName(testVolumeName)
+        .setBucketName(testBucketName)
+        .setKeyName("dir2").build();
+    long objectId = store.getClientProxy().getOzoneManagerClient().getKeyInfo(omKeyArgs, false)
+        .getKeyInfo().getObjectID();
+    long volumeId = omMetadataManager.getVolumeId(testVolumeName);
+    long bucketId = omMetadataManager.getBucketId(testVolumeName, testBucketName);
+    String deletePathKey = omMetadataManager.getOzoneDeletePathKey(objectId,
+        omMetadataManager.getOzonePathKey(volumeId,
+        bucketId, bucketId, "dir2"));
+    bucket.deleteDirectory("dir2", true);
+
+
+    assertTableRowCount(deletedDirTable, initialDeletedCount + 1);
+    assertTableRowCount(renameTable, initialRenameCount + 1);
+    Mockito.doAnswer(i -> {
+      List<OzoneManagerProtocolProtos.PurgePathRequest> purgePathRequestList = i.getArgument(5);
+      for (OzoneManagerProtocolProtos.PurgePathRequest purgeRequest : purgePathRequestList) {
+        Assertions.assertNotEquals(deletePathKey, purgeRequest.getDeletedDir());
+      }
+      return i.callRealMethod();
+    }).when(service).optimizeDirDeletesAndSubmitRequest(anyLong(), anyLong(), anyLong(),
+        anyLong(), anyList(), anyList(), eq(null), anyLong(), anyInt(), Mockito.any(), any());
+
+    Mockito.doAnswer(i -> {
+      store.createSnapshot(testVolumeName, testBucketName, snap2);
+      GenericTestUtils.waitFor(() -> {
+        try {
+          SnapshotInfo snapshotInfo = store.getClientProxy().getOzoneManagerClient()
+              .getSnapshotInfo(testVolumeName, testBucketName, snap2);
+
+          return OmSnapshotManager.areSnapshotChangesFlushedToDB(cluster.getOzoneManager().getMetadataManager(),
+              snapshotInfo);
+        } catch (IOException e) {
+          throw new RuntimeException(e);
+        }
+      }, 1000, 100000);
+      GenericTestUtils.waitFor(() -> {
+        try {
+          return renameTable.get(omMetadataManager.getRenameKey(testVolumeName, testBucketName, objectId)) == null;
+        } catch (IOException e) {
+          throw new RuntimeException(e);
+        }
+      }, 1000, 10000);
+      return i.callRealMethod();
+    }).when(omSnapshotManager).getSnapshot(ArgumentMatchers.eq(testVolumeName), ArgumentMatchers.eq(testBucketName),
+        ArgumentMatchers.eq(snap1));
+    assertTableRowCount(snapshotInfoTable, initialSnapshotCount + 1);
+    service.runPeriodicalTaskNow();
+    service.runPeriodicalTaskNow();
+    assertTableRowCount(snapshotInfoTable, initialSnapshotCount + 2);
+    store.deleteSnapshot(testVolumeName, testBucketName, snap2);
+    service.runPeriodicalTaskNow();
+    store.deleteSnapshot(testVolumeName, testBucketName, snap1);
+    cluster.restartOzoneManager();
+    assertTableRowCount(cluster.getOzoneManager().getMetadataManager().getSnapshotInfoTable(), initialSnapshotCount);
+    dirDeletingService.resume();
+  }
+
   @Test
   public void testDirDeletedTableCleanUpForSnapshot() throws Exception {
     Table<String, OmKeyInfo> deletedDirTable =
diff --git a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/om/snapshot/TestSnapshotDeletingServiceIntegrationTest.java b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/om/snapshot/TestSnapshotDeletingServiceIntegrationTest.java
index d77f9bf9d8d..254de072e05 100644
--- a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/om/snapshot/TestSnapshotDeletingServiceIntegrationTest.java
+++ b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/om/snapshot/TestSnapshotDeletingServiceIntegrationTest.java
@@ -87,6 +87,7 @@
 import static org.apache.hadoop.ozone.OzoneConfigKeys.OZONE_BLOCK_DELETING_SERVICE_INTERVAL;
 import static org.apache.hadoop.ozone.OzoneConfigKeys.OZONE_SNAPSHOT_DELETING_SERVICE_INTERVAL;
 import static org.apache.hadoop.ozone.OzoneConfigKeys.OZONE_SNAPSHOT_DELETING_SERVICE_TIMEOUT;
+import static org.apache.hadoop.ozone.om.OMConfigKeys.OZONE_SNAPSHOT_DEEP_CLEANING_ENABLED;
 import static org.junit.jupiter.api.Assertions.assertDoesNotThrow;
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.mockito.ArgumentMatchers.anyBoolean;
@@ -130,6 +131,7 @@ public void setup() throws Exception {
         1, StorageUnit.MB);
     conf.setTimeDuration(OZONE_SNAPSHOT_DELETING_SERVICE_INTERVAL,
         500, TimeUnit.MILLISECONDS);
+    conf.setBoolean(OZONE_SNAPSHOT_DEEP_CLEANING_ENABLED, true);
     conf.setTimeDuration(OZONE_SNAPSHOT_DELETING_SERVICE_TIMEOUT,
         10000, TimeUnit.MILLISECONDS);
     conf.setInt(OMConfigKeys.OZONE_DIR_DELETING_SERVICE_INTERVAL, 500);
@@ -447,7 +449,7 @@ public void testSnapshotWithFSO() throws Exception {
       while (iterator.hasNext()) {
         Table.KeyValue<String, RepeatedOmKeyInfo> next = iterator.next();
         String activeDBDeletedKey = next.getKey();
-        if (activeDBDeletedKey.matches(".*/key1.*")) {
+        if (activeDBDeletedKey.matches(".*/key1/.*")) {
           RepeatedOmKeyInfo activeDBDeleted = next.getValue();
           OMMetadataManager metadataManager =
               cluster.getOzoneManager().getMetadataManager();
@@ -508,7 +510,7 @@ private KeyDeletingService getMockedKeyDeletingService(AtomicBoolean keyDeletion
     when(ozoneManager.getKeyManager()).thenReturn(keyManager);
     KeyDeletingService keyDeletingService = Mockito.spy(new KeyDeletingService(ozoneManager,
         ozoneManager.getScmClient().getBlockClient(), keyManager, 10000,
-        100000, cluster.getConf()));
+        100000, cluster.getConf(), false));
     keyDeletingService.shutdown();
     GenericTestUtils.waitFor(() -> keyDeletingService.getThreadCount() == 0, 1000,
         100000);
diff --git a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/om/snapshot/TestSnapshotDirectoryCleaningService.java b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/om/snapshot/TestSnapshotDirectoryCleaningService.java
index 03df331087b..3be0725a009 100644
--- a/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/om/snapshot/TestSnapshotDirectoryCleaningService.java
+++ b/hadoop-ozone/integration-test/src/test/java/org/apache/hadoop/ozone/om/snapshot/TestSnapshotDirectoryCleaningService.java
@@ -57,6 +57,7 @@
 import static org.apache.hadoop.ozone.OzoneConfigKeys.OZONE_ACL_ENABLED;
 import static org.apache.hadoop.ozone.OzoneConfigKeys.OZONE_BLOCK_DELETING_SERVICE_INTERVAL;
 import static org.apache.hadoop.ozone.OzoneConfigKeys.OZONE_FS_ITERATE_BATCH_SIZE;
+import static org.apache.hadoop.ozone.om.OMConfigKeys.OZONE_SNAPSHOT_DEEP_CLEANING_ENABLED;
 import static org.junit.jupiter.api.Assertions.assertDoesNotThrow;
 import static org.junit.jupiter.api.Assertions.assertEquals;
 
@@ -79,6 +80,7 @@ public class TestSnapshotDirectoryCleaningService {
   public static void init() throws Exception {
     OzoneConfiguration conf = new OzoneConfiguration();
     conf.setInt(OMConfigKeys.OZONE_SNAPSHOT_DIRECTORY_SERVICE_INTERVAL, 2500);
+    conf.setBoolean(OZONE_SNAPSHOT_DEEP_CLEANING_ENABLED, true);
     conf.setTimeDuration(OZONE_BLOCK_DELETING_SERVICE_INTERVAL, 2500,
         TimeUnit.MILLISECONDS);
     conf.setBoolean(OZONE_ACL_ENABLED, true);
diff --git a/hadoop-ozone/interface-client/src/main/proto/OmClientProtocol.proto b/hadoop-ozone/interface-client/src/main/proto/OmClientProtocol.proto
index 126adbdc51e..f71dc44fec5 100644
--- a/hadoop-ozone/interface-client/src/main/proto/OmClientProtocol.proto
+++ b/hadoop-ozone/interface-client/src/main/proto/OmClientProtocol.proto
@@ -150,7 +150,6 @@ enum Type {
   RenameSnapshot = 131;
   ListOpenFiles = 132;
   QuotaRepair = 133;
-  GetServerDefaults = 134;
   GetQuotaRepairStatus = 135;
   StartQuotaRepair = 136;
   SnapshotMoveTableKeys = 137;
@@ -293,7 +292,6 @@ message OMRequest {
   optional RenameSnapshotRequest            RenameSnapshotRequest          = 129;
   optional ListOpenFilesRequest             ListOpenFilesRequest           = 130;
   optional QuotaRepairRequest               QuotaRepairRequest             = 131;
-  optional ServerDefaultsRequest            ServerDefaultsRequest          = 132;
   optional GetQuotaRepairStatusRequest      GetQuotaRepairStatusRequest    = 133;
   optional StartQuotaRepairRequest          StartQuotaRepairRequest        = 134;
   optional SnapshotMoveTableKeysRequest     SnapshotMoveTableKeysRequest   = 135;
@@ -424,7 +422,6 @@ message OMResponse {
   optional RenameSnapshotResponse            RenameSnapshotResponse        = 132;
   optional ListOpenFilesResponse             ListOpenFilesResponse         = 133;
   optional QuotaRepairResponse            QuotaRepairResponse        = 134;
-  optional ServerDefaultsResponse            ServerDefaultsResponse        = 135;
   optional GetQuotaRepairStatusResponse      GetQuotaRepairStatusResponse   = 136;
   optional StartQuotaRepairResponse          StartQuotaRepairResponse       = 137;
 }
@@ -1381,6 +1378,8 @@ message PurgeKeysRequest {
     // if set, will purge keys in a snapshot DB instead of active DB
     optional string snapshotTableKey = 2;
     repeated SnapshotMoveKeyInfos keysToUpdate = 3;
+    // previous snapshotID can also be null & this field would be absent in older requests.
+    optional NullableUUID expectedPreviousSnapshotID = 4;
 }
 
 message PurgeKeysResponse {
@@ -1403,6 +1402,12 @@ message PurgePathsResponse {
 message PurgeDirectoriesRequest {
   repeated PurgePathRequest deletedPath = 1;
   optional string snapshotTableKey = 2;
+  // previous snapshotID can also be null & this field would be absent in older requests.
+  optional NullableUUID expectedPreviousSnapshotID = 3;
+}
+
+message NullableUUID {
+  optional hadoop.hdds.UUID uuid = 1;
 }
 
 message PurgeDirectoriesResponse {
@@ -1632,6 +1637,7 @@ message ServiceInfo {
     repeated ServicePort servicePorts = 3;
     optional OMRoleInfo omRole = 4;
     optional int32 OMVersion = 5 [default = 0];
+    optional FsServerDefaultsProto serverDefaults = 6;
 }
 
 message MultipartInfoInitiateRequest {
@@ -2231,17 +2237,10 @@ message BucketQuotaCount {
 message QuotaRepairResponse {
 }
 
-message ServerDefaultsRequest {
-}
-
 message FsServerDefaultsProto {
   optional string keyProviderUri = 1;
 }
 
-message ServerDefaultsResponse {
-  required FsServerDefaultsProto serverDefaults = 1;
-}
-
 message GetQuotaRepairStatusRequest {
 }
 message GetQuotaRepairStatusResponse {
diff --git a/hadoop-ozone/interface-storage/src/main/java/org/apache/hadoop/ozone/om/OMMetadataManager.java b/hadoop-ozone/interface-storage/src/main/java/org/apache/hadoop/ozone/om/OMMetadataManager.java
index 7ec0e8349da..ae57c18354d 100644
--- a/hadoop-ozone/interface-storage/src/main/java/org/apache/hadoop/ozone/om/OMMetadataManager.java
+++ b/hadoop-ozone/interface-storage/src/main/java/org/apache/hadoop/ozone/om/OMMetadataManager.java
@@ -647,7 +647,7 @@ String getMultipartKey(long volumeId, long bucketId,
   long getBucketId(String volume, String bucket) throws IOException;
 
   /**
-   * Returns List&lt;{@link BlockGroup}&gt; for a key in the deletedTable.
+   * Returns {@code List<BlockGroup>} for a key in the deletedTable.
    * @param deletedKey - key to be purged from the deletedTable
    * @return {@link BlockGroup}
    */
diff --git a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/KeyManager.java b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/KeyManager.java
index 068ba9aa4ae..a0f3053d731 100644
--- a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/KeyManager.java
+++ b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/KeyManager.java
@@ -49,7 +49,6 @@ public interface KeyManager extends OzoneManagerFS, IOzoneAcl {
    * Start key manager.
    *
    * @param configuration
-   * @throws IOException
    */
   void start(OzoneConfiguration configuration);
 
diff --git a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/KeyManagerImpl.java b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/KeyManagerImpl.java
index e3f56f2deaf..9bdbc70fb99 100644
--- a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/KeyManagerImpl.java
+++ b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/KeyManagerImpl.java
@@ -143,6 +143,8 @@
 import static org.apache.hadoop.ozone.om.OMConfigKeys.OZONE_OM_OPEN_KEY_CLEANUP_SERVICE_INTERVAL_DEFAULT;
 import static org.apache.hadoop.ozone.om.OMConfigKeys.OZONE_OM_OPEN_KEY_CLEANUP_SERVICE_TIMEOUT;
 import static org.apache.hadoop.ozone.om.OMConfigKeys.OZONE_OM_OPEN_KEY_CLEANUP_SERVICE_TIMEOUT_DEFAULT;
+import static org.apache.hadoop.ozone.om.OMConfigKeys.OZONE_SNAPSHOT_DEEP_CLEANING_ENABLED;
+import static org.apache.hadoop.ozone.om.OMConfigKeys.OZONE_SNAPSHOT_DEEP_CLEANING_ENABLED_DEFAULT;
 import static org.apache.hadoop.ozone.om.OMConfigKeys.OZONE_SNAPSHOT_DIRECTORY_SERVICE_INTERVAL;
 import static org.apache.hadoop.ozone.om.OMConfigKeys.OZONE_SNAPSHOT_DIRECTORY_SERVICE_INTERVAL_DEFAULT;
 import static org.apache.hadoop.ozone.om.OMConfigKeys.OZONE_SNAPSHOT_DIRECTORY_SERVICE_TIMEOUT;
@@ -230,6 +232,8 @@ public KeyManagerImpl(OzoneManager om, ScmClient scmClient,
 
   @Override
   public void start(OzoneConfiguration configuration) {
+    boolean isSnapshotDeepCleaningEnabled = configuration.getBoolean(OZONE_SNAPSHOT_DEEP_CLEANING_ENABLED,
+        OZONE_SNAPSHOT_DEEP_CLEANING_ENABLED_DEFAULT);
     if (keyDeletingService == null) {
       long blockDeleteInterval = configuration.getTimeDuration(
           OZONE_BLOCK_DELETING_SERVICE_INTERVAL,
@@ -241,7 +245,7 @@ public void start(OzoneConfiguration configuration) {
           TimeUnit.MILLISECONDS);
       keyDeletingService = new KeyDeletingService(ozoneManager,
           scmClient.getBlockClient(), this, blockDeleteInterval,
-          serviceTimeout, configuration);
+          serviceTimeout, configuration, isSnapshotDeepCleaningEnabled);
       keyDeletingService.start();
     }
 
@@ -314,7 +318,7 @@ public void start(OzoneConfiguration configuration) {
       }
     }
 
-    if (snapshotDirectoryCleaningService == null &&
+    if (isSnapshotDeepCleaningEnabled && snapshotDirectoryCleaningService == null &&
         ozoneManager.isFilesystemSnapshotEnabled()) {
       long dirDeleteInterval = configuration.getTimeDuration(
           OZONE_SNAPSHOT_DIRECTORY_SERVICE_INTERVAL,
diff --git a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/ListIterator.java b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/ListIterator.java
index 6091cc6b0c0..36edda8941d 100644
--- a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/ListIterator.java
+++ b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/ListIterator.java
@@ -43,7 +43,7 @@
 
 /**
  * Common class to do listing of resources after merging
- * rocksDB table cache &amp; actual table.
+ * rocksDB table cache and actual table.
  */
 public class ListIterator {
 
diff --git a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/OMMultiTenantManager.java b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/OMMultiTenantManager.java
index 059ebbc22c6..2c66dd5035e 100644
--- a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/OMMultiTenantManager.java
+++ b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/OMMultiTenantManager.java
@@ -129,7 +129,7 @@ boolean isTenantAdmin(UserGroupInformation callerUgi, String tenantId,
       boolean delegated);
 
   /**
-   * List all the user &amp; accessIDs of all users that belong to this Tenant.
+   * List all the user and accessIDs of all users that belong to this Tenant.
    * Note this read is unprotected. See OzoneManager#listUserInTenant
    * @param tenantID
    * @return List of users
diff --git a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/OmMetadataManagerImpl.java b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/OmMetadataManagerImpl.java
index af94ac4a387..4873a7db491 100644
--- a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/OmMetadataManagerImpl.java
+++ b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/OmMetadataManagerImpl.java
@@ -34,7 +34,6 @@
 import java.util.Set;
 import java.util.TreeMap;
 import java.util.TreeSet;
-import java.util.UUID;
 import java.util.concurrent.TimeUnit;
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
@@ -1625,11 +1624,22 @@ public PendingKeysDeletion getPendingDeletionKeys(final int keyCount,
           String[] keySplit = kv.getKey().split(OM_KEY_PREFIX);
           String bucketKey = getBucketKey(keySplit[1], keySplit[2]);
           OmBucketInfo bucketInfo = getBucketTable().get(bucketKey);
-
+          // If Bucket deleted bucketInfo would be null, thus making previous snapshot also null.
+          SnapshotInfo previousSnapshotInfo = bucketInfo == null ? null :
+              SnapshotUtils.getLatestSnapshotInfo(bucketInfo.getVolumeName(),
+              bucketInfo.getBucketName(), ozoneManager, snapshotChainManager);
+          // previous snapshot is not active or it has not been flushed to disk then don't process the key in this
+          // iteration.
+          if (previousSnapshotInfo != null &&
+              (previousSnapshotInfo.getSnapshotStatus() != SnapshotInfo.SnapshotStatus.SNAPSHOT_ACTIVE ||
+              !OmSnapshotManager.areSnapshotChangesFlushedToDB(ozoneManager.getMetadataManager(),
+                  previousSnapshotInfo))) {
+            continue;
+          }
           // Get the latest snapshot in snapshot path.
-          try (ReferenceCounted<OmSnapshot>
-              rcLatestSnapshot = getLatestActiveSnapshot(
-                  keySplit[1], keySplit[2], omSnapshotManager)) {
+          try (ReferenceCounted<OmSnapshot> rcLatestSnapshot = previousSnapshotInfo == null ? null :
+              omSnapshotManager.getSnapshot(previousSnapshotInfo.getVolumeName(),
+                  previousSnapshotInfo.getBucketName(), previousSnapshotInfo.getName())) {
 
             // Multiple keys with the same path can be queued in one DB entry
             RepeatedOmKeyInfo infoList = kv.getValue();
@@ -1706,17 +1716,24 @@ public PendingKeysDeletion getPendingDeletionKeys(final int keyCount,
 
             List<OmKeyInfo> notReclaimableKeyInfoList =
                 notReclaimableKeyInfo.getOmKeyInfoList();
+            // If Bucket deleted bucketInfo would be null, thus making previous snapshot also null.
+            SnapshotInfo newPreviousSnapshotInfo = bucketInfo == null ? null :
+                SnapshotUtils.getLatestSnapshotInfo(bucketInfo.getVolumeName(),
+                bucketInfo.getBucketName(), ozoneManager, snapshotChainManager);
+            // Check if the previous snapshot in the chain hasn't changed.
+            if (Objects.equals(Optional.ofNullable(newPreviousSnapshotInfo).map(SnapshotInfo::getSnapshotId),
+                Optional.ofNullable(previousSnapshotInfo).map(SnapshotInfo::getSnapshotId))) {
+              // If all the versions are not reclaimable, then do nothing.
+              if (notReclaimableKeyInfoList.size() > 0 &&
+                  notReclaimableKeyInfoList.size() !=
+                      infoList.getOmKeyInfoList().size()) {
+                keysToModify.put(kv.getKey(), notReclaimableKeyInfo);
+              }
 
-            // If all the versions are not reclaimable, then do nothing.
-            if (notReclaimableKeyInfoList.size() > 0 &&
-                notReclaimableKeyInfoList.size() !=
-                    infoList.getOmKeyInfoList().size()) {
-              keysToModify.put(kv.getKey(), notReclaimableKeyInfo);
-            }
-
-            if (notReclaimableKeyInfoList.size() !=
-                infoList.getOmKeyInfoList().size()) {
-              keyBlocksList.addAll(blockGroupList);
+              if (notReclaimableKeyInfoList.size() !=
+                  infoList.getOmKeyInfoList().size()) {
+                keyBlocksList.addAll(blockGroupList);
+              }
             }
           }
         }
@@ -1733,55 +1750,6 @@ private boolean versionExistsInPreviousSnapshot(OmKeyInfo omKeyInfo,
         delOmKeyInfo != null;
   }
 
-  /**
-   * Get the latest OmSnapshot for a snapshot path.
-   */
-  public ReferenceCounted<OmSnapshot> getLatestActiveSnapshot(
-          String volumeName, String bucketName,
-          OmSnapshotManager snapshotManager)
-      throws IOException {
-
-    String snapshotPath = volumeName + OM_KEY_PREFIX + bucketName;
-    Optional<UUID> latestPathSnapshot = Optional.ofNullable(
-        snapshotChainManager.getLatestPathSnapshotId(snapshotPath));
-
-    Optional<SnapshotInfo> snapshotInfo = Optional.empty();
-
-    while (latestPathSnapshot.isPresent()) {
-      Optional<String> snapTableKey = latestPathSnapshot
-          .map(uuid -> snapshotChainManager.getTableKey(uuid));
-
-      snapshotInfo = snapTableKey.isPresent() ?
-          Optional.ofNullable(getSnapshotInfoTable().get(snapTableKey.get())) :
-          Optional.empty();
-
-      if (snapshotInfo.isPresent() && snapshotInfo.get().getSnapshotStatus() ==
-          SnapshotInfo.SnapshotStatus.SNAPSHOT_ACTIVE) {
-        break;
-      }
-
-      // Update latestPathSnapshot if current snapshot is deleted.
-      if (snapshotChainManager.hasPreviousPathSnapshot(snapshotPath,
-          latestPathSnapshot.get())) {
-        latestPathSnapshot = Optional.ofNullable(snapshotChainManager
-            .previousPathSnapshot(snapshotPath, latestPathSnapshot.get()));
-      } else {
-        latestPathSnapshot = Optional.empty();
-      }
-    }
-
-    Optional<ReferenceCounted<OmSnapshot>> rcOmSnapshot =
-        snapshotInfo.isPresent() ?
-            Optional.ofNullable(
-                snapshotManager.getSnapshot(volumeName,
-                    bucketName,
-                    snapshotInfo.get().getName())
-            ) :
-            Optional.empty();
-
-    return rcOmSnapshot.orElse(null);
-  }
-
   /**
    * Decide whether the open key is a multipart upload related key.
    * @param openKeyInfo open key related to multipart upload
diff --git a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/OzoneManager.java b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/OzoneManager.java
index 93e84768ec5..c4322309173 100644
--- a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/OzoneManager.java
+++ b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/OzoneManager.java
@@ -437,7 +437,6 @@ public final class OzoneManager extends ServiceRuntimeInfoImpl
   private List<RatisDropwizardExports.MetricReporter> ratisReporterList = null;
 
   private KeyProviderCryptoExtension kmsProvider;
-  private OzoneFsServerDefaults serverDefaults;
   private final OMLayoutVersionManager versionManager;
 
   private final ReplicationConfigValidator replicationConfigValidator;
@@ -655,14 +654,6 @@ private OzoneManager(OzoneConfiguration conf, StartupOption startupOption)
       kmsProvider = null;
       LOG.error("Fail to create Key Provider");
     }
-    Configuration hadoopConfig =
-        LegacyHadoopConfigurationSource.asHadoopConfiguration(configuration);
-    URI keyProviderUri = KMSUtil.getKeyProviderUri(
-            hadoopConfig,
-            CommonConfigurationKeysPublic.HADOOP_SECURITY_KEY_PROVIDER_PATH);
-    String keyProviderUriStr =
-        (keyProviderUri != null) ? keyProviderUri.toString() : null;
-    serverDefaults = new OzoneFsServerDefaults(keyProviderUriStr);
     if (secConfig.isSecurityEnabled()) {
       omComponent = OM_DAEMON + "-" + omId;
       HddsProtos.OzoneManagerDetailsProto omInfo =
@@ -791,8 +782,9 @@ private void setInstanceVariablesFromConf() {
    *
    * @param conf OzoneConfiguration
    * @return OM instance
-   * @throws IOException on Failure
-   * @throws AuthenticationException in case OM instance creation fails.
+   * @throws IOException AuthenticationException in case OM instance
+   *                      creation fails,
+   * @throws AuthenticationException
    */
   public static OzoneManager createOm(OzoneConfiguration conf)
       throws IOException, AuthenticationException {
@@ -3139,6 +3131,15 @@ public List<ServiceInfo> getServiceList() throws IOException {
             .setType(ServicePort.Type.RPC)
             .setValue(omRpcAddress.getPort())
             .build());
+    Configuration hadoopConfig =
+        LegacyHadoopConfigurationSource.asHadoopConfiguration(configuration);
+    URI keyProviderUri = KMSUtil.getKeyProviderUri(
+        hadoopConfig,
+        CommonConfigurationKeysPublic.HADOOP_SECURITY_KEY_PROVIDER_PATH);
+    String keyProviderUriStr =
+        (keyProviderUri != null) ? keyProviderUri.toString() : null;
+    omServiceInfoBuilder.setServerDefaults(
+        new OzoneFsServerDefaults(keyProviderUriStr));
     if (httpServer != null
         && httpServer.getHttpAddress() != null) {
       omServiceInfoBuilder.addServicePort(ServicePort.newBuilder()
@@ -4748,11 +4749,6 @@ public boolean setSafeMode(SafeModeAction action, boolean isChecked)
     }
   }
 
-  @Override
-  public OzoneFsServerDefaults getServerDefaults() {
-    return serverDefaults;
-  }
-
   @Override
   public String getQuotaRepairStatus() throws IOException {
     checkAdminUserPrivilege("quota repair status");
diff --git a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/ratis/OzoneManagerDoubleBuffer.java b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/ratis/OzoneManagerDoubleBuffer.java
index 8e4cc9fbf4d..753088183b5 100644
--- a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/ratis/OzoneManagerDoubleBuffer.java
+++ b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/ratis/OzoneManagerDoubleBuffer.java
@@ -217,8 +217,8 @@ private OzoneManagerDoubleBuffer(Builder b) {
   }
 
   public OzoneManagerDoubleBuffer start() {
-    daemon.start();
     isRunning.set(true);
+    daemon.start();
     return this;
   }
 
diff --git a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/OMClientRequest.java b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/OMClientRequest.java
index 25a204ded27..17f9663ae1f 100644
--- a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/OMClientRequest.java
+++ b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/OMClientRequest.java
@@ -438,7 +438,6 @@ public InetAddress getRemoteAddress() throws IOException {
    * Return String created from OMRequest userInfo. If userInfo is not
    * set, returns null.
    * @return String
-   * @throws IOException
    */
   @VisibleForTesting
   public String getHostName() {
diff --git a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/key/OMDirectoriesPurgeRequestWithFSO.java b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/key/OMDirectoriesPurgeRequestWithFSO.java
index dd08ff17165..29ed5d9fc7b 100644
--- a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/key/OMDirectoriesPurgeRequestWithFSO.java
+++ b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/key/OMDirectoriesPurgeRequestWithFSO.java
@@ -24,15 +24,17 @@
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
+import java.util.UUID;
+
 import org.apache.commons.lang3.tuple.Pair;
 import org.apache.hadoop.hdds.utils.TransactionInfo;
 import org.apache.hadoop.hdds.utils.db.cache.CacheKey;
 import org.apache.hadoop.hdds.utils.db.cache.CacheValue;
 import org.apache.hadoop.ozone.OzoneConsts;
 import org.apache.hadoop.ozone.om.OMMetrics;
+import org.apache.hadoop.ozone.om.OmMetadataManagerImpl;
 import org.apache.hadoop.ozone.om.snapshot.SnapshotUtils;
 import org.apache.ratis.server.protocol.TermIndex;
-import org.apache.hadoop.ozone.om.OMMetadataManager;
 import org.apache.hadoop.ozone.om.OzoneManager;
 import org.apache.hadoop.ozone.om.helpers.BucketLayout;
 import org.apache.hadoop.ozone.om.helpers.OmBucketInfo;
@@ -45,8 +47,10 @@
 import org.apache.hadoop.ozone.protocol.proto.OzoneManagerProtocolProtos.OMRequest;
 import org.apache.hadoop.ozone.protocol.proto.OzoneManagerProtocolProtos.OMResponse;
 
+import static org.apache.hadoop.hdds.HddsUtils.fromProtobuf;
 import static org.apache.hadoop.ozone.OzoneConsts.DELETED_HSYNC_KEY;
 import static org.apache.hadoop.ozone.om.lock.OzoneManagerLock.Resource.BUCKET_LOCK;
+import static org.apache.hadoop.ozone.om.snapshot.SnapshotUtils.validatePreviousSnapshotId;
 
 /**
  * Handles purging of keys from OM DB.
@@ -66,19 +70,34 @@ public OMClientResponse validateAndUpdateCache(OzoneManager ozoneManager, TermIn
 
     List<OzoneManagerProtocolProtos.PurgePathRequest> purgeRequests =
             purgeDirsRequest.getDeletedPathList();
-
-    SnapshotInfo fromSnapshotInfo = null;
     Set<Pair<String, String>> lockSet = new HashSet<>();
     Map<Pair<String, String>, OmBucketInfo> volBucketInfoMap = new HashMap<>();
-    OMMetadataManager omMetadataManager = ozoneManager.getMetadataManager();
+    OmMetadataManagerImpl omMetadataManager = (OmMetadataManagerImpl) ozoneManager.getMetadataManager();
     Map<String, OmKeyInfo> openKeyInfoMap = new HashMap<>();
-
     OMMetrics omMetrics = ozoneManager.getMetrics();
+    OMResponse.Builder omResponse = OmResponseUtil.getOMResponseBuilder(
+        getOmRequest());
+    final SnapshotInfo fromSnapshotInfo;
     try {
-      if (fromSnapshot != null) {
-        fromSnapshotInfo = SnapshotUtils.getSnapshotInfo(ozoneManager, fromSnapshot);
+      fromSnapshotInfo = fromSnapshot != null ? SnapshotUtils.getSnapshotInfo(ozoneManager,
+          fromSnapshot) : null;
+      // Checking if this request is an old request or new one.
+      if (purgeDirsRequest.hasExpectedPreviousSnapshotID()) {
+        // Validating previous snapshot since while purging deletes, a snapshot create request could make this purge
+        // directory request invalid on AOS since the deletedDirectory would be in the newly created snapshot. Adding
+        // subdirectories could lead to not being able to reclaim sub-files and subdirectories since the
+        // file/directory would be present in the newly created snapshot.
+        // Validating previous snapshot can ensure the chain hasn't changed.
+        UUID expectedPreviousSnapshotId = purgeDirsRequest.getExpectedPreviousSnapshotID().hasUuid()
+            ? fromProtobuf(purgeDirsRequest.getExpectedPreviousSnapshotID().getUuid()) : null;
+        validatePreviousSnapshotId(fromSnapshotInfo, omMetadataManager.getSnapshotChainManager(),
+            expectedPreviousSnapshotId);
       }
-
+    } catch (IOException e) {
+      LOG.error("Error occurred while performing OMDirectoriesPurge. ", e);
+      return new OMDirectoriesPurgeResponseWithFSO(createErrorOMResponse(omResponse, e));
+    }
+    try {
       for (OzoneManagerProtocolProtos.PurgePathRequest path : purgeRequests) {
         for (OzoneManagerProtocolProtos.KeyInfo key :
             path.getMarkDeletedSubDirsList()) {
@@ -170,12 +189,8 @@ public OMClientResponse validateAndUpdateCache(OzoneManager ozoneManager, TermIn
       }
     }
 
-    OMResponse.Builder omResponse = OmResponseUtil.getOMResponseBuilder(
-        getOmRequest());
-    OMClientResponse omClientResponse = new OMDirectoriesPurgeResponseWithFSO(
+    return new OMDirectoriesPurgeResponseWithFSO(
         omResponse.build(), purgeRequests, ozoneManager.isRatisEnabled(),
             getBucketLayout(), volBucketInfoMap, fromSnapshotInfo, openKeyInfoMap);
-
-    return omClientResponse;
   }
 }
diff --git a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/key/OMKeyPurgeRequest.java b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/key/OMKeyPurgeRequest.java
index 14c80bb7a93..a5e8cb14525 100644
--- a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/key/OMKeyPurgeRequest.java
+++ b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/key/OMKeyPurgeRequest.java
@@ -25,6 +25,7 @@
 import org.apache.hadoop.hdds.utils.db.cache.CacheKey;
 import org.apache.hadoop.hdds.utils.db.cache.CacheValue;
 import org.apache.hadoop.ozone.om.OmMetadataManagerImpl;
+import org.apache.hadoop.ozone.om.exceptions.OMException;
 import org.apache.hadoop.ozone.om.snapshot.SnapshotUtils;
 import org.apache.ratis.server.protocol.TermIndex;
 import org.apache.hadoop.ozone.om.OzoneManager;
@@ -42,6 +43,10 @@
 import org.slf4j.LoggerFactory;
 
 import java.util.List;
+import java.util.UUID;
+
+import static org.apache.hadoop.hdds.HddsUtils.fromProtobuf;
+import static org.apache.hadoop.ozone.om.snapshot.SnapshotUtils.validatePreviousSnapshotId;
 
 /**
  * Handles purging of keys from OM DB.
@@ -58,30 +63,44 @@ public OMKeyPurgeRequest(OMRequest omRequest) {
   @Override
   public OMClientResponse validateAndUpdateCache(OzoneManager ozoneManager, TermIndex termIndex) {
     PurgeKeysRequest purgeKeysRequest = getOmRequest().getPurgeKeysRequest();
-    List<DeletedKeys> bucketDeletedKeysList = purgeKeysRequest
-        .getDeletedKeysList();
-    List<SnapshotMoveKeyInfos> keysToUpdateList = purgeKeysRequest
-        .getKeysToUpdateList();
-    String fromSnapshot = purgeKeysRequest.hasSnapshotTableKey() ?
-        purgeKeysRequest.getSnapshotTableKey() : null;
-    List<String> keysToBePurgedList = new ArrayList<>();
+    List<DeletedKeys> bucketDeletedKeysList = purgeKeysRequest.getDeletedKeysList();
+    List<SnapshotMoveKeyInfos> keysToUpdateList = purgeKeysRequest.getKeysToUpdateList();
+    String fromSnapshot = purgeKeysRequest.hasSnapshotTableKey() ? purgeKeysRequest.getSnapshotTableKey() : null;
     OmMetadataManagerImpl omMetadataManager = (OmMetadataManagerImpl) ozoneManager.getMetadataManager();
 
     OMResponse.Builder omResponse = OmResponseUtil.getOMResponseBuilder(
         getOmRequest());
-    OMClientResponse omClientResponse = null;
 
-    for (DeletedKeys bucketWithDeleteKeys : bucketDeletedKeysList) {
-      for (String deletedKey : bucketWithDeleteKeys.getKeysList()) {
-        keysToBePurgedList.add(deletedKey);
+
+    final SnapshotInfo fromSnapshotInfo;
+    try {
+      fromSnapshotInfo = fromSnapshot != null ? SnapshotUtils.getSnapshotInfo(ozoneManager,
+          fromSnapshot) : null;
+      // Checking if this request is an old request or new one.
+      if (purgeKeysRequest.hasExpectedPreviousSnapshotID()) {
+        // Validating previous snapshot since while purging deletes, a snapshot create request could make this purge
+        // key request invalid on AOS since the deletedKey would be in the newly created snapshot. This would add an
+        // redundant tombstone entry in the deletedTable. It is better to skip the transaction.
+        UUID expectedPreviousSnapshotId = purgeKeysRequest.getExpectedPreviousSnapshotID().hasUuid()
+            ? fromProtobuf(purgeKeysRequest.getExpectedPreviousSnapshotID().getUuid()) : null;
+        validatePreviousSnapshotId(fromSnapshotInfo, omMetadataManager.getSnapshotChainManager(),
+            expectedPreviousSnapshotId);
       }
+    } catch (IOException e) {
+      LOG.error("Error occurred while performing OmKeyPurge. ", e);
+      return new OMKeyPurgeResponse(createErrorOMResponse(omResponse, e));
     }
-    final SnapshotInfo fromSnapshotInfo;
 
-    try {
-      fromSnapshotInfo = fromSnapshot == null ? null : SnapshotUtils.getSnapshotInfo(ozoneManager, fromSnapshot);
-    } catch (IOException ex) {
-      return new OMKeyPurgeResponse(createErrorOMResponse(omResponse, ex));
+    List<String> keysToBePurgedList = new ArrayList<>();
+
+    for (DeletedKeys bucketWithDeleteKeys : bucketDeletedKeysList) {
+      keysToBePurgedList.addAll(bucketWithDeleteKeys.getKeysList());
+    }
+
+    if (keysToBePurgedList.isEmpty()) {
+      return new OMKeyPurgeResponse(createErrorOMResponse(omResponse,
+          new OMException("None of the keys can be purged be purged since a new snapshot was created for all the " +
+              "buckets, making this request invalid", OMException.ResultCodes.KEY_DELETION_ERROR)));
     }
 
     // Setting transaction info for snapshot, this is to prevent duplicate purge requests to OM from background
@@ -95,10 +114,9 @@ public OMClientResponse validateAndUpdateCache(OzoneManager ozoneManager, TermIn
     } catch (IOException e) {
       return new OMKeyPurgeResponse(createErrorOMResponse(omResponse, e));
     }
-    omClientResponse = new OMKeyPurgeResponse(omResponse.build(), keysToBePurgedList, fromSnapshotInfo,
-        keysToUpdateList);
 
-    return omClientResponse;
+    return new OMKeyPurgeResponse(omResponse.build(),
+        keysToBePurgedList, fromSnapshotInfo, keysToUpdateList);
   }
 
 }
diff --git a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/snapshot/OMSnapshotMoveDeletedKeysRequest.java b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/snapshot/OMSnapshotMoveDeletedKeysRequest.java
index 2ddf308bb50..18055bdda40 100644
--- a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/snapshot/OMSnapshotMoveDeletedKeysRequest.java
+++ b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/snapshot/OMSnapshotMoveDeletedKeysRequest.java
@@ -80,9 +80,9 @@ public OMClientResponse validateAndUpdateCache(OzoneManager ozoneManager, TermIn
         OmResponseUtil.getOMResponseBuilder(getOmRequest());
     try {
       // Check the snapshot exists.
-      SnapshotUtils.getSnapshotInfo(ozoneManager, fromSnapshot.getTableKey());
+      SnapshotInfo snapshotInfo = SnapshotUtils.getSnapshotInfo(ozoneManager, fromSnapshot.getTableKey());
 
-      nextSnapshot = SnapshotUtils.getNextSnapshot(ozoneManager, snapshotChainManager, fromSnapshot);
+      nextSnapshot = SnapshotUtils.getNextSnapshot(ozoneManager, snapshotChainManager, snapshotInfo);
 
       // Get next non-deleted snapshot.
       List<SnapshotMoveKeyInfos> nextDBKeysList = moveDeletedKeysRequest.getNextDBKeysList();
diff --git a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/snapshot/OMSnapshotPurgeRequest.java b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/snapshot/OMSnapshotPurgeRequest.java
index ca29d4e112b..38c51d4de5c 100644
--- a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/snapshot/OMSnapshotPurgeRequest.java
+++ b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/snapshot/OMSnapshotPurgeRequest.java
@@ -103,9 +103,7 @@ public OMClientResponse validateAndUpdateCache(OzoneManager ozoneManager, TermIn
               "Snapshot purge request.", snapTableKey);
           continue;
         }
-
-        SnapshotInfo nextSnapshot =
-            SnapshotUtils.getNextSnapshot(ozoneManager, snapshotChainManager, fromSnapshot);
+        SnapshotInfo nextSnapshot = SnapshotUtils.getNextSnapshot(ozoneManager, snapshotChainManager, fromSnapshot);
 
         // Step 1: Update the deep clean flag for the next active snapshot
         updateSnapshotInfoAndCache(nextSnapshot, omMetadataManager, trxnLogIndex);
@@ -116,7 +114,7 @@ public OMClientResponse validateAndUpdateCache(OzoneManager ozoneManager, TermIn
             .addCacheEntry(new CacheKey<>(fromSnapshot.getTableKey()), CacheValue.get(trxnLogIndex));
         updatedSnapshotInfos.remove(fromSnapshot.getTableKey());
       }
-
+      // Update the snapshotInfo lastTransactionInfo.
       for (SnapshotInfo snapshotInfo : updatedSnapshotInfos.values()) {
         snapshotInfo.setLastTransactionInfo(TransactionInfo.valueOf(termIndex).toByteString());
         omMetadataManager.getSnapshotInfoTable().addCacheEntry(new CacheKey<>(snapshotInfo.getTableKey()),
diff --git a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/volume/OMVolumeRequest.java b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/volume/OMVolumeRequest.java
index 904b082e2d4..df74edfb1c8 100644
--- a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/volume/OMVolumeRequest.java
+++ b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/request/volume/OMVolumeRequest.java
@@ -129,7 +129,6 @@ protected static PersistedUserVolumeInfo addVolumeToOwnerList(
    * @param dbVolumeKey
    * @param dbUserKey
    * @param transactionLogIndex
-   * @throws IOException
    */
   protected static void createVolume(
       final OMMetadataManager omMetadataManager, OmVolumeArgs omVolumeArgs,
diff --git a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/response/key/OMDirectoriesPurgeResponseWithFSO.java b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/response/key/OMDirectoriesPurgeResponseWithFSO.java
index 28c3e3d758e..782063d3244 100644
--- a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/response/key/OMDirectoriesPurgeResponseWithFSO.java
+++ b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/response/key/OMDirectoriesPurgeResponseWithFSO.java
@@ -78,6 +78,10 @@ public OMDirectoriesPurgeResponseWithFSO(@Nonnull OMResponse omResponse,
     this.openKeyInfoMap = openKeyInfoMap;
   }
 
+  public OMDirectoriesPurgeResponseWithFSO(OMResponse omResponse) {
+    super(omResponse);
+  }
+
   @Override
   public void addToDBBatch(OMMetadataManager metadataManager,
       BatchOperation batchOp) throws IOException {
diff --git a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/service/AbstractKeyDeletingService.java b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/service/AbstractKeyDeletingService.java
index 2c2d16bf14c..0d3a05c9e47 100644
--- a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/service/AbstractKeyDeletingService.java
+++ b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/service/AbstractKeyDeletingService.java
@@ -19,6 +19,7 @@
 import com.google.common.annotations.VisibleForTesting;
 import com.google.protobuf.ServiceException;
 import org.apache.commons.lang3.tuple.Pair;
+import org.apache.hadoop.hdds.HddsUtils;
 import org.apache.hadoop.hdds.protocol.proto.HddsProtos;
 import org.apache.hadoop.hdds.scm.protocol.ScmBlockLocationProtocol;
 import org.apache.hadoop.hdds.utils.BackgroundService;
@@ -32,13 +33,11 @@
 import org.apache.hadoop.ozone.om.KeyManager;
 import org.apache.hadoop.ozone.om.OMMetadataManager;
 import org.apache.hadoop.ozone.om.OzoneManager;
-import org.apache.hadoop.ozone.om.SnapshotChainManager;
 import org.apache.hadoop.ozone.om.helpers.OmBucketInfo;
 import org.apache.hadoop.ozone.om.helpers.OmKeyInfo;
 import org.apache.hadoop.ozone.om.helpers.RepeatedOmKeyInfo;
 import org.apache.hadoop.ozone.om.helpers.SnapshotInfo;
 import org.apache.hadoop.ozone.om.ratis.utils.OzoneManagerRatisUtils;
-import org.apache.hadoop.ozone.om.snapshot.SnapshotUtils;
 import org.apache.hadoop.ozone.protocol.proto.OzoneManagerProtocolProtos;
 import org.apache.hadoop.ozone.protocol.proto.OzoneManagerProtocolProtos.DeletedKeys;
 import org.apache.hadoop.ozone.protocol.proto.OzoneManagerProtocolProtos.OMRequest;
@@ -97,7 +96,7 @@ public AbstractKeyDeletingService(String serviceName, long interval,
   protected int processKeyDeletes(List<BlockGroup> keyBlocksList,
       KeyManager manager,
       HashMap<String, RepeatedOmKeyInfo> keysToModify,
-      String snapTableKey) throws IOException {
+      String snapTableKey, UUID expectedPreviousSnapshotId) throws IOException {
 
     long startTime = Time.monotonicNow();
     int delCount = 0;
@@ -120,7 +119,7 @@ protected int processKeyDeletes(List<BlockGroup> keyBlocksList,
       startTime = Time.monotonicNow();
       if (isRatisEnabled()) {
         delCount = submitPurgeKeysRequest(blockDeletionResults,
-            keysToModify, snapTableKey);
+            keysToModify, snapTableKey, expectedPreviousSnapshotId);
       } else {
         // TODO: Once HA and non-HA paths are merged, we should have
         //  only one code path here. Purge keys should go through an
@@ -172,7 +171,7 @@ private int deleteAllKeys(List<DeleteBlockGroupResult> results,
    * @param keysToModify Updated list of RepeatedOmKeyInfo
    */
   private int submitPurgeKeysRequest(List<DeleteBlockGroupResult> results,
-      HashMap<String, RepeatedOmKeyInfo> keysToModify, String snapTableKey) {
+      HashMap<String, RepeatedOmKeyInfo> keysToModify, String snapTableKey, UUID expectedPreviousSnapshotId) {
     Map<Pair<String, String>, List<String>> purgeKeysMapPerBucket =
         new HashMap<>();
 
@@ -203,6 +202,12 @@ private int submitPurgeKeysRequest(List<DeleteBlockGroupResult> results,
     if (snapTableKey != null) {
       purgeKeysRequest.setSnapshotTableKey(snapTableKey);
     }
+    OzoneManagerProtocolProtos.NullableUUID.Builder expectedPreviousSnapshotNullableUUID =
+        OzoneManagerProtocolProtos.NullableUUID.newBuilder();
+    if (expectedPreviousSnapshotId != null) {
+      expectedPreviousSnapshotNullableUUID.setUuid(HddsUtils.toProtobuf(expectedPreviousSnapshotId));
+    }
+    purgeKeysRequest.setExpectedPreviousSnapshotID(expectedPreviousSnapshotNullableUUID.build());
 
     // Add keys to PurgeKeysRequest bucket wise.
     for (Map.Entry<Pair<String, String>, List<String>> entry :
@@ -274,13 +279,21 @@ private void addToMap(Map<Pair<String, String>, List<String>> map, String object
   }
 
   protected void submitPurgePaths(List<PurgePathRequest> requests,
-                                  String snapTableKey) {
+                                  String snapTableKey,
+                                  UUID expectedPreviousSnapshotId) {
     OzoneManagerProtocolProtos.PurgeDirectoriesRequest.Builder purgeDirRequest =
         OzoneManagerProtocolProtos.PurgeDirectoriesRequest.newBuilder();
 
     if (snapTableKey != null) {
       purgeDirRequest.setSnapshotTableKey(snapTableKey);
     }
+    OzoneManagerProtocolProtos.NullableUUID.Builder expectedPreviousSnapshotNullableUUID =
+        OzoneManagerProtocolProtos.NullableUUID.newBuilder();
+    if (expectedPreviousSnapshotId != null) {
+      expectedPreviousSnapshotNullableUUID.setUuid(HddsUtils.toProtobuf(expectedPreviousSnapshotId));
+    }
+    purgeDirRequest.setExpectedPreviousSnapshotID(expectedPreviousSnapshotNullableUUID.build());
+
     purgeDirRequest.addAllDeletedPath(requests);
 
     OzoneManagerProtocolProtos.OMRequest omRequest =
@@ -386,7 +399,8 @@ public long optimizeDirDeletesAndSubmitRequest(long remainNum,
       List<Pair<String, OmKeyInfo>> allSubDirList,
       List<PurgePathRequest> purgePathRequestList,
       String snapTableKey, long startTime,
-      int remainingBufLimit, KeyManager keyManager) {
+      int remainingBufLimit, KeyManager keyManager,
+      UUID expectedPreviousSnapshotId) {
 
     // Optimization to handle delete sub-dir and keys to remove quickly
     // This case will be useful to handle when depth of directory is high
@@ -426,7 +440,7 @@ public long optimizeDirDeletesAndSubmitRequest(long remainNum,
     }
 
     if (!purgePathRequestList.isEmpty()) {
-      submitPurgePaths(purgePathRequestList, snapTableKey);
+      submitPurgePaths(purgePathRequestList, snapTableKey, expectedPreviousSnapshotId);
     }
 
     if (dirNum != 0 || subDirNum != 0 || subFileNum != 0) {
@@ -549,25 +563,6 @@ protected boolean isBufferLimitCrossed(
     return cLimit + increment >= maxLimit;
   }
 
-  protected SnapshotInfo getPreviousActiveSnapshot(SnapshotInfo snapInfo, SnapshotChainManager chainManager)
-      throws IOException {
-    SnapshotInfo currSnapInfo = snapInfo;
-    while (chainManager.hasPreviousPathSnapshot(
-        currSnapInfo.getSnapshotPath(), currSnapInfo.getSnapshotId())) {
-
-      UUID prevPathSnapshot = chainManager.previousPathSnapshot(
-          currSnapInfo.getSnapshotPath(), currSnapInfo.getSnapshotId());
-      String tableKey = chainManager.getTableKey(prevPathSnapshot);
-      SnapshotInfo prevSnapInfo = SnapshotUtils.getSnapshotInfo(ozoneManager, tableKey);
-      if (prevSnapInfo.getSnapshotStatus() ==
-          SnapshotInfo.SnapshotStatus.SNAPSHOT_ACTIVE) {
-        return prevSnapInfo;
-      }
-      currSnapInfo = prevSnapInfo;
-    }
-    return null;
-  }
-
   protected boolean isKeyReclaimable(
       Table<String, OmKeyInfo> previousKeyTable,
       Table<String, String> renamedTable,
diff --git a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/service/DirectoryDeletingService.java b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/service/DirectoryDeletingService.java
index ad16c49d5e6..e638ce45a4a 100644
--- a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/service/DirectoryDeletingService.java
+++ b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/service/DirectoryDeletingService.java
@@ -33,7 +33,9 @@
 import org.apache.hadoop.ozone.om.OzoneManager;
 import org.apache.hadoop.ozone.om.helpers.OmDirectoryInfo;
 import org.apache.hadoop.ozone.om.helpers.OmKeyInfo;
+import org.apache.hadoop.ozone.om.helpers.SnapshotInfo;
 import org.apache.hadoop.ozone.om.snapshot.ReferenceCounted;
+import org.apache.hadoop.ozone.om.snapshot.SnapshotUtils;
 import org.apache.hadoop.ozone.protocol.proto.OzoneManagerProtocolProtos.PurgePathRequest;
 import org.apache.hadoop.util.Time;
 import org.apache.ratis.protocol.ClientId;
@@ -43,6 +45,9 @@
 import java.io.IOException;
 import java.util.ArrayList;
 import java.util.List;
+import java.util.Objects;
+import java.util.Optional;
+import java.util.UUID;
 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.atomic.AtomicBoolean;
 
@@ -167,9 +172,15 @@ public BackgroundTaskResult call() {
             = new ArrayList<>((int) remainNum);
 
         Table.KeyValue<String, OmKeyInfo> pendingDeletedDirInfo;
+
         try (TableIterator<String, ? extends KeyValue<String, OmKeyInfo>>
                  deleteTableIterator = getOzoneManager().getMetadataManager().
             getDeletedDirTable().iterator()) {
+          // This is to avoid race condition b/w purge request and snapshot chain updation. For AOS taking the global
+          // snapshotId since AOS could process multiple buckets in one iteration.
+          UUID expectedPreviousSnapshotId =
+              ((OmMetadataManagerImpl)getOzoneManager().getMetadataManager()).getSnapshotChainManager()
+                  .getLatestGlobalSnapshotId();
 
           long startTime = Time.monotonicNow();
           while (remainNum > 0 && deleteTableIterator.hasNext()) {
@@ -216,7 +227,7 @@ public BackgroundTaskResult call() {
               remainNum, dirNum, subDirNum, subFileNum,
               allSubDirList, purgePathRequestList, null, startTime,
               ratisByteLimit - consumedSize,
-              getOzoneManager().getKeyManager());
+              getOzoneManager().getKeyManager(), expectedPreviousSnapshotId);
 
         } catch (IOException e) {
           LOG.error("Error while running delete directories and files " +
@@ -239,12 +250,23 @@ private boolean previousSnapshotHasDir(
           getOzoneManager().getOmSnapshotManager();
       OmMetadataManagerImpl metadataManager = (OmMetadataManagerImpl)
           getOzoneManager().getMetadataManager();
-
+      SnapshotInfo previousSnapshotInfo = SnapshotUtils.getLatestSnapshotInfo(deletedDirInfo.getVolumeName(),
+          deletedDirInfo.getBucketName(), getOzoneManager(), metadataManager.getSnapshotChainManager());
+      if (previousSnapshotInfo == null) {
+        return false;
+      }
+      // previous snapshot is not active or it has not been flushed to disk then don't process the key in this
+      // iteration.
+      if (previousSnapshotInfo.getSnapshotStatus() != SnapshotInfo.SnapshotStatus.SNAPSHOT_ACTIVE ||
+              !OmSnapshotManager.areSnapshotChangesFlushedToDB(getOzoneManager().getMetadataManager(),
+                  previousSnapshotInfo)) {
+        return true;
+      }
       try (ReferenceCounted<OmSnapshot> rcLatestSnapshot =
-          metadataManager.getLatestActiveSnapshot(
+          omSnapshotManager.getSnapshot(
               deletedDirInfo.getVolumeName(),
               deletedDirInfo.getBucketName(),
-              omSnapshotManager)) {
+              previousSnapshotInfo.getName())) {
 
         if (rcLatestSnapshot != null) {
           String dbRenameKey = metadataManager
@@ -265,8 +287,14 @@ private boolean previousSnapshotHasDir(
           String prevDbKey = prevDirTableDBKey == null ?
               metadataManager.getOzoneDeletePathDirKey(key) : prevDirTableDBKey;
           OmDirectoryInfo prevDirInfo = prevDirTable.get(prevDbKey);
-          return prevDirInfo != null &&
-              prevDirInfo.getObjectID() == deletedDirInfo.getObjectID();
+          //Checking if the previous snapshot in the chain hasn't changed while checking if the deleted directory is
+          // present in the previous snapshot. If the chain has changed, the deleted directory could have been moved
+          // to the newly created snapshot.
+          SnapshotInfo newPreviousSnapshotInfo = SnapshotUtils.getLatestSnapshotInfo(deletedDirInfo.getVolumeName(),
+              deletedDirInfo.getBucketName(), getOzoneManager(), metadataManager.getSnapshotChainManager());
+          return (!Objects.equals(Optional.ofNullable(newPreviousSnapshotInfo).map(SnapshotInfo::getSnapshotId),
+              Optional.ofNullable(previousSnapshotInfo).map(SnapshotInfo::getSnapshotId))) || (prevDirInfo != null &&
+              prevDirInfo.getObjectID() == deletedDirInfo.getObjectID());
         }
       }
 
diff --git a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/service/KeyDeletingService.java b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/service/KeyDeletingService.java
index e7553004edf..9a4f74eba59 100644
--- a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/service/KeyDeletingService.java
+++ b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/service/KeyDeletingService.java
@@ -23,7 +23,9 @@
 import java.util.Iterator;
 import java.util.List;
 import java.util.Map;
+import java.util.Optional;
 import java.util.Set;
+import java.util.UUID;
 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.atomic.AtomicBoolean;
 import java.util.concurrent.atomic.AtomicLong;
@@ -44,6 +46,7 @@
 import org.apache.hadoop.ozone.om.OzoneManager;
 import org.apache.hadoop.ozone.om.ratis.utils.OzoneManagerRatisUtils;
 import org.apache.hadoop.ozone.om.snapshot.ReferenceCounted;
+import org.apache.hadoop.ozone.om.snapshot.SnapshotUtils;
 import org.apache.hadoop.ozone.protocol.proto.OzoneManagerProtocolProtos.OMRequest;
 import org.apache.hadoop.ozone.protocol.proto.OzoneManagerProtocolProtos.SnapshotSize;
 import org.apache.hadoop.ozone.protocol.proto.OzoneManagerProtocolProtos.SetSnapshotPropertyRequest;
@@ -93,11 +96,14 @@ public class KeyDeletingService extends AbstractKeyDeletingService {
   private final Set<String> completedExclusiveSizeSet;
   private final Map<String, String> snapshotSeekMap;
   private AtomicBoolean isRunningOnAOS;
+  private final boolean deepCleanSnapshots;
+  private final SnapshotChainManager snapshotChainManager;
 
   public KeyDeletingService(OzoneManager ozoneManager,
       ScmBlockLocationProtocol scmClient,
       KeyManager manager, long serviceInterval,
-      long serviceTimeout, ConfigurationSource conf) {
+      long serviceTimeout, ConfigurationSource conf,
+      boolean deepCleanSnapshots) {
     super(KeyDeletingService.class.getSimpleName(), serviceInterval,
         TimeUnit.MILLISECONDS, KEY_DELETING_CORE_POOL_SIZE,
         serviceTimeout, ozoneManager, scmClient);
@@ -113,6 +119,8 @@ public KeyDeletingService(OzoneManager ozoneManager,
     this.completedExclusiveSizeSet = new HashSet<>();
     this.snapshotSeekMap = new HashMap<>();
     this.isRunningOnAOS = new AtomicBoolean(false);
+    this.deepCleanSnapshots = deepCleanSnapshots;
+    this.snapshotChainManager = ((OmMetadataManagerImpl)manager.getMetadataManager()).getSnapshotChainManager();
   }
 
   /**
@@ -202,7 +210,9 @@ public BackgroundTaskResult call() {
           //  doesn't have enough entries left.
           //  OM would have to keep track of which snapshot the key is coming
           //  from if the above would be done inside getPendingDeletionKeys().
-
+          // This is to avoid race condition b/w purge request and snapshot chain update. For AOS taking the global
+          // snapshotId since AOS could process multiple buckets in one iteration.
+          UUID expectedPreviousSnapshotId = snapshotChainManager.getLatestGlobalSnapshotId();
           PendingKeysDeletion pendingKeysDeletion = manager
               .getPendingDeletionKeys(getKeyLimitPerTask());
           List<BlockGroup> keyBlocksList = pendingKeysDeletion
@@ -210,7 +220,7 @@ public BackgroundTaskResult call() {
           if (keyBlocksList != null && !keyBlocksList.isEmpty()) {
             delCount = processKeyDeletes(keyBlocksList,
                 getOzoneManager().getKeyManager(),
-                pendingKeysDeletion.getKeysToModify(), null);
+                pendingKeysDeletion.getKeysToModify(), null, expectedPreviousSnapshotId);
             deletedKeyCount.addAndGet(delCount);
           }
         } catch (IOException e) {
@@ -219,7 +229,7 @@ public BackgroundTaskResult call() {
         }
 
         try {
-          if (delCount < keyLimitPerTask) {
+          if (deepCleanSnapshots && delCount < keyLimitPerTask) {
             processSnapshotDeepClean(delCount);
           }
         } catch (Exception e) {
@@ -255,15 +265,23 @@ private void processSnapshotDeepClean(int delCount)
         while (delCount < keyLimitPerTask && iterator.hasNext()) {
           List<BlockGroup> keysToPurge = new ArrayList<>();
           HashMap<String, RepeatedOmKeyInfo> keysToModify = new HashMap<>();
-          SnapshotInfo currSnapInfo = iterator.next().getValue();
-
+          SnapshotInfo currSnapInfo = snapshotInfoTable.get(iterator.next().getKey());
           // Deep clean only on active snapshot. Deleted Snapshots will be
           // cleaned up by SnapshotDeletingService.
-          if (currSnapInfo.getSnapshotStatus() != SNAPSHOT_ACTIVE ||
+          if (currSnapInfo == null || currSnapInfo.getSnapshotStatus() != SNAPSHOT_ACTIVE ||
               currSnapInfo.getDeepClean()) {
             continue;
           }
 
+          SnapshotInfo prevSnapInfo = SnapshotUtils.getPreviousSnapshot(getOzoneManager(), snapChainManager,
+              currSnapInfo);
+          if (prevSnapInfo != null &&
+              (prevSnapInfo.getSnapshotStatus() != SnapshotInfo.SnapshotStatus.SNAPSHOT_ACTIVE ||
+                  !OmSnapshotManager.areSnapshotChangesFlushedToDB(getOzoneManager().getMetadataManager(),
+                      prevSnapInfo))) {
+            continue;
+          }
+
           try (ReferenceCounted<OmSnapshot>
               rcCurrOmSnapshot = omSnapshotManager.getSnapshot(
                   currSnapInfo.getVolumeName(),
@@ -292,11 +310,13 @@ private void processSnapshotDeepClean(int delCount)
             }
 
             String snapshotBucketKey = dbBucketKey + OzoneConsts.OM_KEY_PREFIX;
-            SnapshotInfo previousSnapshot = getPreviousActiveSnapshot(currSnapInfo, snapChainManager);
+            SnapshotInfo previousSnapshot = SnapshotUtils.getPreviousSnapshot(getOzoneManager(), snapChainManager,
+                currSnapInfo);
             SnapshotInfo previousToPrevSnapshot = null;
 
             if (previousSnapshot != null) {
-              previousToPrevSnapshot = getPreviousActiveSnapshot(previousSnapshot, snapChainManager);
+              previousToPrevSnapshot = SnapshotUtils.getPreviousSnapshot(getOzoneManager(), snapChainManager,
+                  previousSnapshot);
             }
 
             Table<String, OmKeyInfo> previousKeyTable = null;
@@ -425,7 +445,8 @@ private void processSnapshotDeepClean(int delCount)
 
               if (!keysToPurge.isEmpty()) {
                 processKeyDeletes(keysToPurge, currOmSnapshot.getKeyManager(),
-                    keysToModify, currSnapInfo.getTableKey());
+                    keysToModify, currSnapInfo.getTableKey(),
+                    Optional.ofNullable(previousSnapshot).map(SnapshotInfo::getSnapshotId).orElse(null));
               }
             } finally {
               IOUtils.closeQuietly(rcPrevOmSnapshot, rcPrevToPrevOmSnapshot);
diff --git a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/service/SnapshotDirectoryCleaningService.java b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/service/SnapshotDirectoryCleaningService.java
index 26d5d24a8a0..e7133e62589 100644
--- a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/service/SnapshotDirectoryCleaningService.java
+++ b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/service/SnapshotDirectoryCleaningService.java
@@ -61,6 +61,7 @@
 import static org.apache.hadoop.ozone.om.helpers.SnapshotInfo.SnapshotStatus.SNAPSHOT_ACTIVE;
 import static org.apache.hadoop.ozone.om.request.file.OMFileRequest.getDirectoryInfo;
 import static org.apache.hadoop.ozone.om.snapshot.SnapshotUtils.getOzonePathKeyForFso;
+import static org.apache.hadoop.ozone.om.snapshot.SnapshotUtils.getPreviousSnapshot;
 
 /**
  * Snapshot BG Service for deleted directory deep clean and exclusive size
@@ -143,11 +144,11 @@ public BackgroundTaskResult call() {
           <String, SnapshotInfo>> iterator = snapshotInfoTable.iterator()) {
 
         while (iterator.hasNext()) {
-          SnapshotInfo currSnapInfo = iterator.next().getValue();
+          SnapshotInfo currSnapInfo = snapshotInfoTable.get(iterator.next().getKey());
 
           // Expand deleted dirs only on active snapshot. Deleted Snapshots
           // will be cleaned up by SnapshotDeletingService.
-          if (currSnapInfo.getSnapshotStatus() != SNAPSHOT_ACTIVE ||
+          if (currSnapInfo == null || currSnapInfo.getSnapshotStatus() != SNAPSHOT_ACTIVE ||
               currSnapInfo.getDeepCleanedDeletedDir()) {
             continue;
           }
@@ -173,7 +174,7 @@ public BackgroundTaskResult call() {
                   "unexpected state.");
             }
 
-            SnapshotInfo previousSnapshot = getPreviousActiveSnapshot(currSnapInfo, snapChainManager);
+            SnapshotInfo previousSnapshot = getPreviousSnapshot(getOzoneManager(), snapChainManager, currSnapInfo);
             SnapshotInfo previousToPrevSnapshot = null;
 
             Table<String, OmKeyInfo> previousKeyTable = null;
@@ -190,7 +191,7 @@ public BackgroundTaskResult call() {
                   .getKeyTable(bucketInfo.getBucketLayout());
               prevRenamedTable = omPreviousSnapshot
                   .getMetadataManager().getSnapshotRenamedTable();
-              previousToPrevSnapshot = getPreviousActiveSnapshot(previousSnapshot, snapChainManager);
+              previousToPrevSnapshot = getPreviousSnapshot(getOzoneManager(), snapChainManager, previousSnapshot);
             }
 
             Table<String, OmKeyInfo> previousToPrevKeyTable = null;
diff --git a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/snapshot/SnapshotUtils.java b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/snapshot/SnapshotUtils.java
index 4a8f0bc9b22..201a9fe0c9c 100644
--- a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/snapshot/SnapshotUtils.java
+++ b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/om/snapshot/SnapshotUtils.java
@@ -41,6 +41,8 @@
 import java.util.NoSuchElementException;
 import java.util.HashMap;
 import java.util.Map;
+import java.util.Objects;
+import java.util.Optional;
 import java.util.UUID;
 
 import static org.apache.hadoop.ozone.OzoneConsts.OM_KEY_PREFIX;
@@ -150,7 +152,6 @@ public static void checkSnapshotActive(SnapshotInfo snapInfo,
     }
   }
 
-
   /**
    * Get the next snapshot in the snapshot chain.
    */
@@ -162,7 +163,8 @@ public static SnapshotInfo getNextSnapshot(OzoneManager ozoneManager,
     // SnapshotChainManager might throw NoSuchElementException as the snapshot
     // is removed in-memory but OMDoubleBuffer has not flushed yet.
     if (snapInfo == null) {
-      throw new OMException("Snapshot Info is null. Cannot get the next snapshot", INVALID_SNAPSHOT_ERROR);
+      throw new OMException("Provided Snapshot Info argument is null. Cannot get the next snapshot for a null value",
+          INVALID_SNAPSHOT_ERROR);
     }
     try {
       if (chainManager.hasNextPathSnapshot(snapInfo.getSnapshotPath(),
@@ -178,6 +180,41 @@ public static SnapshotInfo getNextSnapshot(OzoneManager ozoneManager,
     return null;
   }
 
+  /**
+   * Get the previous snapshot in the snapshot chain.
+   */
+  public static SnapshotInfo getPreviousSnapshot(OzoneManager ozoneManager,
+                                                 SnapshotChainManager chainManager,
+                                                 SnapshotInfo snapInfo)
+      throws IOException {
+    UUID previousSnapshotId = getPreviousSnapshotId(snapInfo, chainManager);
+    return previousSnapshotId == null ? null : getSnapshotInfo(ozoneManager, chainManager, previousSnapshotId);
+  }
+
+  /**
+   * Get the previous snapshot in the snapshot chain.
+   */
+  private static UUID getPreviousSnapshotId(SnapshotInfo snapInfo, SnapshotChainManager chainManager)
+      throws IOException {
+    // If the snapshot is deleted in the previous run, then the in-memory
+    // SnapshotChainManager might throw NoSuchElementException as the snapshot
+    // is removed in-memory but OMDoubleBuffer has not flushed yet.
+    if (snapInfo == null) {
+      throw new OMException("Provided Snapshot Info argument is null. Cannot get the previous snapshot for a null " +
+          "value", INVALID_SNAPSHOT_ERROR);
+    }
+    try {
+      if (chainManager.hasPreviousPathSnapshot(snapInfo.getSnapshotPath(),
+          snapInfo.getSnapshotId())) {
+        return chainManager.previousPathSnapshot(snapInfo.getSnapshotPath(),
+            snapInfo.getSnapshotId());
+      }
+    } catch (NoSuchElementException ignored) {
+
+    }
+    return null;
+  }
+
   /**
    * Return a map column family to prefix for the keys in the table for
    * the given volume and bucket.
@@ -282,4 +319,34 @@ private static boolean isSameAsLatestOmKeyInfo(List<OmKeyInfo> omKeyInfos,
     }
     return false;
   }
+
+  public static SnapshotInfo getLatestSnapshotInfo(String volumeName, String bucketName,
+                                                   OzoneManager ozoneManager,
+                                                   SnapshotChainManager snapshotChainManager) throws IOException {
+    Optional<UUID> latestPathSnapshot = Optional.ofNullable(
+        getLatestPathSnapshotId(volumeName, bucketName, snapshotChainManager));
+    return latestPathSnapshot.isPresent() ?
+        getSnapshotInfo(ozoneManager, snapshotChainManager, latestPathSnapshot.get()) : null;
+  }
+
+  public static UUID getLatestPathSnapshotId(String volumeName, String bucketName,
+                                             SnapshotChainManager snapshotChainManager) throws IOException {
+    String snapshotPath = volumeName + OM_KEY_PREFIX + bucketName;
+    return snapshotChainManager.getLatestPathSnapshotId(snapshotPath);
+  }
+
+  // Validates the previous path snapshotId for given a snapshotInfo. In case snapshotInfo is
+  // null, the snapshotInfo would be considered as AOS and previous snapshot becomes the latest snapshot in the global
+  // snapshot chain. Would throw OMException if validation fails otherwise function would pass.
+  public static void validatePreviousSnapshotId(SnapshotInfo snapshotInfo,
+                                                SnapshotChainManager snapshotChainManager,
+                                                UUID expectedPreviousSnapshotId) throws IOException {
+    UUID previousSnapshotId = snapshotInfo == null ? snapshotChainManager.getLatestGlobalSnapshotId() :
+        SnapshotUtils.getPreviousSnapshotId(snapshotInfo, snapshotChainManager);
+    if (!Objects.equals(expectedPreviousSnapshotId, previousSnapshotId)) {
+      throw new OMException("Snapshot validation failed. Expected previous snapshotId : " +
+          expectedPreviousSnapshotId + " but was " + previousSnapshotId,
+          OMException.ResultCodes.INVALID_REQUEST);
+    }
+  }
 }
diff --git a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/protocolPB/OzoneManagerRequestHandler.java b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/protocolPB/OzoneManagerRequestHandler.java
index 576fac48c73..5682b040e85 100644
--- a/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/protocolPB/OzoneManagerRequestHandler.java
+++ b/hadoop-ozone/ozone-manager/src/main/java/org/apache/hadoop/ozone/protocolPB/OzoneManagerRequestHandler.java
@@ -130,7 +130,6 @@
 import org.apache.hadoop.ozone.protocol.proto.OzoneManagerProtocolProtos.SetSafeModeRequest;
 import org.apache.hadoop.ozone.protocol.proto.OzoneManagerProtocolProtos.SetSafeModeResponse;
 import org.apache.hadoop.ozone.protocol.proto.OzoneManagerProtocolProtos.GetS3VolumeContextResponse;
-import org.apache.hadoop.ozone.protocol.proto.OzoneManagerProtocolProtos.ServerDefaultsResponse;
 import org.apache.hadoop.ozone.protocol.proto.OzoneManagerProtocolProtos.Status;
 import org.apache.hadoop.ozone.protocol.proto.OzoneManagerProtocolProtos.SnapshotDiffRequest;
 import org.apache.hadoop.ozone.protocol.proto.OzoneManagerProtocolProtos.SnapshotDiffResponse;
@@ -376,12 +375,6 @@ public OMResponse handleReadRequest(OMRequest request) {
             getSnapshotInfo(request.getSnapshotInfoRequest());
         responseBuilder.setSnapshotInfoResponse(snapshotInfoResponse);
         break;
-      case GetServerDefaults:
-        responseBuilder.setServerDefaultsResponse(
-            ServerDefaultsResponse.newBuilder()
-                .setServerDefaults(impl.getServerDefaults().getProtobuf())
-                .build());
-        break;
       case GetQuotaRepairStatus:
         OzoneManagerProtocolProtos.GetQuotaRepairStatusResponse quotaRepairStatusRsp =
             getQuotaRepairStatus(request.getGetQuotaRepairStatusRequest());
diff --git a/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/service/TestKeyDeletingService.java b/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/service/TestKeyDeletingService.java
index 8163592cfc6..ff6506da034 100644
--- a/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/service/TestKeyDeletingService.java
+++ b/hadoop-ozone/ozone-manager/src/test/java/org/apache/hadoop/ozone/om/service/TestKeyDeletingService.java
@@ -39,13 +39,17 @@
 import org.apache.hadoop.hdds.utils.db.Table;
 import org.apache.hadoop.hdds.utils.db.TableIterator;
 import org.apache.hadoop.ozone.om.KeyManager;
+import org.apache.hadoop.ozone.om.KeyManagerImpl;
 import org.apache.hadoop.ozone.om.OMMetadataManager;
 import org.apache.hadoop.ozone.om.OmSnapshot;
+import org.apache.hadoop.ozone.om.OmSnapshotManager;
 import org.apache.hadoop.ozone.om.OmTestManagers;
 import org.apache.hadoop.ozone.om.OzoneManager;
+import org.apache.hadoop.ozone.om.PendingKeysDeletion;
 import org.apache.hadoop.ozone.om.ScmBlockLocationTestingClient;
 import org.apache.hadoop.ozone.common.BlockGroup;
 import org.apache.hadoop.ozone.om.helpers.BucketLayout;
+import org.apache.hadoop.ozone.om.helpers.KeyInfoWithVolumeContext;
 import org.apache.hadoop.ozone.om.helpers.OmKeyInfo;
 import org.apache.hadoop.ozone.om.helpers.OmKeyLocationInfo;
 import org.apache.hadoop.ozone.om.helpers.OmKeyLocationInfoGroup;
@@ -57,10 +61,13 @@
 import org.apache.ratis.util.ExitUtils;
 import org.junit.jupiter.api.AfterAll;
 import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.BeforeAll;
 import org.junit.jupiter.api.Nested;
 import org.junit.jupiter.api.TestInstance;
 import org.junit.jupiter.api.io.TempDir;
+import org.mockito.ArgumentMatchers;
+import org.mockito.Mockito;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -81,12 +88,16 @@
 import static org.apache.hadoop.hdds.protocol.proto.HddsProtos.ReplicationFactor.THREE;
 import static org.apache.hadoop.ozone.OzoneConfigKeys.OZONE_BLOCK_DELETING_SERVICE_INTERVAL;
 import static org.apache.hadoop.ozone.OzoneConfigKeys.OZONE_SNAPSHOT_DELETING_SERVICE_INTERVAL;
+import static org.apache.hadoop.ozone.om.OMConfigKeys.OZONE_SNAPSHOT_DEEP_CLEANING_ENABLED;
 import static org.apache.hadoop.ozone.om.OMConfigKeys.OZONE_SNAPSHOT_SST_FILTERING_SERVICE_INTERVAL;
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.junit.jupiter.api.Assertions.assertDoesNotThrow;
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertFalse;
 import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.mockito.ArgumentMatchers.anyInt;
+import static org.mockito.Mockito.doAnswer;
+import static org.mockito.Mockito.when;
 
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.Timeout;
@@ -132,6 +143,7 @@ private void createConfig(File testDir) {
         1, TimeUnit.SECONDS);
     conf.setTimeDuration(HDDS_CONTAINER_REPORT_INTERVAL,
         200, TimeUnit.MILLISECONDS);
+    conf.setBoolean(OZONE_SNAPSHOT_DEEP_CLEANING_ENABLED, true);
     conf.setQuietMode(false);
   }
 
@@ -285,6 +297,115 @@ void checkDeletedTableCleanUpForSnapshot() throws Exception {
       assertEquals(0, rangeKVs.size());
     }
 
+    /*
+     * Create key k1
+     * Create snap1
+     * Rename k1 to k2
+     * Delete k2
+     * Wait for KeyDeletingService to start processing deleted key k2
+     * Create snap2 by making the KeyDeletingService thread wait till snap2 is flushed
+     * Resume KeyDeletingService thread.
+     * Read k1 from snap1.
+     */
+    @Test
+    public void testAOSKeyDeletingWithSnapshotCreateParallelExecution()
+        throws Exception {
+      Table<String, SnapshotInfo> snapshotInfoTable =
+          om.getMetadataManager().getSnapshotInfoTable();
+      Table<String, RepeatedOmKeyInfo> deletedTable =
+          om.getMetadataManager().getDeletedTable();
+      Table<String, String> renameTable = om.getMetadataManager().getSnapshotRenamedTable();
+
+      // Suspend KeyDeletingService
+      keyDeletingService.suspend();
+      SnapshotDeletingService snapshotDeletingService = om.getKeyManager().getSnapshotDeletingService();
+      snapshotDeletingService.suspend();
+      GenericTestUtils.waitFor(() -> !keyDeletingService.isRunningOnAOS(), 1000, 10000);
+      final String volumeName = getTestName();
+      final String bucketName = uniqueObjectName("bucket");
+      OzoneManager ozoneManager = Mockito.spy(om);
+      OmSnapshotManager omSnapshotManager = Mockito.spy(om.getOmSnapshotManager());
+      KeyManager km = Mockito.spy(new KeyManagerImpl(ozoneManager, ozoneManager.getScmClient(), conf,
+          om.getPerfMetrics()));
+      when(ozoneManager.getOmSnapshotManager()).thenAnswer(i -> {
+        return omSnapshotManager;
+      });
+      KeyDeletingService service = new KeyDeletingService(ozoneManager, scmBlockTestingClient, km, 10000,
+          100000, conf, false);
+      service.shutdown();
+      final long initialSnapshotCount = metadataManager.countRowsInTable(snapshotInfoTable);
+      final long initialDeletedCount = metadataManager.countRowsInTable(deletedTable);
+      final long initialRenameCount = metadataManager.countRowsInTable(renameTable);
+      // Create Volume and Buckets
+      createVolumeAndBucket(volumeName, bucketName, false);
+      OmKeyArgs args = createAndCommitKey(volumeName, bucketName,
+          "key1", 3);
+      String snap1 = uniqueObjectName("snap");
+      String snap2 = uniqueObjectName("snap");
+      writeClient.createSnapshot(volumeName, bucketName, snap1);
+      KeyInfoWithVolumeContext keyInfo = writeClient.getKeyInfo(args, false);
+      AtomicLong objectId = new AtomicLong(keyInfo.getKeyInfo().getObjectID());
+      renameKey(volumeName, bucketName, "key1", "key2");
+      deleteKey(volumeName, bucketName, "key2");
+      assertTableRowCount(deletedTable, initialDeletedCount + 1, metadataManager);
+      assertTableRowCount(renameTable, initialRenameCount + 1, metadataManager);
+
+      String[] deletePathKey = {metadataManager.getOzoneDeletePathKey(objectId.get(),
+          metadataManager.getOzoneKey(volumeName,
+          bucketName, "key2"))};
+      assertNotNull(deletedTable.get(deletePathKey[0]));
+      Mockito.doAnswer(i -> {
+        writeClient.createSnapshot(volumeName, bucketName, snap2);
+        GenericTestUtils.waitFor(() -> {
+          try {
+            SnapshotInfo snapshotInfo = writeClient.getSnapshotInfo(volumeName, bucketName, snap2);
+            return OmSnapshotManager.areSnapshotChangesFlushedToDB(metadataManager, snapshotInfo);
+          } catch (IOException e) {
+            throw new RuntimeException(e);
+          }
+        }, 1000, 100000);
+        GenericTestUtils.waitFor(() -> {
+          try {
+            return renameTable.get(metadataManager.getRenameKey(volumeName, bucketName, objectId.get())) == null;
+          } catch (IOException e) {
+            throw new RuntimeException(e);
+          }
+        }, 1000, 10000);
+        return i.callRealMethod();
+      }).when(omSnapshotManager).getSnapshot(ArgumentMatchers.eq(volumeName), ArgumentMatchers.eq(bucketName),
+          ArgumentMatchers.eq(snap1));
+      assertTableRowCount(snapshotInfoTable, initialSnapshotCount + 1, metadataManager);
+      doAnswer(i -> {
+        PendingKeysDeletion pendingKeysDeletion = (PendingKeysDeletion) i.callRealMethod();
+        for (BlockGroup group : pendingKeysDeletion.getKeyBlocksList()) {
+          Assertions.assertNotEquals(deletePathKey[0], group.getGroupID());
+        }
+        return pendingKeysDeletion;
+      }).when(km).getPendingDeletionKeys(anyInt());
+      service.runPeriodicalTaskNow();
+      service.runPeriodicalTaskNow();
+      assertTableRowCount(snapshotInfoTable, initialSnapshotCount + 2, metadataManager);
+      // Create Key3
+      OmKeyArgs args2 = createAndCommitKey(volumeName, bucketName,
+          "key3", 3);
+      keyInfo = writeClient.getKeyInfo(args2, false);
+      objectId.set(keyInfo.getKeyInfo().getObjectID());
+      // Rename Key3 to key4
+      renameKey(volumeName, bucketName, "key3", "key4");
+      // Delete Key4
+      deleteKey(volumeName, bucketName, "key4");
+      deletePathKey[0] = metadataManager.getOzoneDeletePathKey(objectId.get(), metadataManager.getOzoneKey(volumeName,
+          bucketName, "key4"));
+      // Delete snapshot
+      writeClient.deleteSnapshot(volumeName, bucketName, snap2);
+      // Run KDS and ensure key4 doesn't get purged since snap2 has not been deleted.
+      service.runPeriodicalTaskNow();
+      writeClient.deleteSnapshot(volumeName, bucketName, snap1);
+      snapshotDeletingService.resume();
+      assertTableRowCount(snapshotInfoTable, initialSnapshotCount, metadataManager);
+      keyDeletingService.resume();
+    }
+
     /*
      * Create Snap1
      * Create 10 keys
@@ -396,68 +517,68 @@ void testSnapshotExclusiveSize() throws Exception {
       final long initialDeletedCount = metadataManager.countRowsInTable(deletedTable);
       final long initialRenamedCount = metadataManager.countRowsInTable(renamedTable);
 
-      final String volumeName = getTestName();
-      final String bucketName = uniqueObjectName("bucket");
+      final String testVolumeName = getTestName();
+      final String testBucketName = uniqueObjectName("bucket");
       final String keyName = uniqueObjectName("key");
 
       // Create Volume and Buckets
-      createVolumeAndBucket(volumeName, bucketName, false);
+      createVolumeAndBucket(testVolumeName, testBucketName, false);
 
       // Create 3 keys
       for (int i = 1; i <= 3; i++) {
-        createAndCommitKey(volumeName, bucketName, keyName + i, 3);
+        createAndCommitKey(testVolumeName, testBucketName, keyName + i, 3);
       }
       assertTableRowCount(keyTable, initialKeyCount + 3, metadataManager);
 
       // Create Snapshot1
       String snap1 = uniqueObjectName("snap");
-      writeClient.createSnapshot(volumeName, bucketName, snap1);
+      writeClient.createSnapshot(testVolumeName, testBucketName, snap1);
       assertTableRowCount(snapshotInfoTable, initialSnapshotCount + 1, metadataManager);
       assertTableRowCount(deletedTable, initialDeletedCount, metadataManager);
 
       // Create 2 keys
       for (int i = 4; i <= 5; i++) {
-        createAndCommitKey(volumeName, bucketName, keyName + i, 3);
+        createAndCommitKey(testVolumeName, testBucketName, keyName + i, 3);
       }
       // Delete a key, rename 2 keys. We will be using this to test
       // how we handle renamed key for exclusive size calculation.
-      renameKey(volumeName, bucketName, keyName + 1, "renamedKey1");
-      renameKey(volumeName, bucketName, keyName + 2, "renamedKey2");
-      deleteKey(volumeName, bucketName, keyName + 3);
+      renameKey(testVolumeName, testBucketName, keyName + 1, "renamedKey1");
+      renameKey(testVolumeName, testBucketName, keyName + 2, "renamedKey2");
+      deleteKey(testVolumeName, testBucketName, keyName + 3);
       assertTableRowCount(deletedTable, initialDeletedCount + 1, metadataManager);
       assertTableRowCount(renamedTable, initialRenamedCount + 2, metadataManager);
 
       // Create Snapshot2
       String snap2 = uniqueObjectName("snap");
-      writeClient.createSnapshot(volumeName, bucketName, snap2);
+      writeClient.createSnapshot(testVolumeName, testBucketName, snap2);
       assertTableRowCount(snapshotInfoTable, initialSnapshotCount + 2, metadataManager);
       assertTableRowCount(deletedTable, initialDeletedCount, metadataManager);
 
       // Create 2 keys
       for (int i = 6; i <= 7; i++) {
-        createAndCommitKey(volumeName, bucketName, keyName + i, 3);
+        createAndCommitKey(testVolumeName, testBucketName, keyName + i, 3);
       }
 
-      deleteKey(volumeName, bucketName, "renamedKey1");
-      deleteKey(volumeName, bucketName, keyName + 4);
+      deleteKey(testVolumeName, testBucketName, "renamedKey1");
+      deleteKey(testVolumeName, testBucketName, keyName + 4);
       // Do a second rename of already renamedKey2
-      renameKey(volumeName, bucketName, "renamedKey2", "renamedKey22");
+      renameKey(testVolumeName, testBucketName, "renamedKey2", "renamedKey22");
       assertTableRowCount(deletedTable, initialDeletedCount + 2, metadataManager);
       assertTableRowCount(renamedTable, initialRenamedCount + 1, metadataManager);
 
       // Create Snapshot3
       String snap3 = uniqueObjectName("snap");
-      writeClient.createSnapshot(volumeName, bucketName, snap3);
+      writeClient.createSnapshot(testVolumeName, testBucketName, snap3);
       // Delete 4 keys
-      deleteKey(volumeName, bucketName, "renamedKey22");
+      deleteKey(testVolumeName, testBucketName, "renamedKey22");
       for (int i = 5; i <= 7; i++) {
-        deleteKey(volumeName, bucketName, keyName + i);
+        deleteKey(testVolumeName, testBucketName, keyName + i);
       }
 
       // Create Snapshot4
       String snap4 = uniqueObjectName("snap");
-      writeClient.createSnapshot(volumeName, bucketName, snap4);
-      createAndCommitKey(volumeName, bucketName, uniqueObjectName("key"), 3);
+      writeClient.createSnapshot(testVolumeName, testBucketName, snap4);
+      createAndCommitKey(testVolumeName, testBucketName, uniqueObjectName("key"), 3);
 
       long prevKdsRunCount = getRunCount();
       keyDeletingService.resume();
@@ -468,6 +589,7 @@ void testSnapshotExclusiveSize() throws Exception {
           .put(snap3, 2000L)
           .put(snap4, 0L)
           .build();
+      System.out.println(expectedSize);
 
       // Let KeyDeletingService to run for some iterations
       GenericTestUtils.waitFor(
@@ -480,8 +602,10 @@ void testSnapshotExclusiveSize() throws Exception {
         while (iterator.hasNext()) {
           Table.KeyValue<String, SnapshotInfo> snapshotEntry = iterator.next();
           String snapshotName = snapshotEntry.getValue().getName();
+
           Long expected = expectedSize.getOrDefault(snapshotName, 0L);
           assertNotNull(expected);
+          System.out.println(snapshotName);
           assertEquals(expected, snapshotEntry.getValue().getExclusiveSize());
           // Since for the test we are using RATIS/THREE
           assertEquals(expected * 3, snapshotEntry.getValue().getExclusiveReplicatedSize());
diff --git a/hadoop-ozone/recon/src/main/java/org/apache/hadoop/ozone/recon/ReconUtils.java b/hadoop-ozone/recon/src/main/java/org/apache/hadoop/ozone/recon/ReconUtils.java
index e16fc8deb9d..da8aa210917 100644
--- a/hadoop-ozone/recon/src/main/java/org/apache/hadoop/ozone/recon/ReconUtils.java
+++ b/hadoop-ozone/recon/src/main/java/org/apache/hadoop/ozone/recon/ReconUtils.java
@@ -352,8 +352,8 @@ private static void triggerRebuild(ReconNamespaceSummaryManager reconNamespaceSu
    * @param url               url to call
    * @param isSpnego          is SPNEGO enabled
    * @return HttpURLConnection instance of the HTTP call.
-   * @throws IOException ioException,
-   * @throws AuthenticationException While reading the response.
+   * @throws IOException While reading the response,
+   * @throws AuthenticationException
    */
   public HttpURLConnection makeHttpCall(URLConnectionFactory connectionFactory,
                                         String url, boolean isSpnego)
@@ -369,7 +369,7 @@ public HttpURLConnection makeHttpCall(URLConnectionFactory connectionFactory,
    *
    * @param reconDbDir
    * @param fileNamePrefix
-   * @return File
+   * @return
    */
   public File getLastKnownDB(File reconDbDir, String fileNamePrefix) {
     String lastKnownSnapshotFileName = null;
diff --git a/hadoop-ozone/recon/src/main/java/org/apache/hadoop/ozone/recon/api/ContainerEndpoint.java b/hadoop-ozone/recon/src/main/java/org/apache/hadoop/ozone/recon/api/ContainerEndpoint.java
index dfc969656e7..c4d2d35bef9 100644
--- a/hadoop-ozone/recon/src/main/java/org/apache/hadoop/ozone/recon/api/ContainerEndpoint.java
+++ b/hadoop-ozone/recon/src/main/java/org/apache/hadoop/ozone/recon/api/ContainerEndpoint.java
@@ -157,15 +157,15 @@ public ContainerEndpoint(OzoneStorageContainerManager reconSCM,
   }
 
   /**
-   * Return {@link org.apache.hadoop.hdds.scm.container.ContainerInfo}
+   * Return {@linkplain org.apache.hadoop.hdds.scm.container}
    * for the containers starting from the given "prev-key" query param for the
    * given "limit". The given "prev-key" is skipped from the results returned.
    *
    * @param prevKey the containerID after which results are returned.
-   *                start containerID, &gt;=0,
+   *                start containerID, >=0,
    *                start searching at the head if 0.
    * @param limit   max no. of containers to get.
-   *                count must be &gt;= 0
+   *                count must be >= 0
    *                Usually the count will be replace with a very big
    *                value instead of being unlimited in case the db is very big.
    * @return {@link Response}
@@ -468,7 +468,6 @@ public Response getUnhealthyContainers(
 
   /**
    * This API will return all DELETED containers in SCM in below JSON format.
-   * <pre>
    * {
    * containers: [
    * {
@@ -487,7 +486,6 @@ public Response getUnhealthyContainers(
    * }
    * ]
    * }
-   * </pre>
    * @param limit limits the number of deleted containers
    * @param prevKey previous container Id to skip
    * @return Response of deleted containers.
diff --git a/hadoop-ozone/recon/src/main/java/org/apache/hadoop/ozone/recon/api/OMDBInsightEndpoint.java b/hadoop-ozone/recon/src/main/java/org/apache/hadoop/ozone/recon/api/OMDBInsightEndpoint.java
index 9dd74c10e1b..4620b69fbe3 100644
--- a/hadoop-ozone/recon/src/main/java/org/apache/hadoop/ozone/recon/api/OMDBInsightEndpoint.java
+++ b/hadoop-ozone/recon/src/main/java/org/apache/hadoop/ozone/recon/api/OMDBInsightEndpoint.java
@@ -734,7 +734,7 @@ public Response getDeletedDirectorySummary() {
    * /volume1/fso-bucket/dir1/dir2/dir3/file1
    * Input Request for OBS bucket:
    *
-   * {@literal `api/v1/keys/listKeys?startPrefix=/volume1/obs-bucket&limit=2&replicationType=RATIS`}
+   *    {@literal `api/v1/keys/listKeys?startPrefix=/volume1/obs-bucket&limit=2&replicationType=RATIS`}
    * Output Response:
    *
    * {
@@ -832,7 +832,7 @@ public Response getDeletedDirectorySummary() {
    * }
    * Input Request for FSO bucket:
    *
-   * {@literal `api/v1/keys/listKeys?startPrefix=/volume1/fso-bucket&limit=2&replicationType=RATIS`}
+   *        {@literal `api/v1/keys/listKeys?startPrefix=/volume1/fso-bucket&limit=2&replicationType=RATIS`}
    * Output Response:
    *
    * {
@@ -930,7 +930,6 @@ public Response getDeletedDirectorySummary() {
    * }
    *
    * ********************************************************
-   * @throws IOException
    */
   @GET
   @Path("/listKeys")
diff --git a/hadoop-ozone/recon/src/main/java/org/apache/hadoop/ozone/recon/tasks/OmUpdateEventValidator.java b/hadoop-ozone/recon/src/main/java/org/apache/hadoop/ozone/recon/tasks/OmUpdateEventValidator.java
index 3c7ce844e9c..b5a690f5eb4 100644
--- a/hadoop-ozone/recon/src/main/java/org/apache/hadoop/ozone/recon/tasks/OmUpdateEventValidator.java
+++ b/hadoop-ozone/recon/src/main/java/org/apache/hadoop/ozone/recon/tasks/OmUpdateEventValidator.java
@@ -23,7 +23,6 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import java.io.IOException;
 
 /**
  * OmUpdateEventValidator is a utility class for validating OMDBUpdateEvents
@@ -48,7 +47,6 @@ public OmUpdateEventValidator(OMDBDefinition omdbDefinition) {
    * @param keyType          the key type of the event.
    * @param action           the action performed on the event.
    * @return true if the event is valid, false otherwise.
-   * @throws IOException if an I/O error occurs during the validation.
    */
   public boolean isValidEvent(String tableName,
                               Object actualValueType,
diff --git a/hadoop-ozone/recon/src/main/resources/webapps/recon/ozone-recon-web/package.json b/hadoop-ozone/recon/src/main/resources/webapps/recon/ozone-recon-web/package.json
index 141cdadcbe8..c2c046f1120 100644
--- a/hadoop-ozone/recon/src/main/resources/webapps/recon/ozone-recon-web/package.json
+++ b/hadoop-ozone/recon/src/main/resources/webapps/recon/ozone-recon-web/package.json
@@ -73,7 +73,7 @@
     "msw": "1.3.3",
     "npm-run-all": "^4.1.5",
     "prettier": "^2.8.4",
-    "vite": "4.5.3",
+    "vite": "4.5.5",
     "vite-tsconfig-paths": "^3.6.0",
     "vitest": "^1.6.0"
   },
diff --git a/hadoop-ozone/recon/src/main/resources/webapps/recon/ozone-recon-web/pnpm-lock.yaml b/hadoop-ozone/recon/src/main/resources/webapps/recon/ozone-recon-web/pnpm-lock.yaml
index 3c472d5f790..7a9df21f636 100644
--- a/hadoop-ozone/recon/src/main/resources/webapps/recon/ozone-recon-web/pnpm-lock.yaml
+++ b/hadoop-ozone/recon/src/main/resources/webapps/recon/ozone-recon-web/pnpm-lock.yaml
@@ -87,7 +87,7 @@ devDependencies:
     version: 5.62.0(eslint@7.32.0)(typescript@4.9.5)
   '@vitejs/plugin-react-swc':
     specifier: ^3.5.0
-    version: 3.7.0(vite@4.5.3)
+    version: 3.7.0(vite@4.5.5)
   eslint:
     specifier: ^7.28.0
     version: 7.32.0
@@ -113,11 +113,11 @@ devDependencies:
     specifier: ^2.8.4
     version: 2.8.8
   vite:
-    specifier: 4.5.3
-    version: 4.5.3(less@3.13.1)
+    specifier: 4.5.5
+    version: 4.5.5(less@3.13.1)
   vite-tsconfig-paths:
     specifier: ^3.6.0
-    version: 3.6.0(vite@4.5.3)
+    version: 3.6.0(vite@4.5.5)
   vitest:
     specifier: ^1.6.0
     version: 1.6.0(jsdom@24.1.3)(less@3.13.1)
@@ -1464,13 +1464,13 @@ packages:
       eslint-visitor-keys: 3.4.3
     dev: true
 
-  /@vitejs/plugin-react-swc@3.7.0(vite@4.5.3):
+  /@vitejs/plugin-react-swc@3.7.0(vite@4.5.5):
     resolution: {integrity: sha512-yrknSb3Dci6svCd/qhHqhFPDSw0QtjumcqdKMoNNzmOl5lMXTTiqzjWtG4Qask2HdvvzaNgSunbQGet8/GrKdA==}
     peerDependencies:
       vite: ^4 || ^5
     dependencies:
       '@swc/core': 1.7.21
-      vite: 4.5.3(less@3.13.1)
+      vite: 4.5.5(less@3.13.1)
     transitivePeerDependencies:
       - '@swc/helpers'
     dev: true
@@ -1916,6 +1916,26 @@ packages:
       - supports-color
     dev: true
 
+  /body-parser@1.20.3:
+    resolution: {integrity: sha512-7rAxByjUMqQ3/bHJy7D6OGXvx/MMc4IqBn/X0fcM1QUcAItpZrBEYhWGem+tzXH90c+G01ypMcYJBO9Y30203g==}
+    engines: {node: '>= 0.8', npm: 1.2.8000 || >= 1.4.16}
+    dependencies:
+      bytes: 3.1.2
+      content-type: 1.0.5
+      debug: 2.6.9
+      depd: 2.0.0
+      destroy: 1.2.0
+      http-errors: 2.0.0
+      iconv-lite: 0.4.24
+      on-finished: 2.4.1
+      qs: 6.13.0
+      raw-body: 2.5.2
+      type-is: 1.6.18
+      unpipe: 1.0.0
+    transitivePeerDependencies:
+      - supports-color
+    dev: true
+
   /boxen@3.2.0:
     resolution: {integrity: sha512-cU4J/+NodM3IHdSL2yN8bqYqnmlBTidDR4RC7nJs61ZmtGz8VZzM3HLQX0zY5mrSmPtR3xWwsq2jOUQqFZN8+A==}
     engines: {node: '>=6'}
@@ -2601,6 +2621,11 @@ packages:
     engines: {node: '>= 0.8'}
     dev: true
 
+  /encodeurl@2.0.0:
+    resolution: {integrity: sha512-Q0n9HRi4m6JuGIV1eFlmvJB7ZEVxu93IrMyiMsGC0lrMJMWzRgx6WGquyfQgZVb31vhGgXnfmPNNXmxnOkRBrg==}
+    engines: {node: '>= 0.8'}
+    dev: true
+
   /end-of-stream@1.4.4:
     resolution: {integrity: sha512-+uw1inIHVPQoaVuHzRyXd21icM+cnt4CzD5rW+NC1wjOUSTOs+Te7FOv7AhN7vS9x/oIyhLP5PR1H+phQAHu5Q==}
     dependencies:
@@ -3025,36 +3050,36 @@ packages:
       - supports-color
     dev: true
 
-  /express@4.19.2:
-    resolution: {integrity: sha512-5T6nhjsT+EOMzuck8JjBHARTHfMht0POzlA60WV2pMD3gyXw2LZnZ+ueGdNxG+0calOJcWKbpFcuzLZ91YWq9Q==}
+  /express@4.21.0:
+    resolution: {integrity: sha512-VqcNGcj/Id5ZT1LZ/cfihi3ttTn+NJmkli2eZADigjq29qTlWi/hAQ43t/VLPq8+UX06FCEx3ByOYet6ZFblng==}
     engines: {node: '>= 0.10.0'}
     dependencies:
       accepts: 1.3.8
       array-flatten: 1.1.1
-      body-parser: 1.20.2
+      body-parser: 1.20.3
       content-disposition: 0.5.4
       content-type: 1.0.5
       cookie: 0.6.0
       cookie-signature: 1.0.6
       debug: 2.6.9
       depd: 2.0.0
-      encodeurl: 1.0.2
+      encodeurl: 2.0.0
       escape-html: 1.0.3
       etag: 1.8.1
-      finalhandler: 1.2.0
+      finalhandler: 1.3.1
       fresh: 0.5.2
       http-errors: 2.0.0
-      merge-descriptors: 1.0.1
+      merge-descriptors: 1.0.3
       methods: 1.1.2
       on-finished: 2.4.1
       parseurl: 1.3.3
-      path-to-regexp: 0.1.7
+      path-to-regexp: 0.1.10
       proxy-addr: 2.0.7
-      qs: 6.11.0
+      qs: 6.13.0
       range-parser: 1.2.1
       safe-buffer: 5.2.1
-      send: 0.18.0
-      serve-static: 1.15.0
+      send: 0.19.0
+      serve-static: 1.16.2
       setprototypeof: 1.2.0
       statuses: 2.0.1
       type-is: 1.6.18
@@ -3145,12 +3170,12 @@ packages:
       to-regex-range: 5.0.1
     dev: true
 
-  /finalhandler@1.2.0:
-    resolution: {integrity: sha512-5uXcUVftlQMFnWC9qu/svkWv3GTd2PfUhK/3PLkYNAe7FbqJMt3515HaxE6eRL74GdsriiwujiawdaB1BpEISg==}
+  /finalhandler@1.3.1:
+    resolution: {integrity: sha512-6BN9trH7bp3qvnrRyzsBz+g3lZxTNZTbVO2EV1CS0WIcDbawYVdYvGflME/9QP0h0pYlCDBCTjYa9nZzMDpyxQ==}
     engines: {node: '>= 0.8'}
     dependencies:
       debug: 2.6.9
-      encodeurl: 1.0.2
+      encodeurl: 2.0.0
       escape-html: 1.0.3
       on-finished: 2.4.1
       parseurl: 1.3.3
@@ -4085,7 +4110,7 @@ packages:
       connect-pause: 0.1.1
       cors: 2.8.5
       errorhandler: 1.5.1
-      express: 4.19.2
+      express: 4.21.0
       express-urlrewrite: 1.4.0
       json-parse-helpfulerror: 1.0.3
       lodash: 4.17.21
@@ -4316,8 +4341,8 @@ packages:
     engines: {node: '>= 0.10.0'}
     dev: true
 
-  /merge-descriptors@1.0.1:
-    resolution: {integrity: sha512-cCi6g3/Zr1iqQi6ySbseM1Xvooa98N0w31jzUYrXPX2xqObmFGHJ0tQ5u74H3mVh7wLouTseZyYIq39g8cNp1w==}
+  /merge-descriptors@1.0.3:
+    resolution: {integrity: sha512-gaNvAS7TZ897/rVaZ0nMtAyxNyi/pdbjbAwUpFQpN70GqnVfOiXpeUUMKRBmzXaSQ8DdTX4/0ms62r2K+hE6mQ==}
     dev: true
 
   /merge-stream@2.0.0:
@@ -4851,8 +4876,8 @@ packages:
       minipass: 7.1.2
     dev: true
 
-  /path-to-regexp@0.1.7:
-    resolution: {integrity: sha512-5DFkuoqlv1uYQKxy8omFBeJPQcdoE07Kv2sferDCrAq1ohOU+MSDswDIbnx3YAM60qIOnYa53wBhXW0EbMonrQ==}
+  /path-to-regexp@0.1.10:
+    resolution: {integrity: sha512-7lf7qcQidTku0Gu3YDPc8DJ1q7OOucfa/BSsIwjuh56VU7katFvuM8hULfkwB3Fns/rsVF7PwPKVw1sl5KQS9w==}
     dev: true
 
   /path-to-regexp@1.8.0:
@@ -5054,6 +5079,13 @@ packages:
       side-channel: 1.0.6
     dev: true
 
+  /qs@6.13.0:
+    resolution: {integrity: sha512-+38qI9SOr8tfZ4QmJNplMUxqjbe7LKvvZgWdExBOmd+egZTtjLB67Gu0HRX3u/XOq7UU2Nx6nsjvS16Z9uwfpg==}
+    engines: {node: '>=0.6'}
+    dependencies:
+      side-channel: 1.0.6
+    dev: true
+
   /qs@6.5.3:
     resolution: {integrity: sha512-qxXIEh4pCGfHICj1mAJQ2/2XVZkjCDTcEgfoSQxc/fYivUZxTkk7L3bDBJSoNrEzXI17oUO5Dp07ktqE5KzczA==}
     engines: {node: '>=0.6'}
@@ -5991,8 +6023,8 @@ packages:
     hasBin: true
     dev: true
 
-  /send@0.18.0:
-    resolution: {integrity: sha512-qqWzuOjSFOuqPjFe4NOsMLafToQQwBSOEpS+FwEt3A2V3vKubTquT3vmLTQpFgMXp8AlFWFuP1qKaJZOtPpVXg==}
+  /send@0.19.0:
+    resolution: {integrity: sha512-dW41u5VfLXu8SJh5bwRmyYUbAoSB3c9uQh6L8h/KtsFREPWpbX1lrljJo186Jc4nmci/sGUZ9a0a0J2zgfq2hw==}
     engines: {node: '>= 0.8.0'}
     dependencies:
       debug: 2.6.9
@@ -6012,14 +6044,14 @@ packages:
       - supports-color
     dev: true
 
-  /serve-static@1.15.0:
-    resolution: {integrity: sha512-XGuRDNjXUijsUL0vl6nSD7cwURuzEgglbOaFuZM9g3kwDXOWVTck0jLzjPzGD+TazWbboZYu52/9/XPdUgne9g==}
+  /serve-static@1.16.2:
+    resolution: {integrity: sha512-VqpjJZKadQB/PEbEwvFdO43Ax5dFBZ2UECszz8bQ7pi7wt//PWe1P6MN7eCnjsatYtBT6EuiClbjSWP2WrIoTw==}
     engines: {node: '>= 0.8.0'}
     dependencies:
-      encodeurl: 1.0.2
+      encodeurl: 2.0.0
       escape-html: 1.0.3
       parseurl: 1.3.3
-      send: 0.18.0
+      send: 0.19.0
     transitivePeerDependencies:
       - supports-color
     dev: true
@@ -6812,7 +6844,7 @@ packages:
       - terser
     dev: true
 
-  /vite-tsconfig-paths@3.6.0(vite@4.5.3):
+  /vite-tsconfig-paths@3.6.0(vite@4.5.5):
     resolution: {integrity: sha512-UfsPYonxLqPD633X8cWcPFVuYzx/CMNHAjZTasYwX69sXpa4gNmQkR0XCjj82h7zhLGdTWagMjC1qfb9S+zv0A==}
     peerDependencies:
       vite: '>2.0.0-0'
@@ -6821,13 +6853,13 @@ packages:
       globrex: 0.1.2
       recrawl-sync: 2.2.3
       tsconfig-paths: 4.2.0
-      vite: 4.5.3(less@3.13.1)
+      vite: 4.5.5(less@3.13.1)
     transitivePeerDependencies:
       - supports-color
     dev: true
 
-  /vite@4.5.3(less@3.13.1):
-    resolution: {integrity: sha512-kQL23kMeX92v3ph7IauVkXkikdDRsYMGTVl5KY2E9OY4ONLvkHf04MDTbnfo6NKxZiDLWzVpP5oTa8hQD8U3dg==}
+  /vite@4.5.5(less@3.13.1):
+    resolution: {integrity: sha512-ifW3Lb2sMdX+WU91s3R0FyQlAyLxOzCSCP37ujw0+r5POeHPwe6udWVIElKQq8gk3t7b8rkmvqC6IHBpCff4GQ==}
     engines: {node: ^14.18.0 || >=16.0.0}
     hasBin: true
     peerDependencies:
diff --git a/hadoop-ozone/s3gateway/src/main/java/org/apache/hadoop/ozone/s3/endpoint/BucketEndpoint.java b/hadoop-ozone/s3gateway/src/main/java/org/apache/hadoop/ozone/s3/endpoint/BucketEndpoint.java
index 1b845c79aeb..a705420ca35 100644
--- a/hadoop-ozone/s3gateway/src/main/java/org/apache/hadoop/ozone/s3/endpoint/BucketEndpoint.java
+++ b/hadoop-ozone/s3gateway/src/main/java/org/apache/hadoop/ozone/s3/endpoint/BucketEndpoint.java
@@ -69,6 +69,7 @@
 import java.util.Iterator;
 import java.util.List;
 import java.util.Map;
+import java.util.Objects;
 import java.util.Set;
 
 import static org.apache.hadoop.ozone.OzoneConsts.ETAG;
@@ -221,6 +222,9 @@ public Response get(
         // example prefix: dir1/ key: dir123
         continue;
       }
+      if (startAfter != null && count == 0 && Objects.equals(startAfter, next.getName())) {
+        continue;
+      }
       String relativeKeyName = next.getName().substring(prefix.length());
 
       int depth = StringUtils.countMatches(relativeKeyName, delimiter);
diff --git a/hadoop-ozone/s3gateway/src/main/java/org/apache/hadoop/ozone/s3/signature/Credential.java b/hadoop-ozone/s3gateway/src/main/java/org/apache/hadoop/ozone/s3/signature/Credential.java
index be9ecce7c0f..2746de8e5c4 100644
--- a/hadoop-ozone/s3gateway/src/main/java/org/apache/hadoop/ozone/s3/signature/Credential.java
+++ b/hadoop-ozone/s3gateway/src/main/java/org/apache/hadoop/ozone/s3/signature/Credential.java
@@ -17,7 +17,6 @@
  */
 package org.apache.hadoop.ozone.s3.signature;
 
-import org.apache.hadoop.ozone.s3.exception.OS3Exception;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -53,7 +52,7 @@ public class Credential {
    * Sample credential value:
    * Credential=AKIAIOSFODNN7EXAMPLE/20130524/us-east-1/s3/aws4_request
    *
-   * @throws OS3Exception
+   * @throws MalformedResourceException
    */
   @SuppressWarnings("StringSplitter")
   public void parseCredential() throws MalformedResourceException {
diff --git a/hadoop-ozone/tools/src/main/java/org/apache/hadoop/ozone/admin/nssummary/NSSummaryAdmin.java b/hadoop-ozone/tools/src/main/java/org/apache/hadoop/ozone/admin/nssummary/NSSummaryAdmin.java
index 991099f2702..46a311e3546 100644
--- a/hadoop-ozone/tools/src/main/java/org/apache/hadoop/ozone/admin/nssummary/NSSummaryAdmin.java
+++ b/hadoop-ozone/tools/src/main/java/org/apache/hadoop/ozone/admin/nssummary/NSSummaryAdmin.java
@@ -108,7 +108,6 @@ private boolean isObjectStoreBucket(OzoneBucket bucket, ObjectStore objectStore)
    * Returns false if bucket is part of path but not a OBS bucket.
    * @param path
    * @return true if bucket is OBS bucket or not part of provided path.
-   * @throws IOException
    */
   public boolean isNotValidBucketOrOBSBucket(String path) {
     OFSPath ofsPath = new OFSPath(path,
diff --git a/hadoop-ozone/tools/src/main/java/org/apache/hadoop/ozone/fsck/ContainerMapper.java b/hadoop-ozone/tools/src/main/java/org/apache/hadoop/ozone/fsck/ContainerMapper.java
index b8bb94dcc91..76ac3144d45 100644
--- a/hadoop-ozone/tools/src/main/java/org/apache/hadoop/ozone/fsck/ContainerMapper.java
+++ b/hadoop-ozone/tools/src/main/java/org/apache/hadoop/ozone/fsck/ContainerMapper.java
@@ -68,7 +68,7 @@ public static void main(String[] args) throws IOException {
    * Generates Container Id to Blocks and BlockDetails mapping.
    * @param configuration @{@link OzoneConfiguration}
    * @return {@code Map<Long, List<Map<Long, @BlockDetails>>>}
-   *   Map of ContainerId -&gt; (Block, Block info)
+   *   Map of ContainerId -> (Block, Block info)
    * @throws IOException
    */
   public Map<Long, List<Map<Long, BlockIdDetails>>>
diff --git a/hadoop-ozone/tools/src/main/java/org/apache/hadoop/ozone/shell/checknative/CheckNative.java b/hadoop-ozone/tools/src/main/java/org/apache/hadoop/ozone/shell/checknative/CheckNative.java
index 63b2b425c64..f19548a1fa7 100644
--- a/hadoop-ozone/tools/src/main/java/org/apache/hadoop/ozone/shell/checknative/CheckNative.java
+++ b/hadoop-ozone/tools/src/main/java/org/apache/hadoop/ozone/shell/checknative/CheckNative.java
@@ -19,10 +19,15 @@
 package org.apache.hadoop.ozone.shell.checknative;
 
 import org.apache.hadoop.hdds.cli.GenericCli;
+import org.apache.hadoop.hdds.utils.NativeLibraryLoader;
+import org.apache.hadoop.hdds.utils.db.managed.ManagedRocksObjectUtils;
 import org.apache.hadoop.io.erasurecode.ErasureCodeNative;
-import org.apache.hadoop.util.NativeCodeLoader;
 import picocli.CommandLine;
 
+import java.util.Collections;
+
+import static org.apache.hadoop.hdds.utils.NativeConstants.ROCKS_TOOLS_NATIVE_LIBRARY_NAME;
+
 /**
  * CLI command to check if native libraries are loaded.
  */
@@ -36,12 +41,12 @@ public static void main(String[] argv) {
 
   @Override
   public Void call() throws Exception {
-    boolean nativeHadoopLoaded = NativeCodeLoader.isNativeCodeLoaded();
+    boolean nativeHadoopLoaded = org.apache.hadoop.util.NativeCodeLoader.isNativeCodeLoaded();
     String hadoopLibraryName = "";
     String isalDetail = "";
     boolean isalLoaded = false;
     if (nativeHadoopLoaded) {
-      hadoopLibraryName = NativeCodeLoader.getLibraryName();
+      hadoopLibraryName = org.apache.hadoop.util.NativeCodeLoader.getLibraryName();
 
       isalDetail = ErasureCodeNative.getLoadingFailureReason();
       if (isalDetail != null) {
@@ -50,12 +55,21 @@ public Void call() throws Exception {
         isalDetail = ErasureCodeNative.getLibraryName();
         isalLoaded = true;
       }
-
     }
     System.out.println("Native library checking:");
     System.out.printf("hadoop:  %b %s%n", nativeHadoopLoaded,
         hadoopLibraryName);
     System.out.printf("ISA-L:   %b %s%n", isalLoaded, isalDetail);
+
+    // Attempt to load the rocks-tools lib
+    boolean nativeRocksToolsLoaded = NativeLibraryLoader.getInstance().loadLibrary(
+        ROCKS_TOOLS_NATIVE_LIBRARY_NAME,
+        Collections.singletonList(ManagedRocksObjectUtils.getRocksDBLibFileName()));
+    String rocksToolsDetail = "";
+    if (nativeRocksToolsLoaded) {
+      rocksToolsDetail = NativeLibraryLoader.getJniLibraryFileName();
+    }
+    System.out.printf("rocks-tools: %b %s%n", nativeRocksToolsLoaded, rocksToolsDetail);
     return null;
   }
 }
diff --git a/hadoop-ozone/tools/src/test/java/org/apache/hadoop/ozone/checknative/TestCheckNative.java b/hadoop-ozone/tools/src/test/java/org/apache/hadoop/ozone/checknative/TestCheckNative.java
index 8e291056330..0dc1fde57fa 100644
--- a/hadoop-ozone/tools/src/test/java/org/apache/hadoop/ozone/checknative/TestCheckNative.java
+++ b/hadoop-ozone/tools/src/test/java/org/apache/hadoop/ozone/checknative/TestCheckNative.java
@@ -19,6 +19,7 @@
 package org.apache.hadoop.ozone.checknative;
 
 import org.apache.hadoop.ozone.shell.checknative.CheckNative;
+import org.apache.ozone.test.tag.Native;
 import org.junit.jupiter.api.BeforeAll;
 import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.AfterAll;
@@ -27,6 +28,7 @@
 import java.io.PrintStream;
 import java.io.UnsupportedEncodingException;
 
+import static org.apache.hadoop.hdds.utils.NativeConstants.ROCKS_TOOLS_NATIVE_LIBRARY_NAME;
 import static org.assertj.core.api.Assertions.assertThat;
 import static java.nio.charset.StandardCharsets.UTF_8;
 
@@ -59,6 +61,22 @@ public void testCheckNativeNotLoaded() throws UnsupportedEncodingException {
     assertThat(stdOut).contains("Native library checking:");
     assertThat(stdOut).contains("hadoop: false");
     assertThat(stdOut).contains("ISA-L: false");
+    assertThat(stdOut).contains("rocks-tools: false");
+  }
+
+  @Native(ROCKS_TOOLS_NATIVE_LIBRARY_NAME)
+  @Test
+  public void testCheckNativeRocksToolsLoaded() throws UnsupportedEncodingException {
+    outputStream.reset();
+    new CheckNative()
+        .run(new String[] {});
+    // trims multiple spaces
+    String stdOut = outputStream.toString(DEFAULT_ENCODING)
+        .replaceAll(" +", " ");
+    assertThat(stdOut).contains("Native library checking:");
+    assertThat(stdOut).contains("hadoop: false");
+    assertThat(stdOut).contains("ISA-L: false");
+    assertThat(stdOut).contains("rocks-tools: true");
   }
 
   @AfterEach
diff --git a/pom.xml b/pom.xml
index 72668f952a3..196695d90ba 100644
--- a/pom.xml
+++ b/pom.xml
@@ -114,7 +114,7 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xs
     <commons-codec.version>1.17.0</commons-codec.version>
     <commons-collections.version>3.2.2</commons-collections.version>
     <commons-compress.version>1.27.1</commons-compress.version>
-    <commons-configuration2.version>2.10.1</commons-configuration2.version>
+    <commons-configuration2.version>2.11.0</commons-configuration2.version>
     <zstd-jni.version>1.5.6-4</zstd-jni.version>
     <commons-daemon.version>1.4.0</commons-daemon.version>
     <commons-io.version>2.16.1</commons-io.version>
@@ -232,7 +232,7 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xs
     <io.grpc.version>1.58.0</io.grpc.version>
 
     <rocksdb.version>7.7.3</rocksdb.version>
-    <sqlite.version>3.46.1.0</sqlite.version>
+    <sqlite.version>3.46.1.3</sqlite.version>
     <weld-servlet.version>3.1.9.Final</weld-servlet.version>
 
     <!-- define the Java language version used by the compiler -->
@@ -278,7 +278,7 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xs
     <make-maven-plugin.version>1.0-beta-1</make-maven-plugin.version>
     <native-maven-plugin.version>1.0-M1</native-maven-plugin.version>
     <maven-checkstyle-plugin.version>3.4.0</maven-checkstyle-plugin.version>
-    <maven-site-plugin.version>3.12.1</maven-site-plugin.version>
+    <maven-site-plugin.version>3.20.0</maven-site-plugin.version>
     <maven-antrun-plugin.version>3.1.0</maven-antrun-plugin.version>
     <checkstyle.version>9.3</checkstyle.version>
     <surefire.fork.timeout>1200</surefire.fork.timeout>

From 6a351555e6281a60164a6fdbc551aff844790f25 Mon Sep 17 00:00:00 2001
From: daniilchik <dprizva55@gmail.com>
Date: Sun, 29 Sep 2024 15:31:49 +0300
Subject: [PATCH 44/50] HDDS-11484. Add check for javadoc correctness

---
 .../java/org/apache/hadoop/hdds/server/http/ProfileServlet.java  | 1 +
 1 file changed, 1 insertion(+)

diff --git a/hadoop-hdds/framework/src/main/java/org/apache/hadoop/hdds/server/http/ProfileServlet.java b/hadoop-hdds/framework/src/main/java/org/apache/hadoop/hdds/server/http/ProfileServlet.java
index 5ca32c9d407..fe05fedc228 100644
--- a/hadoop-hdds/framework/src/main/java/org/apache/hadoop/hdds/server/http/ProfileServlet.java
+++ b/hadoop-hdds/framework/src/main/java/org/apache/hadoop/hdds/server/http/ProfileServlet.java
@@ -112,6 +112,7 @@
  * The default output format of the newest async profiler is HTML.
  * If the user is using an older version such as 1.5, HTML is not supported.
  * Please specify the corresponding output format.
+ * </pre>
  */
 public class ProfileServlet extends HttpServlet {
   private static final long serialVersionUID = 1L;

From c2a3c375eec0bfc3a6bdd08c45af9a6a1472b9f6 Mon Sep 17 00:00:00 2001
From: daniilchik <dprizva55@gmail.com>
Date: Sun, 29 Sep 2024 17:55:19 +0300
Subject: [PATCH 45/50] HDDS-11484. Add check for javadoc correctness

---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 196695d90ba..35a18f79ac6 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1892,7 +1892,7 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xs
             <groupId>org.apache.maven.plugins</groupId>
             <artifactId>maven-javadoc-plugin</artifactId>
             <configuration>
-              <failOnWarnings>false</failOnWarnings>
+              <failOnWarnings>true</failOnWarnings>
             </configuration>
             <executions>
               <execution>

From 5dbfca8d4ec0dc2ab9664f4575c8995757c6800a Mon Sep 17 00:00:00 2001
From: daniilchik <dprizva55@gmail.com>
Date: Sun, 29 Sep 2024 18:10:17 +0300
Subject: [PATCH 46/50] HDDS-11484. Add check for javadoc correctness

---
 .../ozone/upgrade/LayoutVersionInstanceFactory.java       | 2 ++
 .../hadoop/ozone/container/common/volume/VolumeInfo.java  | 5 ++++-
 .../container/keyvalue/helpers/KeyValueContainerUtil.java | 1 -
 .../apache/hadoop/hdds/server/http/ProfileServlet.java    | 2 +-
 .../apache/hadoop/hdds/scm/SCMCommonPlacementPolicy.java  | 8 ++++----
 .../apache/hadoop/ozone/recon/api/ContainerEndpoint.java  | 6 +++---
 .../org/apache/hadoop/ozone/fsck/ContainerMapper.java     | 4 ++--
 7 files changed, 16 insertions(+), 12 deletions(-)

diff --git a/hadoop-hdds/common/src/main/java/org/apache/hadoop/ozone/upgrade/LayoutVersionInstanceFactory.java b/hadoop-hdds/common/src/main/java/org/apache/hadoop/ozone/upgrade/LayoutVersionInstanceFactory.java
index e528425453d..6b461e5059c 100644
--- a/hadoop-hdds/common/src/main/java/org/apache/hadoop/ozone/upgrade/LayoutVersionInstanceFactory.java
+++ b/hadoop-hdds/common/src/main/java/org/apache/hadoop/ozone/upgrade/LayoutVersionInstanceFactory.java
@@ -136,6 +136,7 @@ private boolean isValid(LayoutVersionManager lvm, int version) {
   }
 
   /**
+   * <pre>
    * From the list of versioned instances for a given "key", this
    * returns the "floor" value corresponding to the given version.
    * For example, if we have key = "CreateKey",  entry -> [(1, CreateKeyV1),
@@ -143,6 +144,7 @@ private boolean isValid(LayoutVersionManager lvm, int version) {
    * return CreateKeyV1.
    * Since this is a priority queue based implementation, we use a O(1) peek()
    * lookup to get the current valid version.
+   * </pre>
    * @param lvm LayoutVersionManager
    * @param key Key and Version.
    * @return instance.
diff --git a/hadoop-hdds/container-service/src/main/java/org/apache/hadoop/ozone/container/common/volume/VolumeInfo.java b/hadoop-hdds/container-service/src/main/java/org/apache/hadoop/ozone/container/common/volume/VolumeInfo.java
index a7e7b752ee2..8e2d0910342 100644
--- a/hadoop-hdds/container-service/src/main/java/org/apache/hadoop/ozone/container/common/volume/VolumeInfo.java
+++ b/hadoop-hdds/container-service/src/main/java/org/apache/hadoop/ozone/container/common/volume/VolumeInfo.java
@@ -57,7 +57,7 @@
  *              |     fsAvail      |-------other-----------|
  * |<-                   fsCapacity                      ->|
  * }</pre>
- *
+ * <pre>
  * What we could directly get from local fs:
  *     fsCapacity, fsAvail, (fsUsed = fsCapacity - fsAvail)
  * We could get from config:
@@ -85,6 +85,7 @@
  *  |<-              capacity/fsCapacity                  ->|
  *
  *  We have avail == fsAvail.
+ *  </pre>
  */
 public final class VolumeInfo {
 
@@ -155,11 +156,13 @@ public long getCapacity() {
   }
 
   /**
+   * <pre>
    * Calculate available space use method A.
    * |----used----|   (avail)   |++++++++reserved++++++++|
    * |<-     capacity         ->|
    *
    * A) avail = capacity - used
+   * </pre>
    */
   public long getAvailable() {
     return usage.getAvailable();
diff --git a/hadoop-hdds/container-service/src/main/java/org/apache/hadoop/ozone/container/keyvalue/helpers/KeyValueContainerUtil.java b/hadoop-hdds/container-service/src/main/java/org/apache/hadoop/ozone/container/keyvalue/helpers/KeyValueContainerUtil.java
index 37da1ea3d8b..691ccaa630d 100644
--- a/hadoop-hdds/container-service/src/main/java/org/apache/hadoop/ozone/container/keyvalue/helpers/KeyValueContainerUtil.java
+++ b/hadoop-hdds/container-service/src/main/java/org/apache/hadoop/ozone/container/keyvalue/helpers/KeyValueContainerUtil.java
@@ -460,7 +460,6 @@ public static boolean isSameSchemaVersion(String schema, String other) {
    * 5. Container is deleted from tmp directory.
    *
    * @param keyValueContainerData
-   * @return true if renaming was successful
    */
   public static void moveToDeletedContainerDir(
       KeyValueContainerData keyValueContainerData,
diff --git a/hadoop-hdds/framework/src/main/java/org/apache/hadoop/hdds/server/http/ProfileServlet.java b/hadoop-hdds/framework/src/main/java/org/apache/hadoop/hdds/server/http/ProfileServlet.java
index fe05fedc228..bceec92c6c8 100644
--- a/hadoop-hdds/framework/src/main/java/org/apache/hadoop/hdds/server/http/ProfileServlet.java
+++ b/hadoop-hdds/framework/src/main/java/org/apache/hadoop/hdds/server/http/ProfileServlet.java
@@ -80,7 +80,7 @@
  * curl "http://localhost:10002/prof"
  * - To collect 1 minute CPU profile of current process and output in tree
  * format (html)
- * curl "http://localhost:10002/prof?output=tree&duration=60"
+ * curl "http://localhost:10002/prof?output=tree&amp;duration=60"
  * - To collect 30 second heap allocation profile of current process (returns
  * FlameGraph svg)
  * curl "http://localhost:10002/prof?event=alloc"
diff --git a/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/SCMCommonPlacementPolicy.java b/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/SCMCommonPlacementPolicy.java
index 471a9479412..fabd2810764 100644
--- a/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/SCMCommonPlacementPolicy.java
+++ b/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/SCMCommonPlacementPolicy.java
@@ -582,7 +582,7 @@ protected Node getPlacementGroup(DatanodeDetails dn) {
    * replication is computed.
    * The algorithm starts with creating a replicaIdMap which contains the
    * replicas grouped by replica Index. A placementGroup Map is created which
-   * groups replicas based on their rack & the replicas within the rack
+   * groups replicas based on their rack and the replicas within the rack
    * are further grouped based on the replica Index.
    * A placement Group Count Map is created which keeps
    * track of the count of replicas in each rack.
@@ -590,9 +590,9 @@ protected Node getPlacementGroup(DatanodeDetails dn) {
    * order based on their current replication factor in a descending factor.
    * For each replica Index the replica is removed from the rack which contains
    * the most replicas, in order to achieve this the racks are put
-   * into priority queue & are based on the number of replicas they have.
-   * The replica is removed from the rack with maximum replicas & the replica
-   * to be removed is also removed from the maps created above &
+   * into priority queue and are based on the number of replicas they have.
+   * The replica is removed from the rack with maximum replicas and the replica
+   * to be removed is also removed from the maps created above and
    * the count for rack is reduced.
    * The set of replicas computed are then returned by the function.
    * @param replicas: Set of existing replicas of the container
diff --git a/hadoop-ozone/recon/src/main/java/org/apache/hadoop/ozone/recon/api/ContainerEndpoint.java b/hadoop-ozone/recon/src/main/java/org/apache/hadoop/ozone/recon/api/ContainerEndpoint.java
index c4d2d35bef9..acb96c51d8b 100644
--- a/hadoop-ozone/recon/src/main/java/org/apache/hadoop/ozone/recon/api/ContainerEndpoint.java
+++ b/hadoop-ozone/recon/src/main/java/org/apache/hadoop/ozone/recon/api/ContainerEndpoint.java
@@ -157,15 +157,15 @@ public ContainerEndpoint(OzoneStorageContainerManager reconSCM,
   }
 
   /**
-   * Return {@linkplain org.apache.hadoop.hdds.scm.container}
+   * Return {@link org.apache.hadoop.hdds.scm.container}
    * for the containers starting from the given "prev-key" query param for the
    * given "limit". The given "prev-key" is skipped from the results returned.
    *
    * @param prevKey the containerID after which results are returned.
-   *                start containerID, >=0,
+   *                start containerID, &gt;=0,
    *                start searching at the head if 0.
    * @param limit   max no. of containers to get.
-   *                count must be >= 0
+   *                count must be &gt;= 0
    *                Usually the count will be replace with a very big
    *                value instead of being unlimited in case the db is very big.
    * @return {@link Response}
diff --git a/hadoop-ozone/tools/src/main/java/org/apache/hadoop/ozone/fsck/ContainerMapper.java b/hadoop-ozone/tools/src/main/java/org/apache/hadoop/ozone/fsck/ContainerMapper.java
index 76ac3144d45..b0ac5b0033e 100644
--- a/hadoop-ozone/tools/src/main/java/org/apache/hadoop/ozone/fsck/ContainerMapper.java
+++ b/hadoop-ozone/tools/src/main/java/org/apache/hadoop/ozone/fsck/ContainerMapper.java
@@ -67,8 +67,8 @@ public static void main(String[] args) throws IOException {
   /**
    * Generates Container Id to Blocks and BlockDetails mapping.
    * @param configuration @{@link OzoneConfiguration}
-   * @return {@code Map<Long, List<Map<Long, @BlockDetails>>>}
-   *   Map of ContainerId -> (Block, Block info)
+   * @return {@code Map<Long, List<Map<Long, BlockDetails>>>
+   *   Map of ContainerId -> (Block, Block info)}
    * @throws IOException
    */
   public Map<Long, List<Map<Long, BlockIdDetails>>>

From 22697d34fc514be5a2c2e74e4ad5cfb48b6993e7 Mon Sep 17 00:00:00 2001
From: daniilchik <dprizva55@gmail.com>
Date: Sun, 29 Sep 2024 19:01:49 +0300
Subject: [PATCH 47/50] HDDS-11484. Add check for javadoc correctness

---
 .../hadoop/ozone/upgrade/LayoutVersionInstanceFactory.java  | 6 +++---
 .../hadoop/ozone/container/common/volume/VolumeInfo.java    | 6 ++++--
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/hadoop-hdds/common/src/main/java/org/apache/hadoop/ozone/upgrade/LayoutVersionInstanceFactory.java b/hadoop-hdds/common/src/main/java/org/apache/hadoop/ozone/upgrade/LayoutVersionInstanceFactory.java
index 6b461e5059c..b94dd024b2d 100644
--- a/hadoop-hdds/common/src/main/java/org/apache/hadoop/ozone/upgrade/LayoutVersionInstanceFactory.java
+++ b/hadoop-hdds/common/src/main/java/org/apache/hadoop/ozone/upgrade/LayoutVersionInstanceFactory.java
@@ -69,7 +69,7 @@ public class LayoutVersionInstanceFactory<T> {
   /**
    * Register an instance with a given factory key (key + version).
    * For safety reasons we dont allow (1) re-registering, (2) registering an
-   * instance with version > SLV.
+   * instance with version &gt; SLV.
    *
    * @param lvm LayoutVersionManager
    * @param key VersionFactoryKey key to associate with instance.
@@ -139,8 +139,8 @@ private boolean isValid(LayoutVersionManager lvm, int version) {
    * <pre>
    * From the list of versioned instances for a given "key", this
    * returns the "floor" value corresponding to the given version.
-   * For example, if we have key = "CreateKey",  entry -> [(1, CreateKeyV1),
-   * (3, CreateKeyV2), and if the passed in key = CreateKey & version = 2, we
+   * For example, if we have key = "CreateKey",  entry -&gt; [(1, CreateKeyV1),
+   * (3, CreateKeyV2), and if the passed in key = CreateKey &amp; version = 2, we
    * return CreateKeyV1.
    * Since this is a priority queue based implementation, we use a O(1) peek()
    * lookup to get the current valid version.
diff --git a/hadoop-hdds/container-service/src/main/java/org/apache/hadoop/ozone/container/common/volume/VolumeInfo.java b/hadoop-hdds/container-service/src/main/java/org/apache/hadoop/ozone/container/common/volume/VolumeInfo.java
index 8e2d0910342..3d1be9791ec 100644
--- a/hadoop-hdds/container-service/src/main/java/org/apache/hadoop/ozone/container/common/volume/VolumeInfo.java
+++ b/hadoop-hdds/container-service/src/main/java/org/apache/hadoop/ozone/container/common/volume/VolumeInfo.java
@@ -80,9 +80,10 @@
  * then we should use DedicatedDiskSpaceUsage for
  * `hdds.datanode.du.factory.classname`,
  * Then it is much simpler, since we don't care about other usage:
- *
+ * {@code
  *  |----used----|             (avail)/fsAvail              |
  *  |<-              capacity/fsCapacity                  ->|
+ * }
  *
  *  We have avail == fsAvail.
  *  </pre>
@@ -157,11 +158,12 @@ public long getCapacity() {
 
   /**
    * <pre>
+   * {@code
    * Calculate available space use method A.
    * |----used----|   (avail)   |++++++++reserved++++++++|
    * |<-     capacity         ->|
-   *
    * A) avail = capacity - used
+   * }
    * </pre>
    */
   public long getAvailable() {

From 12523ebabb4688f6c3031d65fa20f9e319b2bb11 Mon Sep 17 00:00:00 2001
From: daniilchik <dprizva55@gmail.com>
Date: Sun, 29 Sep 2024 19:11:59 +0300
Subject: [PATCH 48/50] HDDS-11484. Add check for javadoc correctness

---
 pom.xml | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/pom.xml b/pom.xml
index 35a18f79ac6..2180d0af257 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1891,9 +1891,6 @@ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xs
           <plugin>
             <groupId>org.apache.maven.plugins</groupId>
             <artifactId>maven-javadoc-plugin</artifactId>
-            <configuration>
-              <failOnWarnings>true</failOnWarnings>
-            </configuration>
             <executions>
               <execution>
                 <!-- build javadoc jars per jar for publishing to maven -->

From 97160fddbefc744e7ccad801b56fc1efddfebda4 Mon Sep 17 00:00:00 2001
From: daniilchik <dprizva55@gmail.com>
Date: Sun, 29 Sep 2024 19:12:47 +0300
Subject: [PATCH 49/50] HHDS-11484. Add check for javadoc correctness


From be2eb270648cfd7dcef51d7c628123f422468bc9 Mon Sep 17 00:00:00 2001
From: daniilchik <dprizva55@gmail.com>
Date: Sun, 29 Sep 2024 20:42:22 +0300
Subject: [PATCH 50/50] HDDS-11484. Add check for javadoc correctness

---
 .../java/org/apache/hadoop/hdds/utils/HddsServerUtil.java   | 2 +-
 .../apache/hadoop/hdds/scm/SCMCommonPlacementPolicy.java    | 6 +++---
 .../apache/hadoop/ozone/om/helpers/RepeatedOmKeyInfo.java   | 4 +---
 .../apache/hadoop/ozone/recon/api/ContainerEndpoint.java    | 2 +-
 4 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/hadoop-hdds/framework/src/main/java/org/apache/hadoop/hdds/utils/HddsServerUtil.java b/hadoop-hdds/framework/src/main/java/org/apache/hadoop/hdds/utils/HddsServerUtil.java
index 41fea63d205..94e9dceb6a7 100644
--- a/hadoop-hdds/framework/src/main/java/org/apache/hadoop/hdds/utils/HddsServerUtil.java
+++ b/hadoop-hdds/framework/src/main/java/org/apache/hadoop/hdds/utils/HddsServerUtil.java
@@ -125,7 +125,7 @@ private HddsServerUtil() {
       HddsServerUtil.class);
 
   /**
-   * Add protobuf-based protocol to the {@link RPC.Server}.
+   * Add protobuf-based protocol to the {@link org.apache.hadoop.ipc.RPC.Server}.
    * @param conf configuration
    * @param protocol Protocol interface
    * @param service service that implements the protocol
diff --git a/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/SCMCommonPlacementPolicy.java b/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/SCMCommonPlacementPolicy.java
index fabd2810764..2a1c6fce0c0 100644
--- a/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/SCMCommonPlacementPolicy.java
+++ b/hadoop-hdds/server-scm/src/main/java/org/apache/hadoop/hdds/scm/SCMCommonPlacementPolicy.java
@@ -525,7 +525,7 @@ public boolean isValidNode(DatanodeDetails datanodeDetails,
    * Given a set of replicas of a container which are
    * neither over underreplicated nor overreplicated,
    * return a set of replicas to copy to another node to fix misreplication.
-   * @param replicas: Map of replicas with value signifying if
+   * @param replicas Map of replicas with value signifying if
    *                  replica can be copied
    */
   @Override
@@ -595,8 +595,8 @@ protected Node getPlacementGroup(DatanodeDetails dn) {
    * to be removed is also removed from the maps created above and
    * the count for rack is reduced.
    * The set of replicas computed are then returned by the function.
-   * @param replicas: Set of existing replicas of the container
-   * @param expectedCountPerUniqueReplica: Replication factor of each
+   * @param replicas Set of existing replicas of the container
+   * @param expectedCountPerUniqueReplica Replication factor of each
    *    *                                     unique replica
    * @return Set of replicas to be removed are computed.
    */
diff --git a/hadoop-ozone/common/src/main/java/org/apache/hadoop/ozone/om/helpers/RepeatedOmKeyInfo.java b/hadoop-ozone/common/src/main/java/org/apache/hadoop/ozone/om/helpers/RepeatedOmKeyInfo.java
index ccc47e7fc68..f1dd1e9eeba 100644
--- a/hadoop-ozone/common/src/main/java/org/apache/hadoop/ozone/om/helpers/RepeatedOmKeyInfo.java
+++ b/hadoop-ozone/common/src/main/java/org/apache/hadoop/ozone/om/helpers/RepeatedOmKeyInfo.java
@@ -110,9 +110,7 @@ public static RepeatedOmKeyInfo getFromProto(RepeatedKeyInfo
   }
 
   /**
-   *
-   * @param compact, true for persistence, false for network transmit
-   * @return
+   * @param compact true for persistence, false for network transmit
    */
   public RepeatedKeyInfo getProto(boolean compact, int clientVersion) {
     List<KeyInfo> list = new ArrayList<>();
diff --git a/hadoop-ozone/recon/src/main/java/org/apache/hadoop/ozone/recon/api/ContainerEndpoint.java b/hadoop-ozone/recon/src/main/java/org/apache/hadoop/ozone/recon/api/ContainerEndpoint.java
index acb96c51d8b..33fc4fd96de 100644
--- a/hadoop-ozone/recon/src/main/java/org/apache/hadoop/ozone/recon/api/ContainerEndpoint.java
+++ b/hadoop-ozone/recon/src/main/java/org/apache/hadoop/ozone/recon/api/ContainerEndpoint.java
@@ -157,7 +157,7 @@ public ContainerEndpoint(OzoneStorageContainerManager reconSCM,
   }
 
   /**
-   * Return {@link org.apache.hadoop.hdds.scm.container}
+   * Return {@code org.apache.hadoop.hdds.scm.container}
    * for the containers starting from the given "prev-key" query param for the
    * given "limit". The given "prev-key" is skipped from the results returned.
    *