From 1631ac62934fa164b1e033a5d6e79a2bb24d00cc Mon Sep 17 00:00:00 2001
From: Chris Lu <chris.lu@gmail.com>
Date: Tue, 17 Mar 2026 15:49:53 -0700
Subject: [PATCH] Match Go volume: add commit_compact guard and scrub data size
 validation

Two fixes: (1) commit_compact now checks/sets is_compacting flag to
prevent concurrent commits, matching Go's CompareAndSwap guard.
(2) scrub now validates total needle sizes against .dat file size.
---
 seaweed-volume/src/storage/volume.rs | 32 ++++++++++++++++++++++++++++
 1 file changed, 32 insertions(+)

diff --git a/seaweed-volume/src/storage/volume.rs b/seaweed-volume/src/storage/volume.rs
index 71776e7db..c27527d81 100644
--- a/seaweed-volume/src/storage/volume.rs
+++ b/seaweed-volume/src/storage/volume.rs
@@ -1923,15 +1923,20 @@ impl Volume {
         let nm = self.nm.as_ref().ok_or(VolumeError::NotFound)?;
 
         let dat_size = self.dat_file_size().map_err(|e| VolumeError::Io(e))?;
+        let version = self.version();
 
         let mut files_checked: u64 = 0;
         let mut broken = Vec::new();
+        let mut total_read: i64 = 0;
 
         for (needle_id, nv) in nm.iter_entries() {
             if nv.offset.is_zero() || nv.size.is_deleted() {
                 continue;
             }
 
+            // Accumulate actual needle size (matches Go's totalRead += GetActualSize)
+            total_read += get_actual_size(nv.size, version);
+
             let offset = nv.offset.to_actual_offset();
             if offset < 0 || offset as u64 >= dat_size {
                 broken.push(format!(
@@ -1956,6 +1961,20 @@ impl Volume {
             files_checked += 1;
         }
 
+        // Validate total data size against .dat file size (matches Go's scrubVolumeData)
+        let expected_size = total_read + SUPER_BLOCK_SIZE as i64;
+        if (dat_size as i64) < expected_size {
+            broken.push(format!(
+                "dat file size {} is smaller than expected {} (total_read {} + super_block {})",
+                dat_size, expected_size, total_read, SUPER_BLOCK_SIZE
+            ));
+        } else if dat_size as i64 != expected_size {
+            broken.push(format!(
+                "warning: dat file size {} does not match expected {} (total_read {} + super_block {})",
+                dat_size, expected_size, total_read, SUPER_BLOCK_SIZE
+            ));
+        }
+
         Ok((files_checked, broken))
     }
 
@@ -2676,7 +2695,20 @@ impl Volume {
     }
 
     /// Commit a previously completed compaction: swap .cpd/.cpx to .dat/.idx and reload.
+    /// Matches Go's isCompactionInProgress CompareAndSwap guard.
     pub fn commit_compact(&mut self) -> Result<(), VolumeError> {
+        if self.is_compacting {
+            return Ok(()); // already compacting, silently skip (matches Go)
+        }
+        self.is_compacting = true;
+
+        let result = self.do_commit_compact();
+
+        self.is_compacting = false;
+        result
+    }
+
+    fn do_commit_compact(&mut self) -> Result<(), VolumeError> {
         self.makeup_diff().map_err(|e| {
             warn!("makeup_diff failed: {}", e);
             e