RATIS-2278. Follower Fails to Append Entries Due to Index Validation in NavigableIndices (#1247)

RkGrit · web-flow · commit f5e993549330 · 2025-04-11T08:38:20.000-07:00
diff --git a/ratis-server/src/main/java/org/apache/ratis/server/impl/ServerImplUtils.java b/ratis-server/src/main/java/org/apache/ratis/server/impl/ServerImplUtils.java
@@ -141,7 +141,9 @@ synchronized void append(List<ConsecutiveIndices> entriesTermIndices) {
         // validate startIndex
         final Map.Entry<Long, ConsecutiveIndices> lastEntry = map.lastEntry();
         if (lastEntry != null) {
-          Preconditions.assertSame(lastEntry.getValue().getNextIndex(), indices.startIndex, "startIndex");
+          final long nextIndex = lastEntry.getValue().getNextIndex();
+          Preconditions.assertTrue(indices.startIndex >= nextIndex,
+                  () -> "startIndex = " + indices.startIndex + " < nextIndex = " + nextIndex);
         }
         map.put(indices.startIndex, indices);
       }

Original file line number	Diff line number	Diff line change
`@@ -141,7 +141,9 @@ synchronized void append(List<ConsecutiveIndices> entriesTermIndices) {`
`141`	`141`	`// validate startIndex`
`142`	`142`	`final Map.Entry<Long, ConsecutiveIndices> lastEntry = map.lastEntry();`
`143`	`143`	`if (lastEntry != null) {`
`144`		`- Preconditions.assertSame(lastEntry.getValue().getNextIndex(), indices.startIndex, "startIndex");`
	`144`	`+ final long nextIndex = lastEntry.getValue().getNextIndex();`
	`145`	`+ Preconditions.assertTrue(indices.startIndex >= nextIndex,`
	`146`	`+ () -> "startIndex = " + indices.startIndex + " < nextIndex = " + nextIndex);`
`145`	`147`	`}`
`146`	`148`	`map.put(indices.startIndex, indices);`
`147`	`149`	`}`