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

refactor(runtime): hide local disk id global (#4047)

Browse Source
This commit is contained in:
Zhengchao An
2026-06-29 16:33:36 +08:00
committed by GitHub
parent ad6be6a167
commit ecbc5385d3
4 changed files with 23 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
crates/ecstore/src/runtime/sources.rs
+5
View File
@@ -401,6 +401,11 @@ pub(crate) async fn local_disk_path_by_id(disk_id: &Uuid) -> Option<String> {
GLOBAL_LOCAL_DISK_ID_MAP.read().await.get(disk_id).cloned()
}
#[cfg(test)]
pub(crate) async fn clear_local_disk_id_map_for_test() {
GLOBAL_LOCAL_DISK_ID_MAP.write().await.clear();
}
pub(crate) async fn record_local_disk_id(disk_id: Uuid, endpoint: String) {
GLOBAL_LOCAL_DISK_ID_MAP.write().await.insert(disk_id, endpoint);
}
crates/ecstore/src/store/mod.rs
+4 -6
View File
@@ -755,7 +755,8 @@ impl crate::storage_api_contracts::admin::StorageAdminApi for ECStore {
mod tests {
use super::*;
use crate::layout::endpoints::{Endpoints, PoolEndpoints};
use crate::runtime::global::{GLOBAL_LOCAL_DISK_ID_MAP, reset_local_disk_test_state};
use crate::runtime::global::reset_local_disk_test_state;
use crate::runtime::sources::{clear_local_disk_id_map_for_test, local_disk_path_by_id};
use crate::store::init_format::{connect_load_init_formats, init_disks};
use serial_test::serial;
use tempfile::TempDir;
@@ -832,7 +833,7 @@ mod tests {
.await
.expect("initialize format metadata");
GLOBAL_LOCAL_DISK_ID_MAP.write().await.clear();
clear_local_disk_id_map_for_test().await;
let local_disks = all_local_disk().await;
let first_disk = local_disks.first().expect("local disk exists");
@@ -844,10 +845,7 @@ mod tests {
let found = find_local_disk_by_ref(&disk_id.to_string()).await;
assert!(found.is_some(), "disk lookup by id should backfill cache");
assert_eq!(
GLOBAL_LOCAL_DISK_ID_MAP.read().await.get(&disk_id).cloned(),
Some(first_disk.endpoint().to_string())
);
assert_eq!(local_disk_path_by_id(&disk_id).await, Some(first_disk.endpoint().to_string()));
reset_local_disk_test_state().await;
}