(ratis) branch master updated: [RATIS-2111] Reinitialize should load the latest snapshot (#1111)

[szetszwo]

This is an automated email from the ASF dual-hosted git repository.

szetszwo pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/ratis.git


The following commit(s) were added to refs/heads/master by this push:
     new 25a41e36f [RATIS-2111] Reinitialize should load the latest snapshot 
(#1111)
25a41e36f is described below

commit 25a41e36f4c94b9a3e37ca9c27feeb893206cb79
Author: Angerszhuuuu <angers....@gmail.com>
AuthorDate: Thu Jun 13 17:15:56 2024 +0800

    [RATIS-2111] Reinitialize should load the latest snapshot (#1111)
---
 .../org/apache/ratis/examples/arithmetic/ArithmeticStateMachine.java  | 2 +-
 .../org/apache/ratis/examples/counter/server/CounterStateMachine.java | 2 +-
 .../org/apache/ratis/statemachine/impl/SimpleStateMachineStorage.java | 4 ++++
 3 files changed, 6 insertions(+), 2 deletions(-)

diff --git 
a/ratis-examples/src/main/java/org/apache/ratis/examples/arithmetic/ArithmeticStateMachine.java
 
b/ratis-examples/src/main/java/org/apache/ratis/examples/arithmetic/ArithmeticStateMachine.java
index e8b142f5d..c4adff598 100644
--- 
a/ratis-examples/src/main/java/org/apache/ratis/examples/arithmetic/ArithmeticStateMachine.java
+++ 
b/ratis-examples/src/main/java/org/apache/ratis/examples/arithmetic/ArithmeticStateMachine.java
@@ -81,7 +81,7 @@ public class ArithmeticStateMachine extends BaseStateMachine {
   @Override
   public void reinitialize() throws IOException {
     close();
-    loadSnapshot(storage.getLatestSnapshot());
+    loadSnapshot(storage.loadLatestSnapshot());
   }
 
   @Override
diff --git 
a/ratis-examples/src/main/java/org/apache/ratis/examples/counter/server/CounterStateMachine.java
 
b/ratis-examples/src/main/java/org/apache/ratis/examples/counter/server/CounterStateMachine.java
index 47880af55..a65582ea0 100644
--- 
a/ratis-examples/src/main/java/org/apache/ratis/examples/counter/server/CounterStateMachine.java
+++ 
b/ratis-examples/src/main/java/org/apache/ratis/examples/counter/server/CounterStateMachine.java
@@ -138,7 +138,7 @@ public class CounterStateMachine extends BaseStateMachine {
    */
   @Override
   public void reinitialize() throws IOException {
-    load(storage.getLatestSnapshot());
+    load(storage.loadLatestSnapshot());
   }
 
   /**
diff --git 
a/ratis-server/src/main/java/org/apache/ratis/statemachine/impl/SimpleStateMachineStorage.java
 
b/ratis-server/src/main/java/org/apache/ratis/statemachine/impl/SimpleStateMachineStorage.java
index 88cc57dab..7e8afbaa8 100644
--- 
a/ratis-server/src/main/java/org/apache/ratis/statemachine/impl/SimpleStateMachineStorage.java
+++ 
b/ratis-server/src/main/java/org/apache/ratis/statemachine/impl/SimpleStateMachineStorage.java
@@ -217,6 +217,10 @@ public class SimpleStateMachineStorage implements 
StateMachineStorage {
     if (s != null) {
       return s;
     }
+    return loadLatestSnapshot();
+  }
+
+  public SingleFileSnapshotInfo loadLatestSnapshot() {
     final File dir = stateMachineDir;
     if (dir == null) {
       return null;