RATIS-2135. The leader keeps sending inconsistent entries repeatedly …

…to followers.
szetszwo · Aug 9, 2024 · cc2d49e · cc2d49e
1 parent ebeab93
commit cc2d49e
Showing 1 changed file with 8 additions and 15 deletions.
diff --git a/ratis-grpc/src/main/java/org/apache/ratis/grpc/server/GrpcService.java b/ratis-grpc/src/main/java/org/apache/ratis/grpc/server/GrpcService.java
@@ -65,8 +65,7 @@ public final class GrpcService extends RaftServerRpcWithProxy<GrpcServerProtocol
   class AsyncService implements RaftServerAsynchronousProtocol {
 
     @Override
-    public CompletableFuture<AppendEntriesReplyProto> appendEntriesAsync(AppendEntriesRequestProto request)
-        throws IOException {
+    public CompletableFuture<AppendEntriesReplyProto> appendEntriesAsync(AppendEntriesRequestProto request) {
       throw new UnsupportedOperationException("This method is not supported");
     }
 
@@ -99,7 +98,6 @@ public void onCompleted() {
 
   public static final class Builder {
     private RaftServer server;
-    private GrpcTlsConfig tlsConfig;
     private GrpcTlsConfig adminTlsConfig;
     private GrpcTlsConfig clientTlsConfig;
     private GrpcTlsConfig serverTlsConfig;
@@ -115,11 +113,6 @@ public GrpcService build() {
       return new GrpcService(server, adminTlsConfig, clientTlsConfig, serverTlsConfig);
     }
 
-    public Builder setTlsConfig(GrpcTlsConfig tlsConfig) {
-      this.tlsConfig = tlsConfig;
-      return this;
-    }
-
     public Builder setAdminTlsConfig(GrpcTlsConfig config) {
       this.adminTlsConfig = config;
       return this;
@@ -134,10 +127,6 @@ public Builder setServerTlsConfig(GrpcTlsConfig config) {
       this.serverTlsConfig = config;
       return this;
     }
-
-    public GrpcTlsConfig getTlsConfig() {
-      return tlsConfig;
-    }
   }
 
   public static Builder newBuilder() {
@@ -192,10 +181,14 @@ private GrpcService(RaftServer raftServer, Supplier<RaftPeerId> idSupplier,
     super(idSupplier, id -> new PeerProxyMap<>(id.toString(),
         p -> new GrpcServerProtocolClient(p, flowControlWindow.getSizeInt(),
             requestTimeoutDuration, serverTlsConfig, useSeparateHBChannel)));
-    if (appenderBufferSize.getSize() > grpcMessageSizeMax.getSize()) {
+
+    final SizeInBytes gap = SizeInBytes.ONE_MB;
+    final long diff = grpcMessageSizeMax.getSize() - appenderBufferSize.getSize();
+    if (diff < gap.getSize()) {
       throw new IllegalArgumentException("Illegal configuration: "
-          + RaftServerConfigKeys.Log.Appender.BUFFER_BYTE_LIMIT_KEY + " = " + appenderBufferSize
-          + " > " + GrpcConfigKeys.MESSAGE_SIZE_MAX_KEY + " = " + grpcMessageSizeMax);
+          + GrpcConfigKeys.MESSAGE_SIZE_MAX_KEY + "(= " + grpcMessageSizeMax
+          + ") must be " + gap + " larger than "
+          + RaftServerConfigKeys.Log.Appender.BUFFER_BYTE_LIMIT_KEY + "(= " + appenderBufferSize + ").");
     }
 
     final RaftProperties properties = raftServer.getProperties();