[RATIS-2082] RaftPeers equal should also check address

.github/workflows/post-commit.yml

@@ -14,18 +14,23 @@
 # limitations under the License.
 name: build-branch
 on:
-  - push
-  - pull_request
+  push:
+    branches-ignore:
+      - 'dependabot/**'
+    tags:
+      - '**'
+  pull_request:
 env:
   WITH_COVERAGE: true
 jobs:
   build:
     runs-on: ubuntu-20.04
+    timeout-minutes: 30
     steps:
       - name: Checkout project
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
       - name: Cache for maven dependencies
-        uses: actions/cache@v3
+        uses: actions/cache@v4
         with:
           path: |
             ~/.m2/repository
@@ -34,22 +39,22 @@ jobs:
           restore-keys: |
             maven-repo-
       - name: Setup java
-        uses: actions/setup-java@v3
+        uses: actions/setup-java@v4
         with:
           distribution: 'temurin'
           java-version: 8
       - name: Run a full build
         run: ./dev-support/checks/build.sh -Prelease assembly:single
       - name: Store binaries for tests
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: ratis-bin
           path: |
             ratis-assembly/target/apache-ratis-*.tar.gz
             !ratis-assembly/target/apache-ratis-*-src.tar.gz
           retention-days: 1
       - name: Store source tarball for compilation
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: ratis-src
           path: ratis-assembly/target/apache-ratis-*-src.tar.gz
@@ -58,20 +63,21 @@ jobs:
     needs:
       - build
     runs-on: ubuntu-20.04
+    timeout-minutes: 30
     strategy:
       matrix:
         java: [ 11 ]
       fail-fast: false
     steps:
       - name: Download source tarball
-        uses: actions/download-artifact@v3
+        uses: actions/download-artifact@v4
         with:
           name: ratis-src
       - name: Untar sources
         run: |
           tar --strip-components 1 -xzvf apache-ratis-*-src.tar.gz
       - name: Cache for maven dependencies
-        uses: actions/cache/restore@v3
+        uses: actions/cache/restore@v4
         with:
           path: |
             ~/.m2/repository
@@ -80,7 +86,7 @@ jobs:
           restore-keys: |
             maven-repo-
       - name: Setup java
-        uses: actions/setup-java@v3
+        uses: actions/setup-java@v4
         with:
           distribution: 'temurin'
           java-version: ${{ matrix.java }}
@@ -89,11 +95,12 @@ jobs:
   rat:
     name: rat
     runs-on: ubuntu-20.04
+    timeout-minutes: 15
     steps:
         - name: Checkout project
-          uses: actions/checkout@v3
+          uses: actions/checkout@v4
         - name: Cache for maven dependencies
-          uses: actions/cache/restore@v3
+          uses: actions/cache/restore@v4
           with:
             path: |
               ~/.m2/repository
@@ -104,28 +111,30 @@ jobs:
         - name: Run tests
           run: ./dev-support/checks/rat.sh
         - name: Upload results
-          uses: actions/upload-artifact@v3
+          uses: actions/upload-artifact@v4
           if: always()
           with:
             name: rat
             path: target/rat
   author:
     name: author
     runs-on: ubuntu-20.04
+    timeout-minutes: 15
     steps:
         - name: Checkout project
-          uses: actions/checkout@v3
+          uses: actions/checkout@v4
         - name: Run tests
           run: ./dev-support/checks/author.sh
         - name: Upload results
-          uses: actions/upload-artifact@v3
+          uses: actions/upload-artifact@v4
           if: always()
           with:
             name: author
             path: target/author
   unit:
     name: unit
     runs-on: ubuntu-20.04
+    timeout-minutes: 60
     strategy:
       matrix:
         profile:
@@ -140,9 +149,9 @@ jobs:
             echo -e "$(ip addr show eth0 | grep "inet\b" | awk '{print $2}' | cut -d/ -f1)\t$(hostname -f) $(hostname -s)" | sudo tee -a /etc/hosts
         # REMOVE CODE ABOVE WHEN ISSUE IS ADDRESSED!
         - name: Checkout project
-          uses: actions/checkout@v3
+          uses: actions/checkout@v4
         - name: Cache for maven dependencies
-          uses: actions/cache/restore@v3
+          uses: actions/cache/restore@v4
           with:
             path: |
               ~/.m2/repository
@@ -151,7 +160,7 @@ jobs:
             restore-keys: |
               maven-repo-
         - name: Setup java
-          uses: actions/setup-java@v3
+          uses: actions/setup-java@v4
           with:
             distribution: 'temurin'
             java-version: 8
@@ -161,19 +170,20 @@ jobs:
           run: cat target/${{ github.job }}/summary.txt
           if: ${{ !cancelled() }}
         - name: Upload results
-          uses: actions/upload-artifact@v3
+          uses: actions/upload-artifact@v4
           if: ${{ !cancelled() }}
           with:
             name: unit-${{ matrix.profile }}
             path: target/unit
   checkstyle:
     name: checkstyle
     runs-on: ubuntu-20.04
+    timeout-minutes: 15
     steps:
         - name: Checkout project
-          uses: actions/checkout@v3
+          uses: actions/checkout@v4
         - name: Cache for maven dependencies
-          uses: actions/cache/restore@v3
+          uses: actions/cache/restore@v4
           with:
             path: |
               ~/.m2/repository
@@ -184,24 +194,25 @@ jobs:
         - name: Run tests
           run: ./dev-support/checks/checkstyle.sh
         - name: Upload results
-          uses: actions/upload-artifact@v3
+          uses: actions/upload-artifact@v4
           if: always()
           with:
             name: checkstyle
             path: target/checkstyle
   findbugs:
     name: findbugs
     runs-on: ubuntu-20.04
+    timeout-minutes: 30
     steps:
         - name: Setup java
-          uses: actions/setup-java@v3
+          uses: actions/setup-java@v4
           with:
             distribution: 'temurin'
             java-version: 8
         - name: Checkout project
-          uses: actions/checkout@v3
+          uses: actions/checkout@v4
         - name: Cache for maven dependencies
-          uses: actions/cache/restore@v3
+          uses: actions/cache/restore@v4
           with:
             path: |
               ~/.m2/repository
@@ -212,7 +223,7 @@ jobs:
         - name: Run tests
           run: ./dev-support/checks/findbugs.sh
         - name: Upload results
-          uses: actions/upload-artifact@v3
+          uses: actions/upload-artifact@v4
           if: always()
           with:
             name: findbugs
@@ -222,14 +233,15 @@ jobs:
       - build
       - unit
     runs-on: ubuntu-20.04
+    timeout-minutes: 30
     if: (github.repository == 'apache/ratis' || github.repository == 'apache/incubator-ratis') && github.event_name != 'pull_request'
     steps:
         - name: Checkout project
-          uses: actions/checkout@v3
+          uses: actions/checkout@v4
           with:
             fetch-depth: 0
         - name: Cache for maven dependencies
-          uses: actions/cache/restore@v3
+          uses: actions/cache/restore@v4
           with:
             path: |
               ~/.m2/repository
@@ -238,12 +250,12 @@ jobs:
             restore-keys: |
               maven-repo-
         - name: Setup java 17
-          uses: actions/setup-java@v3
+          uses: actions/setup-java@v4
           with:
             distribution: 'temurin'
             java-version: 17
         - name: Download artifacts
-          uses: actions/download-artifact@v3
+          uses: actions/download-artifact@v4
           with:
             path: target/artifacts
         - name: Untar binaries
@@ -258,7 +270,7 @@ jobs:
             SONAR_TOKEN: ${{ secrets.SONARCLOUD_TOKEN }}
             GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
         - name: Archive build results
-          uses: actions/upload-artifact@v3
+          uses: actions/upload-artifact@v4
           if: always()
           with:
             name: ${{ github.job }}

.github/workflows/repeat-test.yml

@@ -87,11 +87,11 @@ jobs:
         split: ${{ fromJson(needs.prepare.outputs.matrix) }}
       fail-fast: ${{ fromJson(github.event.inputs.fail-fast) }}
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
         with:
           ref: ${{ github.event.inputs.ref }}
       - name: Cache for maven dependencies
-        uses: actions/cache@v3
+        uses: actions/cache@v4
         with:
           path: |
             ~/.m2/repository
@@ -100,7 +100,7 @@ jobs:
           restore-keys: |
             maven-repo-
       - name: Setup java
-        uses: actions/setup-java@v3
+        uses: actions/setup-java@v4
         with:
           distribution: 'temurin'
           java-version: 8
@@ -113,7 +113,7 @@ jobs:
         run: dev-support/checks/_summary.sh target/unit/summary.txt
         if: ${{ !cancelled() }}
       - name: Archive build results
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         if: always()
         with:
           name: result-${{ env.TEST_CLASS }}-split-${{ matrix.split }}
@@ -124,7 +124,7 @@ jobs:
     runs-on: ubuntu-20.04
     steps:
       - name: Download build results
-        uses: actions/download-artifact@v3
+        uses: actions/download-artifact@v4
       - name: Count failures
         run: |
           failures=$(find . -name 'summary.txt' | grep -v 'iteration' | xargs grep -v 'exit code: 0' | wc -l)

pom.xml

@@ -176,7 +176,7 @@
     <maven-checkstyle-plugin.version>3.3.0</maven-checkstyle-plugin.version>
     <maven-clover2-plugin.version>4.0.6</maven-clover2-plugin.version>
     <maven-pdf-plugin.version>1.6.1</maven-pdf-plugin.version>
-    <maven-surefire-plugin.version>3.0.0</maven-surefire-plugin.version>
+    <maven-surefire-plugin.version>3.0.0-M4</maven-surefire-plugin.version>
     <wagon-ssh.version>3.5.3</wagon-ssh.version>
 
 
@@ -440,14 +440,6 @@
         <version>6.0.53</version>
         <scope>provided</scope>
       </dependency>
-
-      <dependency>
-        <groupId>com.github.spotbugs</groupId>
-        <artifactId>spotbugs-annotations</artifactId>
-        <version>${spotbugs.version}</version>
-        <scope>provided</scope>
-        <optional>true</optional>
-      </dependency>
     </dependencies>
   </dependencyManagement>
 
@@ -642,6 +634,7 @@
             <failIfNoSpecifiedTests>false</failIfNoSpecifiedTests>
             <reuseForks>false</reuseForks>
             <trimStackTrace>false</trimStackTrace>
+            <enableProcessChecker>all</enableProcessChecker>
             <forkedProcessTimeoutInSeconds>600</forkedProcessTimeoutInSeconds>
             <!-- @argLine is filled by jacoco maven plugin. @{} means late evaluation -->
             <argLine>-Xmx2048m -XX:+HeapDumpOnOutOfMemoryError @{argLine}</argLine>

ratis-assembly/src/main/resources/NOTICE

@@ -292,27 +292,5 @@ networking library, which can be obtained at:
   * HOMEPAGE:
     * https://netty.io
   * LOCATION_IN_GRPC:
-* netty/third_party/netty
------------------------------------------------------------------------
-The JSR-305 reference implementation (jsr305.jar) is distributed under the terms of the New BSD:
-
-Redistribution and use in source and binary forms, with or without modification,
-are permitted provided that the following conditions are met:
-
-1. Redistributions of source code must retain the above copyright notice,
-this list of conditions and the following disclaimer.
-
-2. Redistributions in binary form must reproduce the above copyright notice,
-this list of conditions and the following disclaimer in the documentation and/or
-other materials provided with the distribution.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS
-OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY
-AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
-CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
-DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
-LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
-ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
+    * netty/third_party/netty
 -----------------------------------------------------------------------

ratis-client/src/main/java/org/apache/ratis/client/api/SnapshotManagementApi.java

@@ -27,6 +27,24 @@
  */
 public interface SnapshotManagementApi {
 
-  /** trigger create snapshot file. */
-  RaftClientReply create(long timeoutMs) throws IOException;
+  /** The same as create(0, timeoutMs). */
+  default RaftClientReply create(long timeoutMs) throws IOException {
+    return create(0, timeoutMs);
+  }
+
+    /** The same as create(force? 1 : 0, timeoutMs). */
+  default RaftClientReply create(boolean force, long timeoutMs) throws IOException {
+    return create(force? 1 : 0, timeoutMs);
+  }
+
+    /**
+   * Trigger to create a snapshot.
+   *
+   * @param creationGap When (creationGap > 0) and (astAppliedIndex - lastSnapshotIndex < creationGap),
+   *                    return lastSnapshotIndex; otherwise, take a new snapshot and then return its index.
+   *                    When creationGap == 0, use the server configured value as the creationGap.
+   * @return a reply.  When {@link RaftClientReply#isSuccess()} is true,
+   *         {@link RaftClientReply#getLogIndex()} is the snapshot index fulfilling the operation.
+   */
+  RaftClientReply create(long creationGap, long timeoutMs) throws IOException;
 }