Merge branch 'apache:master' into RATIS-2251

Author: slfan1989

.github/workflows/check.yaml

@@ -79,7 +79,7 @@ on:
 env:
   MAVEN_ARGS: --batch-mode --show-version
   MAVEN_OPTS: -Dhttp.keepAlive=false -Dmaven.wagon.http.pool=false -Dmaven.wagon.http.retryHandler.class=standard -Dmaven.wagon.http.retryHandler.count=3
-  WITH_COVERAGE: true
+  WITH_COVERAGE: ${{ github.event_name == 'push' }}
 
 jobs:
   check:
@@ -157,7 +157,6 @@ jobs:
           dev-support/checks/${{ inputs.script }}.sh ${{ inputs.script-args }}
         env:
           DEVELOCITY_ACCESS_KEY: ${{ secrets.DEVELOCITY_ACCESS_KEY }}
-          WITH_COVERAGE: ${{ inputs.with-coverage }}
 
       - name: Summary of failures
         if: ${{ failure() }}

.github/workflows/ci.yaml

@@ -50,6 +50,13 @@ jobs:
       timeout-minutes: 30
     secrets: inherit
 
+  release:
+    uses: ./.github/workflows/check.yaml
+    with:
+      script: release
+      timeout-minutes: 30
+    secrets: inherit
+
   repro:
     needs:
       - build
@@ -99,7 +106,7 @@ jobs:
       - unit
     runs-on: ubuntu-24.04
     timeout-minutes: 30
-    if: (github.repository == 'apache/ratis' || github.repository == 'apache/incubator-ratis') && github.event_name != 'pull_request'
+    if: github.event_name != 'pull_request'
     steps:
         - name: Checkout project
           uses: actions/checkout@v4
@@ -130,6 +137,7 @@ jobs:
         - name: Calculate combined coverage
           run: ./dev-support/checks/coverage.sh
         - name: Upload coverage to Sonar
+          if: github.repository == 'apache/ratis'
           run: ./dev-support/checks/sonar.sh
           env:
             SONAR_TOKEN: ${{ secrets.SONARCLOUD_TOKEN }}

dev-support/checks/release.sh

@@ -0,0 +1,49 @@
+#!/usr/bin/env bash
+# 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.
+
+set -e -u -o pipefail
+
+# This script tests the local part of the release process.  It does not publish anything.
+
+DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null 2>&1 && pwd )"
+cd "$DIR/../.." || exit 1
+
+: "${RATISVERSION:="0.0.1"}"
+: "${RC:="-ci-test"}"
+: "${STAGING_REPO_DIR:="/tmp/ratis.staging-repo"}"
+: "${SVNDISTDIR:="/tmp/ratis.svn"}"
+: "${USERID:="ratis-ci-not-for-release"}"
+
+MVN_REPO_DIR="${HOME}/.m2/repository"
+
+mkdir -p "${SVNDISTDIR}"
+
+if [[ -z "${CODESIGNINGKEY:-}" ]]; then
+  gpg --batch --passphrase '' --pinentry-mode loopback --quick-generate-key "${USERID}" rsa4096 default 1d
+  CODESIGNINGKEY=$(gpg --list-keys --with-colons "${USERID}" | grep '^pub:' | cut -f5 -d:)
+fi
+
+git config user.email || git config user.email 'test@example.com'
+git config user.name || git config user.name 'Test User'
+
+export CODESIGNINGKEY MVN_REPO_DIR RATISVERSION RC SVNDISTDIR
+
+export MAVEN_ARGS="--batch-mode"
+
+dev-support/make_rc.sh 1-prepare-src
+dev-support/make_rc.sh 2-verify-bin
+dev-support/make_rc.sh 3-publish-mvn -DaltDeploymentRepository="local::default::file://${STAGING_REPO_DIR}"
+dev-support/make_rc.sh 4-assembly

dev-support/checks/sonar.sh

@@ -24,6 +24,6 @@ if [ ! "$SONAR_TOKEN" ]; then
 fi
 
 ${MVN} -B verify -DskipShade -DskipTests \
-  org.sonarsource.scanner.maven:sonar-maven-plugin:3.6.0.1398:sonar \
+  sonar:sonar \
   -Dsonar.coverage.jacoco.xmlReportPaths="$(pwd)/target/coverage/all.xml" \
   -Dsonar.host.url=https://sonarcloud.io -Dsonar.organization=apache -Dsonar.projectKey=apache-ratis

dev-support/make_rc.sh

@@ -118,7 +118,7 @@ mvnFun() {
   mv "apache-ratis-${RATISVERSION}-src" "apache-ratis-${RATISVERSION}"
   cd "apache-ratis-${RATISVERSION}"
 
-  mvnFun clean verify -DskipTests=true  -Prelease -Papache-release -Dgpg.keyname="${CODESIGNINGKEY}"
+  mvnFun clean verify -DskipTests=true  -Prelease -Papache-release -Dgpg.keyname="${CODESIGNINGKEY}" "$@"
 }
 
 3-publish-mvn() {
@@ -137,7 +137,10 @@ mvnFun() {
   for i in *.tar.gz; do gpg --print-md SHA512 "${i}" > "${i}.sha512"; done
   for i in *.tar.gz; do gpg --print-mds "${i}" > "${i}.mds"; done
   cd "$SVNDISTDIR"
-  svn add "${RATISVERSION}" || svn add "${RATISVERSION}/${RC#-}"
+  # skip svn add in CI
+  if [[ -z "${CI:-}" ]]; then
+    svn add "${RATISVERSION}" || svn add "${RATISVERSION}/${RC#-}"
+  fi
 }
 
 5-publish-git(){

pom.xml

@@ -177,6 +177,7 @@
     <maven-surefire-plugin.version>3.0.0-M9</maven-surefire-plugin.version>
     <wagon-ssh.version>3.5.3</wagon-ssh.version>
     <hadoop-maven-plugins.version>3.4.0</hadoop-maven-plugins.version>
+    <sonar-maven-plugin.version>5.0.0.4389</sonar-maven-plugin.version>
 
 
     <!-- org.codehaus.mojo -->
@@ -207,11 +208,11 @@
     <maven.min.version>3.3.9</maven.min.version>
 
     <!-- Contains all shaded thirdparty dependencies -->
-    <ratis.thirdparty.version>1.0.8</ratis.thirdparty.version>
+    <ratis.thirdparty.version>1.0.9</ratis.thirdparty.version>
 
     <!-- Need these for the protobuf compiler. *MUST* match what is in ratis-thirdparty -->
     <shaded.protobuf.version>3.25.5</shaded.protobuf.version>
-    <shaded.grpc.version>1.69.0</shaded.grpc.version>
+    <shaded.grpc.version>1.71.0</shaded.grpc.version>
 
     <!-- Test properties -->
     <maven.test.redirectTestOutputToFile>true</maven.test.redirectTestOutputToFile>
@@ -732,6 +733,11 @@
           <artifactId>cyclonedx-maven-plugin</artifactId>
           <version>${cyclonedx.version}</version>
         </plugin>
+        <plugin>
+          <groupId>org.sonarsource.scanner.maven</groupId>
+          <artifactId>sonar-maven-plugin</artifactId>
+          <version>${sonar-maven-plugin.version}</version>
+        </plugin>
       </plugins>
     </pluginManagement>
 

ratis-common/src/main/java/org/apache/ratis/protocol/ClientId.java

@@ -18,6 +18,7 @@
 package org.apache.ratis.protocol;
 
 import org.apache.ratis.thirdparty.com.google.protobuf.ByteString;
+import org.apache.ratis.util.WeakValueCache;
 
 import java.util.UUID;
 
@@ -26,13 +27,17 @@
  * to correctly identify retry requests from the same client.
  */
 public final class ClientId extends RaftId {
-  private static final Factory<ClientId> FACTORY = new Factory<ClientId>() {
+  private static final Factory<ClientId> FACTORY = new Factory<ClientId>(ClientId.class) {
     @Override
     ClientId newInstance(UUID uuid) {
       return new ClientId(uuid);
     }
   };
 
+  static WeakValueCache<UUID, ClientId> getCache() {
+    return FACTORY.getCache();
+  }
+
   public static ClientId emptyClientId() {
     return FACTORY.emptyId();
   }

ratis-common/src/main/java/org/apache/ratis/protocol/RaftGroup.java

@@ -19,7 +19,13 @@
 
 import org.apache.ratis.util.Preconditions;
 
-import java.util.*;
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.Objects;
+
 
 /**
  * Description of a raft group, which has a unique {@link RaftGroupId} and a collection of {@link RaftPeer}.

ratis-common/src/main/java/org/apache/ratis/protocol/RaftGroupId.java

@@ -18,6 +18,7 @@
 package org.apache.ratis.protocol;
 
 import org.apache.ratis.thirdparty.com.google.protobuf.ByteString;
+import org.apache.ratis.util.WeakValueCache;
 
 import java.util.UUID;
 
@@ -27,13 +28,17 @@
  * This is a value-based class.
  */
 public final class RaftGroupId extends RaftId {
-  private static final Factory<RaftGroupId> FACTORY = new Factory<RaftGroupId>() {
+  private static final Factory<RaftGroupId> FACTORY = new Factory<RaftGroupId>(RaftGroupId.class) {
     @Override
     RaftGroupId newInstance(UUID uuid) {
       return new RaftGroupId(uuid);
     }
   };
 
+  static WeakValueCache<UUID, RaftGroupId> getCache() {
+    return FACTORY.getCache();
+  }
+
   public static RaftGroupId emptyGroupId() {
     return FACTORY.emptyId();
   }

ratis-common/src/main/java/org/apache/ratis/protocol/RaftId.java

@@ -17,17 +17,15 @@
  */
 package org.apache.ratis.protocol;
 
-import org.apache.ratis.thirdparty.com.google.common.cache.Cache;
-import org.apache.ratis.thirdparty.com.google.common.cache.CacheBuilder;
 import org.apache.ratis.thirdparty.com.google.protobuf.ByteString;
 import org.apache.ratis.thirdparty.com.google.protobuf.UnsafeByteOperations;
 import org.apache.ratis.util.JavaUtils;
 import org.apache.ratis.util.Preconditions;
+import org.apache.ratis.util.WeakValueCache;
 
 import java.nio.ByteBuffer;
 import java.util.Objects;
 import java.util.UUID;
-import java.util.concurrent.ExecutionException;
 import java.util.function.Supplier;
 
 /** Unique identifier implemented using {@link UUID}. */
@@ -53,18 +51,20 @@ static ByteString toByteString(UUID uuid) {
   }
 
   abstract static class Factory<ID extends RaftId> {
-    private final Cache<UUID, ID> cache = CacheBuilder.newBuilder()
-        .weakValues()
-        .build();
+    private final WeakValueCache<UUID, ID> cache;
+
+    Factory(Class<ID> clazz) {
+      this.cache = new WeakValueCache<>(clazz.getSimpleName() + "_UUID", this::newInstance);
+    }
 
     abstract ID newInstance(UUID uuid);
 
+    WeakValueCache<UUID, ID> getCache() {
+      return cache;
+    }
+
     final ID valueOf(UUID uuid) {
-      try {
-        return cache.get(uuid, () -> newInstance(uuid));
-      } catch (ExecutionException e) {
-        throw new IllegalStateException("Failed to valueOf(" + uuid + ")", e);
-      }
+      return cache.getOrCreate(uuid);
     }
 
     final ID valueOf(ByteString bytes) {