gsadmin/rustfs
1
0
Fork 0
mirror of https://github.com/rustfs/rustfs.git synced 2026-10-04 04:21:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix(test): keep bucket disk faults across reconnects (#8224)

Browse Source
This commit is contained in:
Chris
2026-09-29 14:07:30 +08:00
committed by GitHub
parent 2019715d1a
commit d2175d1e1e
1 changed files with 22 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
crates/ecstore/src/store/bucket.rs
+22 -4
View File
@@ -1569,12 +1569,27 @@ mod tests {
disk_indexes: &[usize],
) -> Vec<(usize, crate::disk::DiskStore)> {
let offline = {
let mut disks = set.disks.write().await;
let disks = set.disks.read().await;
disk_indexes
.iter()
.map(|index| (*index, disks[*index].take().expect("fault-injection disk should start online")))
.map(|index| (*index, disks[*index].clone().expect("fault-injection disk should start online")))
.collect::<Vec<_>>()
};
for (_, disk) in &offline {
disk.close().await.expect("fault injection should stop per-disk monitoring");
disk.force_offline_for_test();
}
// Empty slots can be renewed from the still-present disk paths by the endpoint monitor.
// Keep the original handles and prove reconnect cannot clear their injected IO failure.
set.connect_disks().await;
{
let disks = set.disks.read().await;
for (index, disk) in &offline {
let current = disks[*index].as_ref().expect("fault-injection slot should remain populated");
assert!(Arc::ptr_eq(current, disk), "reconnect must preserve the fault-injection handle");
assert_eq!(disk.runtime_state(), crate::disk::health_state::RuntimeDriveHealthState::Offline);
}
}
let local_disk_map = ecstore.ctx.local_disk_map();
let mut local_disks = local_disk_map.write().await;
for (_, disk) in &offline {
@@ -1595,9 +1610,12 @@ mod tests {
local_disks.insert(disk.endpoint().to_string(), Some(Arc::clone(disk)));
}
}
let mut disks = set.disks.write().await;
let disks = set.disks.read().await;
for (index, disk) in offline {
assert!(disks[index].replace(disk).is_none(), "fault-injection disk slot should remain empty");
let current = disks[index].as_ref().expect("fault-injection slot should remain populated");
assert!(Arc::ptr_eq(current, &disk), "fault-injection disk handle should remain unchanged");
assert_eq!(disk.runtime_state(), crate::disk::health_state::RuntimeDriveHealthState::Offline);
disk.reset_health_for_store_init_retry();
}
}