Revert "Merge branch 'master' into HDDS-10239-container-reconciliation"

This reverts commit 01b4437.

Conflicts:
	hadoop-hdds/container-service/src/main/java/org/apache/hadoop/ozone/container/keyvalue/KeyValueHandler.java

.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 -Dmaven.javadoc.failOnWarnings=${{ matrix.java != 8 }} -Djavac.version=${{ matrix.java }} ${{ inputs.ratis_args }}
+        run: hadoop-ozone/dev-support/checks/build.sh -Pdist -Dskip.npx -Dskip.installnpx -Djavac.version=${{ matrix.java }} ${{ inputs.ratis_args }}
         env:
           OZONE_WITH_COVERAGE: false
           DEVELOCITY_ACCESS_KEY: ${{ secrets.GE_ACCESS_TOKEN }}

.mvn/extensions.xml

@@ -24,7 +24,7 @@
   <extension>
     <groupId>com.gradle</groupId>
     <artifactId>develocity-maven-extension</artifactId>
-    <version>1.22.1</version>
+    <version>1.21.5</version>
   </extension>
   <extension>
     <groupId>com.gradle</groupId>

NOTICE.txt

@@ -1,5 +1,5 @@
 Apache Ozone
-Copyright 2024 The Apache Software Foundation
+Copyright 2022 The Apache Software Foundation
 
 This product includes software developed at
 The Apache Software Foundation (http://www.apache.org/).

dev-support/ci/selective_ci_checks.bats

@@ -429,15 +429,3 @@ 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
-}

dev-support/ci/selective_ci_checks.sh

@@ -373,7 +373,6 @@ function check_needs_checkstyle() {
         "^hadoop-hdds/dev-support/checkstyle"
         "pom.xml"
         "src/..../java"
-        "src/..../resources/.*\.properties"
     )
     local ignore_array=(
         "^hadoop-ozone/dist"

hadoop-hdds/client/src/main/java/org/apache/hadoop/hdds/scm/OzoneClientConfig.java

@@ -247,49 +247,28 @@ public enum ChecksumCombineMode {
       tags = ConfigTag.CLIENT)
   private String fsDefaultBucketLayout = "FILE_SYSTEM_OPTIMIZED";
 
-  // ozone.client.hbase.enhancements.allowed
-  @Config(key = "hbase.enhancements.allowed",
-      defaultValue = "false",
-      description = "When set to false, client-side HBase enhancement-related Ozone (experimental) features " +
-          "are disabled (not allowed to be enabled) regardless of whether those configs are set.\n" +
-          "\n" +
-          "Here is the list of configs and values overridden when this config is set to false:\n" +
-          "1. ozone.fs.hsync.enabled = false\n" +
-          "2. ozone.client.incremental.chunk.list = false\n" +
-          "3. ozone.client.stream.putblock.piggybacking = false\n" +
-          "4. ozone.client.key.write.concurrency = 1\n" +
-          "\n" +
-          "A warning message will be printed if any of the above configs are overridden by this.",
-      tags = ConfigTag.CLIENT)
-  private boolean hbaseEnhancementsAllowed = false;
-
-  // ozone.client.incremental.chunk.list
   @Config(key = "incremental.chunk.list",
-      defaultValue = "false",
+      defaultValue = "true",
       type = ConfigType.BOOLEAN,
       description = "Client PutBlock request can choose incremental chunk " +
           "list rather than full chunk list to optimize performance. " +
-          "Critical to HBase. EC does not support this feature. " +
-          "Can be enabled only when ozone.client.hbase.enhancements.allowed = true",
+          "Critical to HBase. EC does not support this feature.",
       tags = ConfigTag.CLIENT)
-  private boolean incrementalChunkList = false;
+  private boolean incrementalChunkList = true;
 
-  // ozone.client.stream.putblock.piggybacking
   @Config(key = "stream.putblock.piggybacking",
-          defaultValue = "false",
+          defaultValue = "true",
           type = ConfigType.BOOLEAN,
-          description = "Allow PutBlock to be piggybacked in WriteChunk requests if the chunk is small. " +
-              "Can be enabled only when ozone.client.hbase.enhancements.allowed = true",
+          description = "Allow PutBlock to be piggybacked in WriteChunk " +
+                  "requests if the chunk is small.",
           tags = ConfigTag.CLIENT)
-  private boolean enablePutblockPiggybacking = false;
+  private boolean enablePutblockPiggybacking = true;
 
-  // ozone.client.key.write.concurrency
   @Config(key = "key.write.concurrency",
       defaultValue = "1",
       description = "Maximum concurrent writes allowed on each key. " +
           "Defaults to 1 which matches the behavior before HDDS-9844. " +
-          "For unlimited write concurrency, set this to -1 or any negative integer value. " +
-          "Any value other than 1 is effective only when ozone.client.hbase.enhancements.allowed = true",
+          "For unlimited write concurrency, set this to -1 or any negative integer value.",
       tags = ConfigTag.CLIENT)
   private int maxConcurrentWritePerKey = 1;
 
@@ -319,34 +298,6 @@ public void validate() {
           OzoneConfigKeys.OZONE_CLIENT_BYTES_PER_CHECKSUM_MIN_SIZE;
     }
 
-    // Verify client configs related to HBase enhancements
-    // Enforce check on ozone.client.hbase.enhancements.allowed
-    if (!hbaseEnhancementsAllowed) {
-      // ozone.client.hbase.enhancements.allowed = false
-      if (incrementalChunkList) {
-        LOG.warn("Ignoring ozone.client.incremental.chunk.list = true " +
-            "because HBase enhancements are disallowed. " +
-            "To enable it, set ozone.client.hbase.enhancements.allowed = true.");
-        incrementalChunkList = false;
-        LOG.debug("Final ozone.client.incremental.chunk.list = {}", incrementalChunkList);
-      }
-      if (enablePutblockPiggybacking) {
-        LOG.warn("Ignoring ozone.client.stream.putblock.piggybacking = true " +
-            "because HBase enhancements are disallowed. " +
-            "To enable it, set ozone.client.hbase.enhancements.allowed = true.");
-        enablePutblockPiggybacking = false;
-        LOG.debug("Final ozone.client.stream.putblock.piggybacking = {}", enablePutblockPiggybacking);
-      }
-      if (maxConcurrentWritePerKey != 1) {
-        LOG.warn("Ignoring ozone.client.key.write.concurrency = {} " +
-            "because HBase enhancements are disallowed. " +
-            "To enable it, set ozone.client.hbase.enhancements.allowed = true.",
-            maxConcurrentWritePerKey);
-        maxConcurrentWritePerKey = 1;
-        LOG.debug("Final ozone.client.key.write.concurrency = {}", maxConcurrentWritePerKey);
-      }
-      // Note: ozone.fs.hsync.enabled is enforced by OzoneFSUtils#canEnableHsync, not here
-    }
   }
 
   public long getStreamBufferFlushSize() {
@@ -535,14 +486,6 @@ public void setDatastreamPipelineMode(boolean datastreamPipelineMode) {
     this.datastreamPipelineMode = datastreamPipelineMode;
   }
 
-  public void setHBaseEnhancementsAllowed(boolean isHBaseEnhancementsEnabled) {
-    this.hbaseEnhancementsAllowed = isHBaseEnhancementsEnabled;
-  }
-
-  public boolean getHBaseEnhancementsAllowed() {
-    return this.hbaseEnhancementsAllowed;
-  }
-
   public void setIncrementalChunkList(boolean enable) {
     this.incrementalChunkList = enable;
   }

hadoop-hdds/client/src/main/java/org/apache/hadoop/hdds/scm/storage/AbstractCommitWatcher.java

@@ -124,6 +124,7 @@ XceiverClientReply watchOnLastIndex() throws IOException {
    *
    * @param commitIndex log index to watch for
    * @return minimum commit index replicated to all nodes
+   * @throws IOException IOException in case watch gets timed out
    */
   CompletableFuture<XceiverClientReply> watchForCommitAsync(long commitIndex) {
     final MemoizedSupplier<CompletableFuture<XceiverClientReply>> supplier

hadoop-hdds/client/src/main/java/org/apache/hadoop/hdds/scm/storage/BlockDataStreamOutput.java

@@ -364,6 +364,7 @@ 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 {