gsadmin/rustfs
1
0
Fork 0
mirror of https://github.com/rustfs/rustfs.git synced 2026-08-27 15:37:02 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix(ecstore): log missing local paths during physical disk independence checks (#2680)

Browse Source
This commit is contained in:
houseme
2026-04-25 16:01:01 +08:00
committed by GitHub
parent 1e9c75a201
commit 81854762d4
3 changed files with 19 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Cargo.lock
Generated
+5 -5
View File
@@ -5986,7 +5986,7 @@ version = "5.0.0"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "51e219e79014df21a225b1860a479e2dcd7cbd9130f4defd4bd0e191ea31d67d" checksum = "51e219e79014df21a225b1860a479e2dcd7cbd9130f4defd4bd0e191ea31d67d"
dependencies = [ dependencies = [
"base64 0.21.7", "base64 0.22.1",
"chrono", "chrono",
"getrandom 0.2.17", "getrandom 0.2.17",
"http 1.4.0", "http 1.4.0",
@@ -6894,7 +6894,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "be769465445e8c1474e9c5dac2018218498557af32d9ed057325ec9a41ae81bf" checksum = "be769465445e8c1474e9c5dac2018218498557af32d9ed057325ec9a41ae81bf"
dependencies = [ dependencies = [
"heck", "heck",
"itertools 0.10.5", "itertools 0.14.0",
"log", "log",
"multimap", "multimap",
"once_cell", "once_cell",
@@ -6914,7 +6914,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "343d3bd7056eda839b03204e68deff7d1b13aba7af2b2fd16890697274262ee7" checksum = "343d3bd7056eda839b03204e68deff7d1b13aba7af2b2fd16890697274262ee7"
dependencies = [ dependencies = [
"heck", "heck",
"itertools 0.10.5", "itertools 0.14.0",
"log", "log",
"multimap", "multimap",
"petgraph 0.8.3", "petgraph 0.8.3",
@@ -6935,7 +6935,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "8a56d757972c98b346a9b766e3f02746cde6dd1cd1d1d563472929fdd74bec4d" checksum = "8a56d757972c98b346a9b766e3f02746cde6dd1cd1d1d563472929fdd74bec4d"
dependencies = [ dependencies = [
"anyhow", "anyhow",
"itertools 0.10.5", "itertools 0.14.0",
"proc-macro2", "proc-macro2",
"quote", "quote",
"syn 2.0.117", "syn 2.0.117",
@@ -6948,7 +6948,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "27c6023962132f4b30eb4c172c91ce92d933da334c59c23cddee82358ddafb0b" checksum = "27c6023962132f4b30eb4c172c91ce92d933da334c59c23cddee82358ddafb0b"
dependencies = [ dependencies = [
"anyhow", "anyhow",
"itertools 0.10.5", "itertools 0.14.0",
"proc-macro2", "proc-macro2",
"quote", "quote",
"syn 2.0.117", "syn 2.0.117",
crates/ecstore/src/disk/local.rs
+2 -2
View File
@@ -176,7 +176,7 @@ impl LocalDisk {
let root = root_clone.clone(); let root = root_clone.clone();
Box::pin(async move { Box::pin(async move {
match get_disk_info(root.clone()).await { match get_disk_info(root.clone()).await {
Ok((info, root_disk)) => { Ok((info, is_root_disk)) => {
let physical_device_ids = match rustfs_utils::os::get_physical_device_ids(root.to_string_lossy().as_ref()) let physical_device_ids = match rustfs_utils::os::get_physical_device_ids(root.to_string_lossy().as_ref())
{ {
Ok(ids) => ids, Ok(ids) => ids,
@@ -194,7 +194,7 @@ impl LocalDisk {
major: info.major, major: info.major,
minor: info.minor, minor: info.minor,
fs_type: info.fstype, fs_type: info.fstype,
root_disk, root_disk: is_root_disk,
physical_device_ids, physical_device_ids,
id: disk_id, id: disk_id,
..Default::default() ..Default::default()
crates/ecstore/src/endpoints.rs
+12 -1
View File
@@ -683,11 +683,15 @@ fn validate_local_physical_disk_independence(pools: &[Endpoints]) -> Result<()>
} }
let mut device_paths = BTreeMap::<String, BTreeSet<String>>::new(); let mut device_paths = BTreeMap::<String, BTreeSet<String>>::new();
let mut missing_paths = Vec::new();
for path in &local_paths { for path in &local_paths {
let canonical = match rustfs_utils::canonicalize(path) { let canonical = match rustfs_utils::canonicalize(path) {
Ok(path) => path, Ok(path) => path,
Err(err) if err.kind() == ErrorKind::NotFound => continue, Err(err) if err.kind() == ErrorKind::NotFound => {
missing_paths.push(path.clone());
continue;
}
Err(err) => { Err(err) => {
return Err(Error::other(format!( return Err(Error::other(format!(
"failed to resolve local endpoint path '{path}' for disk validation: {err}" "failed to resolve local endpoint path '{path}' for disk validation: {err}"
@@ -704,6 +708,13 @@ fn validate_local_physical_disk_independence(pools: &[Endpoints]) -> Result<()>
} }
} }
if !missing_paths.is_empty() {
warn!(
missing_paths = ?missing_paths,
"Excluding non-existent local endpoint paths from physical disk independence validation during endpoint parsing",
);
}
let shared_devices = device_paths let shared_devices = device_paths
.into_iter() .into_iter()
.filter_map(|(device_id, paths)| { .filter_map(|(device_id, paths)| {