(ratis) branch master updated: RATIS-2330. Intermittent failure in TestRaftServerWithGrpc.testRaftServerMetrics. (#1286)

[szetszwo]

This is an automated email from the ASF dual-hosted git repository.

szetszwo pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/ratis.git


The following commit(s) were added to refs/heads/master by this push:
     new fb866d174 RATIS-2330. Intermittent failure in 
TestRaftServerWithGrpc.testRaftServerMetrics. (#1286)
fb866d174 is described below

commit fb866d1747751331028e7409bbe455839b6f6220
Author: Tsz-Wo Nicholas Sze <szets...@apache.org>
AuthorDate: Thu Sep 18 08:58:26 2025 -0700

    RATIS-2330. Intermittent failure in 
TestRaftServerWithGrpc.testRaftServerMetrics. (#1286)
---
 .../java/org/apache/ratis/server/impl/PendingRequests.java   | 12 +++---------
 1 file changed, 3 insertions(+), 9 deletions(-)

diff --git 
a/ratis-server/src/main/java/org/apache/ratis/server/impl/PendingRequests.java 
b/ratis-server/src/main/java/org/apache/ratis/server/impl/PendingRequests.java
index 259695d5e..c6a9dd279 100644
--- 
a/ratis-server/src/main/java/org/apache/ratis/server/impl/PendingRequests.java
+++ 
b/ratis-server/src/main/java/org/apache/ratis/server/impl/PendingRequests.java
@@ -117,7 +117,7 @@ class PendingRequests {
       
raftServerMetrics.addNumPendingRequestsMegaByteSize(resource::getMegaByteSize);
     }
 
-    Permit tryAcquire(Message message) {
+    synchronized Permit tryAcquire(Message message) {
       final int messageSize = Message.getSize(message);
       final int messageSizeMb = roundUpMb(messageSize );
       final Acquired acquired = resource.tryAcquire(messageSizeMb);
@@ -139,13 +139,7 @@ class PendingRequests {
       if (messageSizeMb > diffMb) {
         resource.releaseExtraMb(messageSizeMb - diffMb);
       }
-      return putPermit();
-    }
 
-    private synchronized Permit putPermit() {
-      if (resource.isClosed()) {
-        return null;
-      }
       final Permit permit = new Permit();
       permits.put(permit, permit);
       return permit;
@@ -157,9 +151,9 @@ class PendingRequests {
       if (removed == null) {
         return null;
       }
-      Preconditions.assertTrue(removed == permit);
+      Preconditions.assertSame(permit, removed, "permit");
       final PendingRequest previous = map.put(p.getTermIndex(), p);
-      Preconditions.assertTrue(previous == null);
+      Preconditions.assertNull(previous, "previous");
       return p;
     }