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

refactor: use relative app compat consumers (#3731)

Browse Source
This commit is contained in:
安正超
2026-06-22 14:37:20 +08:00
committed by GitHub
parent 1a709e14c0
commit a3202eb6bb
8 changed files with 55 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files
rustfs/src/app/context/compat.rs
+9 -9
View File
@@ -17,11 +17,11 @@ use super::handles::{
default_bucket_metadata_interface, default_endpoints_interface, default_kms_runtime_interface,
default_server_config_interface, default_tier_config_interface,
};
use crate::app::context::storage_compat::ECStore;
use crate::app::context::storage_compat::EndpointServerPools;
use crate::app::context::storage_compat::TierConfigMgr;
use crate::app::context::storage_compat::metadata_sys::BucketMetadataSys;
use crate::app::context::storage_compat::new_object_layer_fn;
use super::storage_compat::ECStore;
use super::storage_compat::EndpointServerPools;
use super::storage_compat::TierConfigMgr;
use super::storage_compat::metadata_sys::BucketMetadataSys;
use super::storage_compat::new_object_layer_fn;
#[cfg(test)]
use crate::config::RustFSBufferConfig;
use rustfs_config::server_config::Config;
@@ -119,6 +119,10 @@ fn resolve_buffer_config_with(
#[cfg(test)]
mod tests {
use super::super::storage_compat::Endpoint;
use super::super::storage_compat::init_local_disks;
use super::super::storage_compat::new_object_layer_fn;
use super::super::storage_compat::{Endpoints, PoolEndpoints};
use super::*;
use crate::app::context::global::AppContextTestInterfaces;
use crate::app::context::handles::{default_notify_interface, default_region_interface};
@@ -126,10 +130,6 @@ mod tests {
BucketMetadataInterface, BufferConfigInterface, EndpointsInterface, IamInterface, KmsInterface, KmsRuntimeInterface,
ServerConfigInterface, TierConfigInterface,
};
use crate::app::context::storage_compat::Endpoint;
use crate::app::context::storage_compat::init_local_disks;
use crate::app::context::storage_compat::new_object_layer_fn;
use crate::app::context::storage_compat::{Endpoints, PoolEndpoints};
use crate::config::{RustFSBufferConfig, WorkloadProfile};
use rustfs_iam::{store::object::ObjectStore, sys::IamSys};
use std::path::PathBuf;
rustfs/src/app/context/global.rs
+1 -1
View File
@@ -21,7 +21,7 @@ use super::interfaces::{
BucketMetadataInterface, BufferConfigInterface, EndpointsInterface, IamInterface, KmsInterface, KmsRuntimeInterface,
NotifyInterface, RegionInterface, ServerConfigInterface, TierConfigInterface,
};
use crate::app::context::storage_compat::{ECStore, set_object_store_resolver};
use super::storage_compat::{ECStore, set_object_store_resolver};
use rustfs_iam::{store::object::ObjectStore, sys::IamSys};
use rustfs_kms::KmsServiceManager;
use std::sync::{Arc, OnceLock};
rustfs/src/app/context/handles.rs
+4 -4
View File
@@ -16,10 +16,10 @@ use super::interfaces::{
BucketMetadataInterface, BufferConfigInterface, EndpointsInterface, IamInterface, KmsInterface, KmsRuntimeInterface,
NotifyInterface, RegionInterface, ServerConfigInterface, TierConfigInterface,
};
use crate::app::context::storage_compat::EndpointServerPools;
use crate::app::context::storage_compat::TierConfigMgr;
use crate::app::context::storage_compat::metadata_sys::{BucketMetadataSys, get_global_bucket_metadata_sys};
use crate::app::context::storage_compat::{get_global_endpoints_opt, get_global_region, get_global_tier_config_mgr};
use super::storage_compat::EndpointServerPools;
use super::storage_compat::TierConfigMgr;
use super::storage_compat::metadata_sys::{BucketMetadataSys, get_global_bucket_metadata_sys};
use super::storage_compat::{get_global_endpoints_opt, get_global_region, get_global_tier_config_mgr};
use crate::config::{RustFSBufferConfig, get_global_buffer_config};
use async_trait::async_trait;
use rustfs_config::server_config::Config;
rustfs/src/app/context/interfaces.rs
+3 -3
View File
@@ -12,9 +12,9 @@
// See the License for the specific language governing permissions and
// limitations under the License.
use crate::app::context::storage_compat::EndpointServerPools;
use crate::app::context::storage_compat::TierConfigMgr;
use crate::app::context::storage_compat::metadata_sys::BucketMetadataSys;
use super::storage_compat::EndpointServerPools;
use super::storage_compat::TierConfigMgr;
use super::storage_compat::metadata_sys::BucketMetadataSys;
use crate::config::RustFSBufferConfig;
use async_trait::async_trait;
use rustfs_config::server_config::Config;
rustfs/src/app/context/startup.rs
+1 -1
View File
@@ -13,7 +13,7 @@
// limitations under the License.
use super::global::{AppContext, get_global_app_context, init_global_app_context};
use crate::app::context::storage_compat::ECStore;
use super::storage_compat::ECStore;
use rustfs_kms::KmsServiceManager;
use std::io::{Error, Result};
use std::sync::Arc;
rustfs/src/server/readiness.rs
+2 -2
View File
@@ -839,7 +839,7 @@ mod tests {
#[test]
fn aggregate_lock_quorum_status_requires_each_set_to_meet_quorum() {
use crate::server::storage_compat::{Endpoint, EndpointServerPools, Endpoints, PoolEndpoints};
use super::super::storage_compat::{Endpoint, EndpointServerPools, Endpoints, PoolEndpoints};
let endpoints = vec![
Endpoint {
@@ -896,7 +896,7 @@ mod tests {
#[test]
fn aggregate_lock_quorum_status_fails_when_any_set_loses_quorum() {
use crate::server::storage_compat::{Endpoint, EndpointServerPools, Endpoints, PoolEndpoints};
use super::super::storage_compat::{Endpoint, EndpointServerPools, Endpoints, PoolEndpoints};
let endpoints = vec![
Endpoint {