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

fix(runtime): remove startup panic fallbacks (#3754)

Browse Source 
* fix(runtime): remove startup panic fallbacks

* test(runtime): cover buffer profile fallback safety

* test(runtime): reduce panic-style assertions

* fix(runtime): expose fallible env config setup

* test(runtime): simplify permit acquisition assertion

* test(runtime): tighten operation helper assertions

* fix(filemeta): stop panicking on invalid free version ids

* fix(init): satisfy buffer profile clippy lints

* fix(lock): harden fast lock config construction

* chore(checks): refresh layer dependency baseline

---------

Signed-off-by: houseme <housemecn@gmail.com>
This commit is contained in:
houseme
2026-06-23 12:31:26 +08:00
committed by GitHub
parent 583a23bdf2
commit a6878e8fce
11 changed files with 285 additions and 82 deletions
Download Patch File Download Diff File Expand all files Collapse all files
crates/filemeta/src/filemeta.rs
+1 -1
View File
@@ -652,7 +652,7 @@ impl FileMeta {
} else {
self.versions.remove(i);
let (free_version, to_free) = obj.init_free_version(fi);
let (free_version, to_free) = obj.init_free_version(fi)?;
if to_free {
self.add_version_filemata(free_version).err()
crates/filemeta/src/filemeta/version.rs
+21 -9
View File
@@ -2140,18 +2140,14 @@ impl MetaObject {
[bytes[0], bytes[1], bytes[2], bytes[3]]
}
pub fn init_free_version(&self, fi: &FileInfo) -> (FileMetaVersion, bool) {
pub fn init_free_version(&self, fi: &FileInfo) -> Result<(FileMetaVersion, bool)> {
if fi.skip_tier_free_version() {
return (FileMetaVersion::default(), false);
return Ok((FileMetaVersion::default(), false));
}
if let Some(status) = get_bytes(&self.meta_sys, SUFFIX_TRANSITION_STATUS)
&& status == TRANSITION_COMPLETE.as_bytes().to_vec()
{
let vid = Uuid::parse_str(&fi.tier_free_version_id());
if let Err(err) = vid {
panic!("Invalid Tier Object delete marker versionId {} {}", fi.tier_free_version_id(), err);
}
let vid = vid.unwrap();
let vid = Uuid::parse_str(&fi.tier_free_version_id())?;
let mut free_entry = FileMetaVersion {
version_type: VersionType::Delete,
write_version: 0,
@@ -2176,9 +2172,9 @@ impl MetaObject {
insert_bytes(&mut delete_marker.meta_sys, suffix, v);
}
}
return (free_entry, true);
return Ok((free_entry, true));
}
(FileMetaVersion::default(), false)
Ok((FileMetaVersion::default(), false))
}
}
@@ -3391,4 +3387,20 @@ mod tests {
.into_fileinfo("b", "k", false);
assert_eq!(fi.transition_version_id, Some(id));
}
#[test]
fn meta_object_init_free_version_rejects_invalid_tier_free_version_id() {
let mut sys = HashMap::new();
insert_bytes(&mut sys, SUFFIX_TRANSITION_STATUS, TRANSITION_COMPLETE.as_bytes().to_vec());
let obj = make_meta_object_with_sys(sys);
let mut fi = FileInfo::new("object", 2, 2);
fi.set_tier_free_version_id("not-a-uuid");
let err = obj
.init_free_version(&fi)
.expect_err("invalid free-version UUID should return an error instead of panicking");
assert!(matches!(err, Error::UuidParse(_)));
}
}