From 947ee285defa92ec352ccbab05f4ee724702368a Mon Sep 17 00:00:00 2001
From: chrislusf <chris@chrislusf.com>
Date: Sat, 5 Sep 2026 21:00:47 -0700
Subject: [PATCH] rust volume: advance idx_file_offset only after redb commit
 succeeds
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

put() and delete() appended to the .idx file and advanced idx_file_offset
before committing to redb. If the redb commit failed, the offset included
the orphan row that redb doesn't reflect. A later checkpoint would record
that offset as "the table reflects up to here," and the reload would skip
the orphan row entirely — the entry becomes permanently unindexed.

Move the idx_file_offset increment to after the successful redb commit.
The .idx file still has the orphan row (append-only), but idx_file_offset
stays behind it, so the next checkpoint records the smaller offset and
the reload replays the orphan row back into redb.

Co-Authored-By: Chris Lu <chris.lu@gmail.com>
---
 seaweed-volume/src/storage/needle_map.rs | 18 ++++++++++++++----
 1 file changed, 14 insertions(+), 4 deletions(-)

diff --git a/seaweed-volume/src/storage/needle_map.rs b/seaweed-volume/src/storage/needle_map.rs
index c541f665a..50e188142 100644
--- a/seaweed-volume/src/storage/needle_map.rs
+++ b/seaweed-volume/src/storage/needle_map.rs
@@ -768,10 +768,13 @@ impl RedbNeedleMap {
 
     /// Insert or update an entry. Writes to idx file first, then redb.
     pub fn put(&mut self, key: NeedleId, offset: Offset, size: Size) -> io::Result<()> {
-        // Persist to idx file BEFORE mutating redb state for crash consistency
+        // Persist to idx file BEFORE mutating redb state for crash consistency.
+        // The offset is advanced only after the redb commit succeeds: a failed
+        // commit leaves an orphan row in .idx that redb doesn't reflect, and
+        // advancing the offset here would let a later checkpoint record it as
+        // reflected, making the reload skip it permanently.
         if let Some(ref mut idx_file) = self.idx_file {
             idx::write_index_entry(idx_file, key, offset, size)?;
-            self.idx_file_offset += NEEDLE_MAP_ENTRY_SIZE as u64;
         }
 
         let key_u64: u64 = key.into();
@@ -792,6 +795,9 @@ impl RedbNeedleMap {
         }
         txn.commit()
             .map_err(|e| io::Error::new(io::ErrorKind::Other, format!("redb commit: {}", e)))?;
+        if self.idx_file.is_some() {
+            self.idx_file_offset += NEEDLE_MAP_ENTRY_SIZE as u64;
+        }
         self.writes_since_checkpoint = self.writes_since_checkpoint.saturating_add(1);
 
         self.metric.on_put(key, old.as_ref(), size);
@@ -840,10 +846,11 @@ impl RedbNeedleMap {
 
         if let Some(old) = self.get_internal(key_u64)? {
             if old.size.is_valid() {
-                // Persist tombstone to idx file BEFORE mutating redb
+                // Persist tombstone to idx file BEFORE mutating redb. The
+                // offset is advanced only after the redb commit succeeds
+                // (see put).
                 if let Some(ref mut idx_file) = self.idx_file {
                     idx::write_index_entry(idx_file, key, offset, TOMBSTONE_FILE_SIZE)?;
-                    self.idx_file_offset += NEEDLE_MAP_ENTRY_SIZE as u64;
                 }
 
                 let deleted_size = Size(-(old.size.0));
@@ -866,6 +873,9 @@ impl RedbNeedleMap {
                 txn.commit().map_err(|e| {
                     io::Error::new(io::ErrorKind::Other, format!("redb commit: {}", e))
                 })?;
+                if self.idx_file.is_some() {
+                    self.idx_file_offset += NEEDLE_MAP_ENTRY_SIZE as u64;
+                }
                 self.writes_since_checkpoint = self.writes_since_checkpoint.saturating_add(1);
 
                 // Only now is the tombstone in the table the metrics describe.