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

fix(scanner): canonicalize temp_dir for drive field assertion on macOS

Browse Source 
On macOS, /var is a symlink to /private/var. The scanner's local_disk.path()
returns the canonicalized path, but tempfile::tempdir() returns the
non-canonical /var/... path. This caused the drive field assertion in
test_scan_folder_corrupt_xl_meta_stops_erasure_data_dir_descent to fail
with a path mismatch.

Fix by canonicalizing temp_dir only for the drive field comparison,
while keeping the non-canonical path for metadata_path and failed_objects
which use the original directory walk paths.
This commit is contained in:
overtrue
2026-08-17 02:03:06 +08:00
parent 39274fc37c
commit 83c0b819bc
1 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
crates/scanner/src/scanner_folder.rs
+3 -1
View File
@@ -4621,6 +4621,8 @@ mod tests {
let _subscriber_guard = tracing::subscriber::set_default(subscriber);
let (mut scanner, temp_dir) = build_test_scanner().await;
// Canonicalize for the "drive" field comparison (scanner resolves symlinks).
let canonical_temp_dir = std::fs::canonicalize(&temp_dir).unwrap_or_else(|_| temp_dir.clone());
let _guard = TestGuard::new(60, 100, &mut scanner, temp_dir.clone());
let object_dir = temp_dir.join("bucket").join("object");
@@ -4689,7 +4691,7 @@ mod tests {
let fields = &events[0]["fields"];
assert_eq!(fields["component"], LOG_COMPONENT_SCANNER);
assert_eq!(fields["subsystem"], LOG_SUBSYSTEM_FOLDER);
assert_eq!(fields["drive"], temp_dir.to_string_lossy().as_ref());
assert_eq!(fields["drive"], canonical_temp_dir.to_string_lossy().as_ref());
assert_eq!(fields["bucket"], "bucket");
assert_eq!(fields["object"], "object");
assert_eq!(fields["metadata_path"], metadata_path.to_string_lossy().as_ref());