Hdds 13999

.github/ci.md

@@ -73,16 +73,13 @@ If they don't match, it describes how to make the updates to include the changes
 - basic
 - integration
 
-### close-prs Workflow
-[This](./workflows/close-pending.yaml) workflow is scheduled each night at midnight; it closes PR's that have not been updated in the last 21 days, while letting the author know they are free to reopen.
+### close-stale-prs Workflow
+[This](./workflows/close-stale-prs.yml) workflow is scheduled each night at midnight and uses the [actions/stale](https://github.com/actions/stale) to automatically manage inactive PRs. It marks PRs as stale after 21 days of inactivity and closes them 7 days later. If a stale PR receives any updates or comments, the stale label is automatically removed.
 
 ### comment-commands Workflow
 [This](./workflows/comments.yaml) workflow is triggered each time a comment is added/edited to a PR.  It checks to see if the body of the comment begins with one of the following strings and, if so, invokes the corresponding command.
-- /close : [Close](./comment-commands/close.sh) pending pull request (with message saying author is free to reopen.)
 - /help : [Show](./comment-commands/help.sh) all the available comment commands
 - /label : [Add](./comment-commands/label.sh) new label to the issue: /label "label"
-- /pending : [Add](./comment-commands/pending.sh) a REQUESTED_CHANGE type review to mark issue non-mergeable: /pending "reason"
-- /ready : [Dismiss](./comment-commands/ready.sh) all the blocking reviews
 - /retest : [Provide](./comment-commands/retest.sh) help on how to trigger new CI build
 
 

.github/workflows/check.yml

@@ -167,7 +167,6 @@ jobs:
         with:
           path: |
             ~/.pnpm-store
-            **/node_modules
           key: ${{ runner.os }}-pnpm-${{ hashFiles('**/pnpm-lock.yaml') }}
           restore-keys: |
             ${{ runner.os }}-pnpm-
@@ -255,6 +254,7 @@ jobs:
         uses: actions/upload-artifact@v4
         with:
           name: ${{ (inputs.split && format('{0}-{1}', inputs.script, inputs.split)) || inputs.script }}
+          # please keep path as a single item; move to that directory all files needed in the artifact
           path: target/${{ inputs.script }}
         continue-on-error: true
 

.github/workflows/ci.yml

@@ -138,7 +138,7 @@ jobs:
         include:
           - os: ubuntu-24.04
           - java: 8
-            os: macos-13
+            os: macos-15-intel
       fail-fast: false
     uses: ./.github/workflows/check.yml
     with:
@@ -199,6 +199,19 @@ jobs:
       sha: ${{ needs.build-info.outputs.sha }}
       timeout-minutes: 15
 
+  javadoc:
+    needs:
+      - build-info
+      - build
+    uses: ./.github/workflows/check.yml
+    secrets: inherit
+    with:
+      java-version: ${{ needs.build-info.outputs.java-version }}
+      needs-ozone-repo: true
+      script: javadoc
+      sha: ${{ needs.build-info.outputs.sha }}
+      timeout-minutes: 30
+
   repro:
     needs:
       - build-info

.github/workflows/close-stale-prs.yaml

@@ -0,0 +1,38 @@
+# 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.
+name: close-stale-prs
+
+on:
+  schedule:
+    - cron: '0 0 * * *'
+
+jobs:
+  close-stale-prs:
+    permissions:
+      pull-requests: write
+    runs-on: ubuntu-latest
+    steps:
+      - name: Close Stale PRs
+        uses: actions/stale@v10
+        with:
+          stale-pr-label: 'stale'
+          exempt-draft-pr: false
+          days-before-issue-stale: -1
+          days-before-pr-stale: 21
+          days-before-pr-close: 7
+          remove-pr-stale-when-updated: true
+          operations-per-run: 500
+          stale-pr-message: 'This PR has been marked as stale due to 21 days of inactivity. Please comment or remove the stale label to keep it open. Otherwise, it will be automatically closed in 7 days.'
+          close-pr-message: 'Thank you for your contribution. This PR is being closed due to inactivity. If needed, feel free to reopen it.'

.github/workflows/intermittent-test-check.yml

@@ -95,7 +95,7 @@ jobs:
       repo: ${{ github.event.inputs.ratis-repo || format('{0}/ratis', github.repository_owner) }}
       ref: ${{ github.event.inputs.ratis-ref }}
   build:
-    if: ${{ always() }}
+    if: ${{ !cancelled() }}
     needs:
       - prepare-job
       - ratis
@@ -149,7 +149,7 @@ jobs:
             ~/.m2/repository/org/apache/ozone
           retention-days: 1
   run-test:
-    if: ${{ always() }}
+    if: ${{ !cancelled() }}
     needs:
       - prepare-job
       - ratis

.mvn/extensions.xml

@@ -29,6 +29,6 @@
   <extension>
     <groupId>com.gradle</groupId>
     <artifactId>common-custom-user-data-maven-extension</artifactId>
-    <version>2.0.3</version>
+    <version>2.1.0</version>
   </extension>
 </extensions>

README.md

@@ -50,18 +50,35 @@ Latest release artifacts (source release and binary packages) are [available](ht
 
 ## Quick start
 
-### Run Ozone from published Docker image
+### Run Ozone with Docker Compose
 
-The easiest way to start a cluster with docker is:
+The easiest way to start a cluster with docker is by using Docker Compose:
 
+- Obtain Ozone’s sample Docker Compose configuration:
+```bash
+curl -O https://raw.githubusercontent.com/apache/ozone-docker/refs/heads/latest/docker-compose.yaml
 ```
-docker run -p 9878:9878 apache/ozone
+
+- Start the cluster
+```bash
+docker compose up -d --scale datanode=3
 ```
 
+- Note: By default, the cluster will be started with replication factor set to 1. It can be changed by setting the environment variable `OZONE_REPLICATION_FACTOR` to the desired value.
+
 And you can use AWS S3 cli:
 
+- First, let’s configure AWS access key and secret key. Because the cluster is not secured, you can use any arbitrary access key and secret key. For example:
+```bash
+export AWS_ACCESS_KEY_ID=testuser/scm@EXAMPLE.COM
+export AWS_SECRET_ACCESS_KEY=c261b6ecabf7d37d5f9ded654b1c724adac9bd9f13e247a235e567e8296d2999
+```
+
+- Then we can create a bucket and upload a file to it:
 ```
 aws s3api --endpoint http://localhost:9878/ create-bucket --bucket=wordcount
+# create a temporary file to upload to Ozone via S3 support 
+ls -1 > /tmp/testfile
 aws s3 --endpoint http://localhost:9878 cp --storage-class REDUCED_REDUNDANCY  /tmp/testfile  s3://wordcount/testfile
 ```
 

dev-support/pmd/pmd-ruleset.xml

@@ -34,6 +34,8 @@
   <rule ref="category/java/bestpractices.xml/UseCollectionIsEmpty" />
   <rule ref="category/java/bestpractices.xml/SimplifiableTestAssertion" />
 
+  <rule ref="category/java/design.xml/SingularField" />
+
   <rule ref="category/java/performance.xml/AddEmptyString"/>
   <rule ref="category/java/performance.xml/AppendCharacterWithChar" />
   <rule ref="category/java/performance.xml/AvoidFileStream"/>

dev-support/pom.xml

@@ -17,7 +17,7 @@
   <parent>
     <groupId>org.apache.ozone</groupId>
     <artifactId>ozone-main</artifactId>
-    <version>2.1.0-SNAPSHOT</version>
+    <version>2.2.0-SNAPSHOT</version>
   </parent>
   <artifactId>ozone-dev-support</artifactId>
   <name>Apache Ozone Dev Support</name>

hadoop-hdds/annotations/pom.xml

@@ -17,11 +17,11 @@
   <parent>
     <groupId>org.apache.ozone</groupId>
     <artifactId>hdds</artifactId>
-    <version>2.1.0-SNAPSHOT</version>
+    <version>2.2.0-SNAPSHOT</version>
   </parent>
 
   <artifactId>hdds-annotation-processing</artifactId>
-  <version>2.1.0-SNAPSHOT</version>
+  <version>2.2.0-SNAPSHOT</version>
   <packaging>jar</packaging>
   <name>Apache Ozone Annotation Processing</name>
   <description>Apache Ozone annotation processing tools for validating custom

hadoop-hdds/client/pom.xml

@@ -17,12 +17,12 @@
   <parent>
     <groupId>org.apache.ozone</groupId>
     <artifactId>hdds-hadoop-dependency-client</artifactId>
-    <version>2.1.0-SNAPSHOT</version>
+    <version>2.2.0-SNAPSHOT</version>
     <relativePath>../hadoop-dependency-client</relativePath>
   </parent>
 
   <artifactId>hdds-client</artifactId>
-  <version>2.1.0-SNAPSHOT</version>
+  <version>2.2.0-SNAPSHOT</version>
   <packaging>jar</packaging>
   <name>Apache Ozone HDDS Client</name>
   <description>Apache Ozone Distributed Data Store Client Library</description>
@@ -32,14 +32,6 @@
       <groupId>com.google.guava</groupId>
       <artifactId>guava</artifactId>
     </dependency>
-    <dependency>
-      <groupId>io.opentracing</groupId>
-      <artifactId>opentracing-api</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>io.opentracing</groupId>
-      <artifactId>opentracing-util</artifactId>
-    </dependency>
     <dependency>
       <groupId>jakarta.annotation</groupId>
       <artifactId>jakarta.annotation-api</artifactId>

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

@@ -21,9 +21,6 @@
 
 import com.google.common.annotations.VisibleForTesting;
 import com.google.common.base.Preconditions;
-import io.opentracing.Scope;
-import io.opentracing.Span;
-import io.opentracing.util.GlobalTracer;
 import java.io.IOException;
 import java.io.InterruptedIOException;
 import java.util.ArrayList;
@@ -536,10 +533,8 @@ public XceiverClientReply sendCommandAsync(
       ContainerCommandRequestProto request)
       throws IOException, ExecutionException, InterruptedException {
 
-    Span span = GlobalTracer.get()
-        .buildSpan("XceiverClientGrpc." + request.getCmdType().name()).start();
-
-    try (Scope ignored = GlobalTracer.get().activateSpan(span)) {
+    try (TracingUtil.TraceCloseable ignored = TracingUtil.createActivatedSpan(
+        "XceiverClientGrpc." + request.getCmdType().name())) {
 
       ContainerCommandRequestProto.Builder builder =
           ContainerCommandRequestProto.newBuilder(request)
@@ -553,9 +548,6 @@ public XceiverClientReply sendCommandAsync(
         asyncReply.getResponse().get();
       }
       return asyncReply;
-
-    } finally {
-      span.finish();
     }
   }