refactor: route ecstore runtime globals through facade (#3941)

crates/ecstore/src/api/mod.rs

@@ -120,6 +120,13 @@ pub mod global {
     };
 }
 
+pub mod runtime {
+    pub use crate::runtime::sources::{
+        bucket_monitor, first_cluster_node_is_local, global_tier_config_mgr, local_disk_map_read, object_store_handle,
+        setup_is_erasure, setup_is_erasure_sd,
+    };
+}
+
 pub mod layout {
     pub use crate::layout::disks_layout::DisksLayout;
     pub use crate::layout::endpoints::{EndpointServerPools, Endpoints, PoolEndpoints, SetupType};

crates/ecstore/src/runtime/sources.rs

@@ -50,7 +50,7 @@ use rustfs_kms::{ObjectEncryptionService, get_global_encryption_service};
 use rustfs_lock::client::LockClient;
 use s3s::dto::BucketLifecycleConfiguration;
 use s3s::region::Region;
-use tokio::sync::RwLock;
+use tokio::sync::{RwLock, RwLockReadGuard};
 use tonic::transport::Channel;
 use uuid::Uuid;
 
@@ -108,7 +108,7 @@ pub(crate) async fn object_encryption_service() -> Option<Arc<ObjectEncryptionSe
     get_global_encryption_service().await
 }
 
-pub(crate) fn object_store_handle() -> Option<Arc<ECStore>> {
+pub fn object_store_handle() -> Option<Arc<ECStore>> {
     resolve_object_store_handle()
 }
 
@@ -131,11 +131,11 @@ pub(crate) fn endpoint_pool_is_local(pool_index: usize) -> bool {
         .is_some_and(|pool| pool.endpoints.as_ref().first().is_some_and(|endpoint| endpoint.is_local))
 }
 
-pub(crate) async fn first_cluster_node_is_local() -> bool {
+pub async fn first_cluster_node_is_local() -> bool {
     is_first_cluster_node_local().await
 }
 
-pub(crate) async fn setup_is_erasure() -> bool {
+pub async fn setup_is_erasure() -> bool {
     is_erasure().await
 }
 
@@ -143,7 +143,7 @@ pub(crate) async fn setup_is_dist_erasure() -> bool {
     is_dist_erasure().await
 }
 
-pub(crate) async fn setup_is_erasure_sd() -> bool {
+pub async fn setup_is_erasure_sd() -> bool {
     *GLOBAL_IsErasureSD.read().await
 }
 
@@ -336,7 +336,7 @@ pub(crate) fn batch_processors() -> &'static GlobalBatchProcessors {
     get_global_processors()
 }
 
-pub(crate) fn global_tier_config_mgr() -> Arc<RwLock<TierConfigMgr>> {
+pub fn global_tier_config_mgr() -> Arc<RwLock<TierConfigMgr>> {
     get_global_tier_config_mgr()
 }
 
@@ -350,10 +350,14 @@ pub(crate) fn delete_bucket_monitor_entry(bucket: &str) {
     }
 }
 
-pub(crate) fn bucket_monitor() -> Option<Arc<Monitor>> {
+pub fn bucket_monitor() -> Option<Arc<Monitor>> {
     get_global_bucket_monitor()
 }
 
+pub async fn local_disk_map_read() -> RwLockReadGuard<'static, HashMap<String, Option<DiskStore>>> {
+    GLOBAL_LOCAL_DISK_MAP.read().await
+}
+
 pub(crate) fn init_bucket_monitor_for_current_endpoints() {
     let num_nodes = get_global_endpoints().get_nodes().len().try_into().unwrap_or(u64::MAX);
     init_global_bucket_monitor(num_nodes);

crates/heal/src/heal/mod.rs

@@ -24,9 +24,9 @@ pub mod task;
 pub mod utils;
 
 use storage_api::owner::{
-    ECSTORE_BUCKET_META_PREFIX, ECSTORE_DATA_USAGE_CACHE_NAME, ECSTORE_GLOBAL_LOCAL_DISK_MAP, ECSTORE_RUSTFS_META_BUCKET,
-    EcstoreDeleteOptions, EcstoreDiskAPI, EcstoreDiskBytes, EcstoreDiskError, EcstoreDiskResult, EcstoreDiskStore,
-    EcstoreEndpoint, EcstoreErrorType, EcstoreStorageError, EcstoreStore, ObjectIO, ObjectOperations,
+    ECSTORE_BUCKET_META_PREFIX, ECSTORE_DATA_USAGE_CACHE_NAME, ECSTORE_RUSTFS_META_BUCKET, EcstoreDeleteOptions, EcstoreDiskAPI,
+    EcstoreDiskBytes, EcstoreDiskError, EcstoreDiskResult, EcstoreDiskStore, EcstoreEndpoint, EcstoreErrorType,
+    EcstoreStorageError, EcstoreStore, ObjectIO, ObjectOperations, ecstore_local_disk_map_read,
 };
 #[cfg(test)]
 use storage_api::owner::{EcstoreDiskOption, ecstore_new_disk};
@@ -55,7 +55,7 @@ pub(crate) static GLOBAL_LOCAL_DISK_MAP: GlobalLocalDiskMap = GlobalLocalDiskMap
 
 impl GlobalLocalDiskMap {
     pub(crate) async fn read(&self) -> tokio::sync::RwLockReadGuard<'static, LocalDiskMap> {
-        ECSTORE_GLOBAL_LOCAL_DISK_MAP.read().await
+        ecstore_local_disk_map_read().await
     }
 }
 

crates/heal/src/heal/storage_api.rs

@@ -22,7 +22,7 @@ pub(crate) use rustfs_ecstore::api::disk::{
 #[cfg(test)]
 pub(crate) use rustfs_ecstore::api::disk::{DiskOption as EcstoreDiskOption, new_disk as ecstore_new_disk};
 pub(crate) use rustfs_ecstore::api::error::{Error as EcstoreErrorType, StorageError as EcstoreStorageError};
-pub(crate) use rustfs_ecstore::api::global::GLOBAL_LOCAL_DISK_MAP as ECSTORE_GLOBAL_LOCAL_DISK_MAP;
+pub(crate) use rustfs_ecstore::api::runtime::local_disk_map_read as ecstore_local_disk_map_read;
 pub(crate) use rustfs_ecstore::api::storage::ECStore as EcstoreStore;
 use rustfs_storage_api as storage_contracts;
 
@@ -30,9 +30,9 @@ pub(crate) mod owner {
     pub(crate) use super::storage_contracts::{ObjectIO, ObjectOperations};
 
     pub(crate) use super::{
-        ECSTORE_BUCKET_META_PREFIX, ECSTORE_DATA_USAGE_CACHE_NAME, ECSTORE_GLOBAL_LOCAL_DISK_MAP, ECSTORE_RUSTFS_META_BUCKET,
-        EcstoreDeleteOptions, EcstoreDiskAPI, EcstoreDiskBytes, EcstoreDiskError, EcstoreDiskResult, EcstoreDiskStore,
-        EcstoreEndpoint, EcstoreErrorType, EcstoreStorageError, EcstoreStore,
+        ECSTORE_BUCKET_META_PREFIX, ECSTORE_DATA_USAGE_CACHE_NAME, ECSTORE_RUSTFS_META_BUCKET, EcstoreDeleteOptions,
+        EcstoreDiskAPI, EcstoreDiskBytes, EcstoreDiskError, EcstoreDiskResult, EcstoreDiskStore, EcstoreEndpoint,
+        EcstoreErrorType, EcstoreStorageError, EcstoreStore, ecstore_local_disk_map_read,
     };
 
     #[cfg(test)]

crates/iam/src/storage_api.rs

@@ -24,10 +24,10 @@ use rustfs_ecstore::api::error::{
     Error as EcstoreErrorType, Result as EcstoreResultType, StorageError as EcstoreStorageError,
     classify_system_path_failure_reason as ecstore_classify_system_path_failure_reason,
 };
-use rustfs_ecstore::api::global::is_first_cluster_node_local as ecstore_is_first_cluster_node_local;
 use rustfs_ecstore::api::notification::{
     NotificationPeerErr as EcstoreNotificationPeerErr, NotificationSys as EcstoreNotificationSys, get_global_notification_sys,
 };
+use rustfs_ecstore::api::runtime::first_cluster_node_is_local as ecstore_first_cluster_node_is_local;
 use rustfs_ecstore::api::storage::ECStore as EcstoreStore;
 use rustfs_storage_api as storage_contracts;
 
@@ -74,7 +74,7 @@ pub(crate) fn classify_iam_system_path_failure_reason(err: &IamEcstoreError) ->
 }
 
 pub(crate) async fn is_iam_first_cluster_node_local() -> bool {
-    ecstore_is_first_cluster_node_local().await
+    ecstore_first_cluster_node_is_local().await
 }
 
 pub(crate) fn notification_sys() -> Option<&'static IamNotificationSys> {

crates/notify/src/storage_api.rs

@@ -18,7 +18,7 @@ use rustfs_ecstore::api::config::com::{
     read_config_without_migrate as read_notify_config_without_migrate_from_backend,
     save_server_config as save_notify_server_config_to_backend,
 };
-use rustfs_ecstore::api::global::resolve_object_store_handle as resolve_notify_object_store_handle_from_backend;
+use rustfs_ecstore::api::runtime::object_store_handle as resolve_notify_object_store_handle_from_backend;
 pub(crate) use rustfs_ecstore::api::storage::ECStore as NotifyStore;
 
 pub(crate) fn resolve_notify_object_store_handle() -> Option<Arc<NotifyStore>> {

crates/obs/src/metrics/storage_api.rs

@@ -26,8 +26,8 @@ pub(crate) use rustfs_ecstore::api::capacity::{
 };
 pub(crate) use rustfs_ecstore::api::data_usage::load_data_usage_from_backend as obs_load_data_usage_from_backend;
 pub(crate) use rustfs_ecstore::api::error::Result as ObsEcstoreResult;
-pub(crate) use rustfs_ecstore::api::global::{
-    get_global_bucket_monitor as obs_get_global_bucket_monitor, resolve_object_store_handle as obs_resolve_object_store_handle,
+pub(crate) use rustfs_ecstore::api::runtime::{
+    bucket_monitor as obs_get_global_bucket_monitor, object_store_handle as obs_resolve_object_store_handle,
 };
 pub(crate) use rustfs_ecstore::api::storage::ECStore as ObsStore;
 use rustfs_storage_api as storage_contracts;

crates/protocols/src/swift/storage_api.rs

@@ -19,7 +19,7 @@ use rustfs_ecstore::api::bucket::metadata_sys::{
     get as get_swift_bucket_metadata_from_backend, set_bucket_metadata as set_swift_bucket_metadata_in_backend,
 };
 pub(crate) use rustfs_ecstore::api::error::Result as SwiftStorageResult;
-pub(crate) use rustfs_ecstore::api::global::resolve_object_store_handle as resolve_swift_object_store_handle;
+pub(crate) use rustfs_ecstore::api::runtime::object_store_handle as resolve_swift_object_store_handle;
 use rustfs_ecstore::api::storage::ECStore as SwiftStore;
 use rustfs_storage_api as storage_contracts;
 

crates/s3select-api/src/storage_api.rs

@@ -20,7 +20,7 @@ use rustfs_ecstore::api::error::{
     is_err_object_not_found as select_is_err_object_not_found_from_backend,
     is_err_version_not_found as select_is_err_version_not_found_from_backend,
 };
-use rustfs_ecstore::api::global::resolve_object_store_handle as resolve_select_object_store_handle_from_backend;
+use rustfs_ecstore::api::runtime::object_store_handle as resolve_select_object_store_handle_from_backend;
 pub(crate) use rustfs_ecstore::api::set_disk::DEFAULT_READ_BUFFER_SIZE as SELECT_DEFAULT_READ_BUFFER_SIZE;
 pub(crate) use rustfs_ecstore::api::storage::ECStore as SelectStore;
 use rustfs_storage_api as storage_contracts;

crates/scanner/src/storage_api.rs

@@ -65,9 +65,9 @@ pub(crate) use rustfs_ecstore::api::disk::{
 pub(crate) use rustfs_ecstore::api::error::{
     Error as EcstoreErrorType, Result as EcstoreResultType, StorageError as EcstoreStorageError,
 };
-pub(crate) use rustfs_ecstore::api::global::{
-    get_global_tier_config_mgr as ecstore_get_global_tier_config_mgr, is_erasure as ecstore_is_erasure,
-    is_erasure_sd as ecstore_is_erasure_sd, resolve_object_store_handle as ecstore_resolve_object_store_handle,
+pub(crate) use rustfs_ecstore::api::runtime::{
+    global_tier_config_mgr as ecstore_get_global_tier_config_mgr, object_store_handle as ecstore_resolve_object_store_handle,
+    setup_is_erasure as ecstore_is_erasure, setup_is_erasure_sd as ecstore_is_erasure_sd,
 };
 pub(crate) use rustfs_ecstore::api::set_disk::SetDisks as EcstoreSetDisks;
 pub(crate) use rustfs_ecstore::api::storage::ECStore as EcstoreStore;

crates/scanner/tests/storage_api/mod.rs

@@ -24,8 +24,8 @@ pub(crate) use rustfs_ecstore::api::bucket::versioning_sys::BucketVersioningSys;
 pub(crate) use rustfs_ecstore::api::capacity::path2_bucket_object_with_base_path;
 pub(crate) use rustfs_ecstore::api::client::transition_api::{ReadCloser, ReaderImpl};
 pub(crate) use rustfs_ecstore::api::disk::{DiskAPI, DiskOption, STORAGE_FORMAT_FILE, endpoint::Endpoint, new_disk};
-pub(crate) use rustfs_ecstore::api::global::get_global_tier_config_mgr;
 pub(crate) use rustfs_ecstore::api::layout::{EndpointServerPools, Endpoints, PoolEndpoints};
+pub(crate) use rustfs_ecstore::api::runtime::global_tier_config_mgr as get_global_tier_config_mgr;
 pub(crate) use rustfs_ecstore::api::storage::{ECStore, init_local_disks};
 pub(crate) use rustfs_ecstore::api::tier::tier_config::{TierConfig, TierMinIO, TierType};
 pub(crate) use rustfs_ecstore::api::tier::warm_backend::{