(ratis) branch master updated: RATIS-2145. Follower hangs until the next trigger to take a snapshot. (#1139)

[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 dfed10129 RATIS-2145. Follower hangs until the next trigger to take a 
snapshot. (#1139)
dfed10129 is described below

commit dfed1012983d1d7b5fb2c408e19b8661cbe000b4
Author: z-bb <35120306+z...@users.noreply.github.com>
AuthorDate: Fri Aug 30 23:40:11 2024 +0800

    RATIS-2145. Follower hangs until the next trigger to take a snapshot. 
(#1139)
---
 .../src/main/java/org/apache/ratis/grpc/server/GrpcLogAppender.java | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git 
a/ratis-grpc/src/main/java/org/apache/ratis/grpc/server/GrpcLogAppender.java 
b/ratis-grpc/src/main/java/org/apache/ratis/grpc/server/GrpcLogAppender.java
index 06e0c5428..1da7bb3b4 100644
--- a/ratis-grpc/src/main/java/org/apache/ratis/grpc/server/GrpcLogAppender.java
+++ b/ratis-grpc/src/main/java/org/apache/ratis/grpc/server/GrpcLogAppender.java
@@ -444,7 +444,7 @@ public class GrpcLogAppender extends LogAppenderBase {
   }
 
   private void timeoutAppendRequest(long cid, boolean heartbeat) {
-    final AppendEntriesRequest pending = pendingRequests.handleTimeout(cid, 
heartbeat);
+    final AppendEntriesRequest pending = pendingRequests.remove(cid, 
heartbeat);
     if (pending != null) {
       final int errorCount = replyState.process(Event.TIMEOUT);
       LOG.warn("{}: Timed out {}appendEntries, errorCount={}, request={}",
@@ -964,9 +964,5 @@ public class GrpcLogAppender extends LogAppenderBase {
     AppendEntriesRequest remove(long cid, boolean isHeartbeat) {
       return isHeartbeat ? heartbeats.remove(cid): logRequests.remove(cid);
     }
-
-    public AppendEntriesRequest handleTimeout(long callId, boolean heartbeat) {
-      return heartbeat ? heartbeats.remove(callId) : logRequests.get(callId);
-    }
   }
 }