From de2e777e19d48bd67fcba1538007940abde87170 Mon Sep 17 00:00:00 2001
From: Angerszhuuuu <angers.zhu@gmail.com>
Date: Thu, 13 Jun 2024 17:15:56 +0800
Subject: [PATCH] RATIS-2111 Reinitialize should load the latest snapshot
 (#1111)

---
 .../ratis/examples/arithmetic/ArithmeticStateMachine.java     | 2 +-
 .../ratis/examples/counter/server/CounterStateMachine.java    | 2 +-
 .../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 28e3fb1c7d..fa0dc6d8e2 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 void initialize(RaftServer server, RaftGroupId groupId,
   @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 b88a763e0f..b5352f0adc 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 void initialize(RaftServer server, RaftGroupId groupId, RaftStorage raftS
    */
   @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 88cc57dab5..7e8afbaa85 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 SingleFileSnapshotInfo getLatestSnapshot() {
     if (s != null) {
       return s;
     }
+    return loadLatestSnapshot();
+  }
+
+  public SingleFileSnapshotInfo loadLatestSnapshot() {
     final File dir = stateMachineDir;
     if (dir == null) {
       return null;