RATIS-2314. Fix that SegmentedRaftLogWorker may append entry by itself. (apache#1274)

jt2594838 · web-flow · commit b73c44caa6e0 · 2025-07-03T05:33:47.000+08:00
diff --git a/ratis-server/src/main/java/org/apache/ratis/server/impl/RaftServerImpl.java b/ratis-server/src/main/java/org/apache/ratis/server/impl/RaftServerImpl.java
@@ -1639,8 +1639,9 @@ private CompletableFuture<Void> appendLog(List<LogEntryProto> entries) {
       return appendLogFuture.get();
     }
 
-    return appendLogFuture.updateAndGet(f -> f.thenCompose(
-            ignored -> JavaUtils.allOf(state.getLog().append(entries))))
+
+    return appendLogFuture.updateAndGet(f -> f.thenComposeAsync(
+            ignored -> JavaUtils.allOf(state.getLog().append(entries)), serverExecutor))
         .whenComplete((v, e) -> appendLogTermIndices.removeExisting(entriesTermIndices));
   }
 

Original file line number	Diff line number	Diff line change
`@@ -1639,8 +1639,9 @@ private CompletableFuture<Void> appendLog(List<LogEntryProto> entries) {`
`1639`	`1639`	`return appendLogFuture.get();`
`1640`	`1640`	`}`
`1641`	`1641`
`1642`		`- return appendLogFuture.updateAndGet(f -> f.thenCompose(`
`1643`		`- ignored -> JavaUtils.allOf(state.getLog().append(entries))))`
	`1642`	`+`
	`1643`	`+ return appendLogFuture.updateAndGet(f -> f.thenComposeAsync(`
	`1644`	`+ ignored -> JavaUtils.allOf(state.getLog().append(entries)), serverExecutor))`
`1644`	`1645`	`.whenComplete((v, e) -> appendLogTermIndices.removeExisting(entriesTermIndices));`
`1645`	`1646`	`}`
`1646`	`1647`