From 2195b85d507ec781207c5994f3903e7c7e6d709f Mon Sep 17 00:00:00 2001
From: Duong Nguyen <duongnt.is@gmail.com>
Date: Thu, 16 May 2024 11:39:50 -0700
Subject: [PATCH 1/2] RATIS-2093. Decouple metadata and configuration entries
 from appendEntries buffer for stateMachineCache

---
 .../server/raftlog/segmented/SegmentedRaftLog.java | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

diff --git a/ratis-server/src/main/java/org/apache/ratis/server/raftlog/segmented/SegmentedRaftLog.java b/ratis-server/src/main/java/org/apache/ratis/server/raftlog/segmented/SegmentedRaftLog.java
index 7c33adf00a..769f3a3cc8 100644
--- a/ratis-server/src/main/java/org/apache/ratis/server/raftlog/segmented/SegmentedRaftLog.java
+++ b/ratis-server/src/main/java/org/apache/ratis/server/raftlog/segmented/SegmentedRaftLog.java
@@ -456,13 +456,17 @@ protected CompletableFuture<Long> appendEntryImpl(ReferenceCountedObject<LogEntr
       // to statemachine first and then to the cache. Not following the order
       // will leave a spurious entry in the cache.
       final Task write = fileLogWorker.writeLogEntry(entryRef, removedStateMachineData, context);
-      if (stateMachineCachingEnabled && (removedStateMachineData != entry)) {
+      if (stateMachineCachingEnabled) {
         // The stateMachineData will be cached inside the StateMachine itself.
-        cache.appendEntry(LogSegment.Op.WRITE_CACHE_WITH_STATE_MACHINE_CACHE,
-            ReferenceCountedObject.wrap(removedStateMachineData));
+        if ((removedStateMachineData != entry)) {
+          cache.appendEntry(LogSegment.Op.WRITE_CACHE_WITH_STATE_MACHINE_CACHE,
+              ReferenceCountedObject.wrap(removedStateMachineData));
+        } else {
+          cache.appendEntry(LogSegment.Op.WRITE_CACHE_WITH_STATE_MACHINE_CACHE,
+              ReferenceCountedObject.wrap(LogProtoUtils.copy(entry)));
+        }
       } else {
-        cache.appendEntry(LogSegment.Op.WRITE_CACHE_WITHOUT_STATE_MACHINE_CACHE, entryRef
-        );
+        cache.appendEntry(LogSegment.Op.WRITE_CACHE_WITHOUT_STATE_MACHINE_CACHE, entryRef);
       }
       return write.getFuture().whenComplete((clientReply, exception) -> appendEntryTimerContext.stop());
     } catch (Exception e) {

From df49fac68ab2cd9a4166cb43d289be3b2e512966 Mon Sep 17 00:00:00 2001
From: Duong Nguyen <duongnt.is@gmail.com>
Date: Fri, 24 May 2024 12:46:54 -0700
Subject: [PATCH 2/2] PR comments.

---
 .../ratis/server/raftlog/segmented/SegmentedRaftLog.java      | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/ratis-server/src/main/java/org/apache/ratis/server/raftlog/segmented/SegmentedRaftLog.java b/ratis-server/src/main/java/org/apache/ratis/server/raftlog/segmented/SegmentedRaftLog.java
index 769f3a3cc8..27b771ff1a 100644
--- a/ratis-server/src/main/java/org/apache/ratis/server/raftlog/segmented/SegmentedRaftLog.java
+++ b/ratis-server/src/main/java/org/apache/ratis/server/raftlog/segmented/SegmentedRaftLog.java
@@ -458,12 +458,12 @@ protected CompletableFuture<Long> appendEntryImpl(ReferenceCountedObject<LogEntr
       final Task write = fileLogWorker.writeLogEntry(entryRef, removedStateMachineData, context);
       if (stateMachineCachingEnabled) {
         // The stateMachineData will be cached inside the StateMachine itself.
-        if ((removedStateMachineData != entry)) {
+        if (removedStateMachineData != entry) {
           cache.appendEntry(LogSegment.Op.WRITE_CACHE_WITH_STATE_MACHINE_CACHE,
               ReferenceCountedObject.wrap(removedStateMachineData));
         } else {
           cache.appendEntry(LogSegment.Op.WRITE_CACHE_WITH_STATE_MACHINE_CACHE,
-              ReferenceCountedObject.wrap(LogProtoUtils.copy(entry)));
+              ReferenceCountedObject.wrap(LogProtoUtils.copy(removedStateMachineData)));
         }
       } else {
         cache.appendEntry(LogSegment.Op.WRITE_CACHE_WITHOUT_STATE_MACHINE_CACHE, entryRef);