From 14fe4897e2f85446d2a858fa7de7bf899918ca1b Mon Sep 17 00:00:00 2001
From: Chris Lu <chris.lu@gmail.com>
Date: Sun, 8 Mar 2026 16:27:57 -0700
Subject: [PATCH] fix: mount volume by id

---
 seaweed-volume/src/server/grpc_server.rs |  6 +--
 seaweed-volume/src/storage/store.rs      | 60 ++++++++++++++++++++++++
 2 files changed, 63 insertions(+), 3 deletions(-)

diff --git a/seaweed-volume/src/server/grpc_server.rs b/seaweed-volume/src/server/grpc_server.rs
index 33dcef654..84279a5bd 100644
--- a/seaweed-volume/src/server/grpc_server.rs
+++ b/seaweed-volume/src/server/grpc_server.rs
@@ -555,7 +555,7 @@ impl VolumeServer for VolumeGrpcService {
 
         let mut store = self.state.store.write().unwrap();
         store
-            .mount_volume(vid, "", DiskType::HardDrive)
+            .mount_volume_by_id(vid)
             .map_err(|e| Status::internal(e.to_string()))?;
 
         Ok(Response::new(volume_server_pb::VolumeMountResponse {}))
@@ -705,7 +705,7 @@ impl VolumeServer for VolumeGrpcService {
         if let Err(e) = store.configure_volume(vid, rp) {
             let mut error = format!("volume configure {}: {}", vid, e);
             // Error recovery: try to re-mount anyway
-            if let Err(mount_err) = store.mount_volume(vid, "", DiskType::HardDrive) {
+            if let Err(mount_err) = store.mount_volume_by_id(vid) {
                 error += &format!(". Also failed to restore mount: {}", mount_err);
             }
             return Ok(Response::new(volume_server_pb::VolumeConfigureResponse {
@@ -714,7 +714,7 @@ impl VolumeServer for VolumeGrpcService {
         }
 
         // Re-mount the volume
-        if let Err(e) = store.mount_volume(vid, "", DiskType::HardDrive) {
+        if let Err(e) = store.mount_volume_by_id(vid) {
             return Ok(Response::new(volume_server_pb::VolumeConfigureResponse {
                 error: format!("volume configure mount {}: {}", vid, e),
             }));
diff --git a/seaweed-volume/src/storage/store.rs b/seaweed-volume/src/storage/store.rs
index 9dd5e0053..ca8cd5e3f 100644
--- a/seaweed-volume/src/storage/store.rs
+++ b/seaweed-volume/src/storage/store.rs
@@ -219,6 +219,52 @@ impl Store {
         )))
     }
 
+    /// Mount a volume by id only (Go's MountVolume behavior).
+    /// Scans all locations for a matching .dat file and loads with its collection prefix.
+    pub fn mount_volume_by_id(&mut self, vid: VolumeId) -> Result<(), VolumeError> {
+        if self.find_volume(vid).is_some() {
+            return Err(VolumeError::AlreadyExists);
+        }
+        if let Some((loc_idx, _base_path, collection)) = self.find_volume_file_base(vid) {
+            let loc = &mut self.locations[loc_idx];
+            return loc.create_volume(
+                vid,
+                &collection,
+                self.needle_map_kind,
+                None,
+                None,
+                0,
+                Version::current(),
+            );
+        }
+        Err(VolumeError::Io(io::Error::new(
+            io::ErrorKind::NotFound,
+            format!("volume {} not found on disk", vid),
+        )))
+    }
+
+    fn find_volume_file_base(&self, vid: VolumeId) -> Option<(usize, String, String)> {
+        for (loc_idx, loc) in self.locations.iter().enumerate() {
+            if let Ok(entries) = std::fs::read_dir(&loc.directory) {
+                for entry in entries.flatten() {
+                    let name = entry.file_name();
+                    let name = name.to_string_lossy();
+                    if !name.ends_with(".dat") {
+                        continue;
+                    }
+                    if let Some((collection, file_vid)) = parse_volume_filename(&name) {
+                        if file_vid == vid {
+                            let base = name.trim_end_matches(".dat");
+                            let base_path = format!("{}/{}", loc.directory, base);
+                            return Some((loc_idx, base_path, collection));
+                        }
+                    }
+                }
+            }
+        }
+        None
+    }
+
     /// Configure a volume's replica placement on disk.
     /// The volume must already be unmounted. This opens the .dat file directly,
     /// modifies the replica_placement byte (offset 1), and writes it back.
@@ -594,6 +640,20 @@ impl Store {
     }
 }
 
+/// Parse a volume filename like "collection_42.dat" or "42.dat" into (collection, VolumeId).
+fn parse_volume_filename(filename: &str) -> Option<(String, VolumeId)> {
+    let stem = filename.strip_suffix(".dat")?;
+    if let Some(pos) = stem.rfind('_') {
+        let collection = &stem[..pos];
+        let id_str = &stem[pos + 1..];
+        let id: u32 = id_str.parse().ok()?;
+        Some((collection.to_string(), VolumeId(id)))
+    } else {
+        let id: u32 = stem.parse().ok()?;
+        Some((String::new(), VolumeId(id)))
+    }
+}
+
 // ============================================================================
 // Tests
 // ============================================================================