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

szetszwo · szetszwo · commit ca81a218f31b · 2025-04-17T09:03:02.000-07:00
This reverts commit f5e9935.
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,9 +141,7 @@ synchronized void append(List<ConsecutiveIndices> entriesTermIndices) {
         // validate startIndex
         final Map.Entry<Long, ConsecutiveIndices> lastEntry = map.lastEntry();
         if (lastEntry != null) {
-          final long nextIndex = lastEntry.getValue().getNextIndex();
-          Preconditions.assertTrue(indices.startIndex >= nextIndex,
-                  () -> "startIndex = " + indices.startIndex + " < nextIndex = " + nextIndex);
+          Preconditions.assertSame(lastEntry.getValue().getNextIndex(), indices.startIndex, "startIndex");
         }
         map.put(indices.startIndex, indices);
       }

Original file line number	Diff line number	Diff line change
`@@ -141,9 +141,7 @@ 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`		`- final long nextIndex = lastEntry.getValue().getNextIndex();`
`145`		`- Preconditions.assertTrue(indices.startIndex >= nextIndex,`
`146`		`- () -> "startIndex = " + indices.startIndex + " < nextIndex = " + nextIndex);`
	`144`	`+ Preconditions.assertSame(lastEntry.getValue().getNextIndex(), indices.startIndex, "startIndex");`
`147`	`145`	`}`
`148`	`146`	`map.put(indices.startIndex, indices);`
`149`	`147`	`}`