address review issues

apache · May 29, 2024 · 9c8b7b8 · 9c8b7b8
1 parent 205f3c8
commit 9c8b7b8
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 5 deletions.
diff --git a/ratis-server/src/main/java/org/apache/ratis/server/impl/ConfigurationManager.java b/ratis-server/src/main/java/org/apache/ratis/server/impl/ConfigurationManager.java
@@ -61,10 +61,10 @@ private void setCurrentConf(RaftConfigurationImpl currentConf) {
     }
   }
 
-  synchronized void addConfiguration(RaftConfiguration conf, long commitIndex) {
+  synchronized void addConfiguration(RaftConfiguration conf) {
     final long logIndex = conf.getLogEntryIndex();
     final RaftConfiguration found = configurations.get(logIndex);
-    if (found != null && logIndex <= commitIndex) {
+    if (found != null) {
       Preconditions.assertTrue(found.equals(conf));
       return;
     }

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
@@ -1853,6 +1853,7 @@ CompletableFuture<Message> applyLogToStateMachine(ReferenceCountedObject<LogEntr
   void notifyTruncatedLogEntry(LogEntryProto logEntry) {
     if (logEntry.hasStateMachineLogEntry()) {
       getTransactionManager().remove(TermIndex.valueOf(logEntry));
+      getState().truncate(logEntry.getIndex());
 
       final ClientInvocationId invocationId = ClientInvocationId.valueOf(logEntry.getStateMachineLogEntry());
       final CacheEntry cacheEntry = getRetryCache().getIfPresent(invocationId);

diff --git a/ratis-server/src/main/java/org/apache/ratis/server/impl/ServerState.java b/ratis-server/src/main/java/org/apache/ratis/server/impl/ServerState.java
@@ -377,9 +377,7 @@ void setRaftConf(LogEntryProto entry) {
   }
 
   void setRaftConf(RaftConfiguration conf) {
-    final long lastCommittedIndex = server.getState().log.isInitialized() ?
-        server.getRaftLog().getLastCommittedIndex() : RaftLog.INVALID_LOG_INDEX;
-    configurationManager.addConfiguration(conf, lastCommittedIndex);
+    configurationManager.addConfiguration(conf);
     server.getServerRpc().addRaftPeers(conf.getAllPeers());
     final Collection<RaftPeer> listeners = conf.getAllPeers(RaftPeerRole.LISTENER);
     if (!listeners.isEmpty()) {
@@ -389,6 +387,10 @@ void setRaftConf(RaftConfiguration conf) {
     LOG.trace("{}: {}", getMemberId(), configurationManager);
   }
 
+  void truncate(long logIndex) {
+    configurationManager.removeConfigurations(logIndex);
+  }
+
   void updateConfiguration(List<LogEntryProto> entries) {
     if (entries != null && !entries.isEmpty()) {
       configurationManager.removeConfigurations(entries.get(0).getIndex());

diff --git a/ratis-server/src/main/java/org/apache/ratis/server/impl/SnapshotInstallationHandler.java b/ratis-server/src/main/java/org/apache/ratis/server/impl/SnapshotInstallationHandler.java
@@ -133,6 +133,7 @@ private InstallSnapshotReplyProto installSnapshotImpl(InstallSnapshotRequestProt
       if (request.hasLastRaftConfigurationLogEntryProto()) {
         // Set the configuration included in the snapshot
         final LogEntryProto proto = request.getLastRaftConfigurationLogEntryProto();
+        state.truncate(proto.getIndex());
         if (!state.getRaftConf().equals(LogProtoUtils.toRaftConfiguration(proto))) {
           LOG.info("{}: set new configuration {} from snapshot", getMemberId(), proto);
           state.setRaftConf(proto);