From 5f8e386b48472367a7c4fa348c19ccd2fce636d7 Mon Sep 17 00:00:00 2001
From: Pere Diaz Bou <pere-altea@hotmail.com>
Date: Thu, 17 Jul 2025 15:52:20 +0200
Subject: [PATCH] reset internal states on rollback

---
 core/storage/page_cache.rs |  2 +-
 core/storage/pager.rs      | 19 ++++++++++++++++++-
 core/storage/wal.rs        |  7 +++++++
 3 files changed, 26 insertions(+), 2 deletions(-)

diff --git a/core/storage/page_cache.rs b/core/storage/page_cache.rs
index 55a4fb249..a892a32fc 100644
--- a/core/storage/page_cache.rs
+++ b/core/storage/page_cache.rs
@@ -204,7 +204,7 @@ impl DumbLruPageCache {
 
         if clean_page {
             entry_mut.page.clear_loaded();
-            debug!("cleaning up page {}", entry_mut.page.get().id);
+            debug!("clean(page={})", entry_mut.page.get().id);
             let _ = entry_mut.page.get().contents.take();
         }
         self.unlink(entry);
diff --git a/core/storage/pager.rs b/core/storage/pager.rs
index 2d7d49210..4217c1ddc 100644
--- a/core/storage/pager.rs
+++ b/core/storage/pager.rs
@@ -1014,7 +1014,10 @@ impl Pager {
                     let page = {
                         let mut cache = self.page_cache.write();
                         let page_key = PageCacheKey::new(page_id);
-                        let page = cache.get(&page_key).expect("we somehow added a page to dirty list but we didn't mark it as dirty, causing cache to drop it.");
+                        let page = cache.get(&page_key).expect(&format!(
+                            "we somehow added a page to dirty list but we didn't mark it as dirty, causing cache to drop it. page={}",
+                            page_id
+                        ));
                         let page_type = page.get().contents.as_ref().unwrap().maybe_page_type();
                         trace!(
                             "commit_dirty_pages(page={}, page_type={:?}",
@@ -1528,6 +1531,9 @@ impl Pager {
         tracing::debug!(schema_did_change);
         self.dirty_pages.borrow_mut().clear();
         let mut cache = self.page_cache.write();
+
+        self.reset_internal_states();
+
         cache.unset_dirty_all_pages();
         cache.clear().expect("failed to clear page cache");
         if schema_did_change {
@@ -1537,6 +1543,17 @@ impl Pager {
 
         Ok(())
     }
+
+    fn reset_internal_states(&self) {
+        self.checkpoint_state.replace(CheckpointState::Checkpoint);
+        self.checkpoint_inflight.replace(0);
+        self.syncing.replace(false);
+        self.flush_info.replace(FlushInfo {
+            state: FlushState::Start,
+            in_flight_writes: Rc::new(RefCell::new(0)),
+            dirty_pages: Vec::new(),
+        });
+    }
 }
 
 pub fn allocate_page(page_id: usize, buffer_pool: &Arc<BufferPool>, offset: usize) -> PageRef {
diff --git a/core/storage/wal.rs b/core/storage/wal.rs
index 0c29ac161..05945d008 100644
--- a/core/storage/wal.rs
+++ b/core/storage/wal.rs
@@ -1038,6 +1038,7 @@ impl Wal for WalFile {
             }
             self.last_checksum = shared.last_checksum;
         }
+        self.reset_internal_states();
         Ok(())
     }
 
@@ -1128,6 +1129,12 @@ impl WalFile {
             }
         }
     }
+
+    fn reset_internal_states(&self) {
+        self.sync_state.set(SyncState::NotSyncing);
+        self.syncing.set(false);
+        self.ongoing_checkpoint.state = CheckpointState::Start;
+    }
 }
 
 impl WalFileShared {