refactor: route ecstore public surfaces through api (#3673)

rustfs/src/admin/storage_compat.rs

@@ -12,6 +12,13 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+pub(crate) use rustfs_ecstore::api::capacity::is_reserved_or_invalid_bucket;
+pub(crate) use rustfs_ecstore::api::layout::EndpointServerPools;
+#[cfg(test)]
+pub(crate) use rustfs_ecstore::api::layout::{Endpoints, PoolEndpoints};
+pub(crate) use rustfs_ecstore::api::metrics::{CollectMetricsOpts, MetricType, collect_local_metrics};
+pub(crate) use rustfs_ecstore::api::notification::get_global_notification_sys;
+pub(crate) use rustfs_ecstore::api::storage::ECStore;
 pub(crate) use rustfs_ecstore::bucket::lifecycle::tier_last_day_stats::DailyAllTierStats;
 pub(crate) use rustfs_ecstore::bucket::{
     bandwidth, bucket_target_sys, lifecycle, metadata, metadata_sys, quota, replication, target, utils, versioning,
@@ -23,22 +30,15 @@ pub(crate) use rustfs_ecstore::data_usage::load_data_usage_from_backend;
 pub(crate) use rustfs_ecstore::disk::RUSTFS_META_BUCKET;
 #[cfg(test)]
 pub(crate) use rustfs_ecstore::disk::endpoint::Endpoint;
-pub(crate) use rustfs_ecstore::endpoints::EndpointServerPools;
-#[cfg(test)]
-pub(crate) use rustfs_ecstore::endpoints::{Endpoints, PoolEndpoints};
 pub(crate) use rustfs_ecstore::error::{Error, StorageError};
 pub(crate) use rustfs_ecstore::global::{
     GLOBAL_BOOT_TIME, get_global_bucket_monitor, get_global_deployment_id, get_global_endpoints_opt, get_global_region,
     global_rustfs_port,
 };
-pub(crate) use rustfs_ecstore::metrics_realtime::{CollectMetricsOpts, MetricType, collect_local_metrics};
-pub(crate) use rustfs_ecstore::notification_sys::get_global_notification_sys;
 pub(crate) use rustfs_ecstore::rebalance::{DiskStat, RebalSaveOpt, RebalanceCleanupWarnings, RebalanceMeta, RebalanceStats};
 #[cfg(test)]
 pub(crate) use rustfs_ecstore::rebalance::{RebalStatus, RebalanceInfo};
 pub(crate) use rustfs_ecstore::rpc::PeerRestClient;
-pub(crate) use rustfs_ecstore::store::ECStore;
-pub(crate) use rustfs_ecstore::store_utils::is_reserved_or_invalid_bucket;
 pub(crate) use rustfs_ecstore::tier::tier::{ERR_TIER_BACKEND_IN_USE, ERR_TIER_BACKEND_NOT_EMPTY, ERR_TIER_MISSING_CREDENTIALS};
 pub(crate) use rustfs_ecstore::tier::tier_admin::TierCreds;
 pub(crate) use rustfs_ecstore::tier::tier_config::{TierConfig, TierType};

rustfs/src/app/storage_compat.rs

@@ -12,7 +12,17 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-pub(crate) use rustfs_ecstore::admin_server_info::get_server_info;
+pub(crate) use rustfs_ecstore::api::admin::get_server_info;
+pub(crate) use rustfs_ecstore::api::capacity::{
+    PoolDecommissionInfo, PoolStatus, get_total_usable_capacity, get_total_usable_capacity_free,
+};
+pub(crate) use rustfs_ecstore::api::layout::EndpointServerPools;
+#[cfg(test)]
+pub(crate) use rustfs_ecstore::api::layout::{Endpoints, PoolEndpoints};
+pub(crate) use rustfs_ecstore::api::notification::get_global_notification_sys;
+pub(crate) use rustfs_ecstore::api::storage::ECStore;
+#[cfg(test)]
+pub(crate) use rustfs_ecstore::api::storage::init_local_disks;
 pub(crate) use rustfs_ecstore::bucket::{
     bucket_target_sys, lifecycle, metadata, metadata_sys, object_lock, policy_sys, quota, replication, tagging, target, utils,
     versioning, versioning_sys,
@@ -30,9 +40,6 @@ pub(crate) use rustfs_ecstore::data_usage::{
 pub(crate) use rustfs_ecstore::disk::endpoint::Endpoint;
 pub(crate) use rustfs_ecstore::disk::error::DiskError;
 pub(crate) use rustfs_ecstore::disk::error_reduce::is_all_buckets_not_found;
-pub(crate) use rustfs_ecstore::endpoints::EndpointServerPools;
-#[cfg(test)]
-pub(crate) use rustfs_ecstore::endpoints::{Endpoints, PoolEndpoints};
 pub(crate) use rustfs_ecstore::error::{
     Error, StorageError, is_err_bucket_not_found, is_err_object_not_found, is_err_version_not_found,
 };
@@ -41,19 +48,12 @@ pub(crate) use rustfs_ecstore::global::GLOBAL_TierConfigMgr;
 pub(crate) use rustfs_ecstore::global::{
     get_global_endpoints_opt, get_global_region, get_global_tier_config_mgr, new_object_layer_fn, set_object_store_resolver,
 };
-pub(crate) use rustfs_ecstore::notification_sys::get_global_notification_sys;
-pub(crate) use rustfs_ecstore::pools::{
-    PoolDecommissionInfo, PoolStatus, get_total_usable_capacity, get_total_usable_capacity_free,
-};
 #[cfg(test)]
 pub(crate) use rustfs_ecstore::rio::{DecryptReader, EncryptReader, HardLimitReader, boxed_reader};
 pub(crate) use rustfs_ecstore::rio::{
     DynReader, HashReader, WriteEncryption, WritePlan, compression_metadata_value, wrap_reader,
 };
 pub(crate) use rustfs_ecstore::set_disk::{get_lock_acquire_timeout, is_valid_storage_class};
-pub(crate) use rustfs_ecstore::store::ECStore;
-#[cfg(test)]
-pub(crate) use rustfs_ecstore::store::init_local_disks;
 pub(crate) use rustfs_ecstore::tier::tier::TierConfigMgr;
 #[cfg(test)]
 pub(crate) use rustfs_ecstore::tier::tier_config::{TierConfig, TierType};

rustfs/src/storage/storage_compat.rs

@@ -12,7 +12,9 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-pub(crate) use rustfs_ecstore::admin_server_info::get_local_server_property;
+pub(crate) use rustfs_ecstore::api::admin::get_local_server_property;
+pub(crate) use rustfs_ecstore::api::metrics::{CollectMetricsOpts, MetricType, collect_local_metrics};
+pub(crate) use rustfs_ecstore::api::storage::{ECStore, all_local_disk_path, find_local_disk_by_ref};
 pub(crate) use rustfs_ecstore::bucket::{
     metadata, metadata_sys, object_lock, policy_sys, replication, tagging, utils, versioning, versioning_sys,
 };
@@ -30,14 +32,12 @@ pub(crate) use rustfs_ecstore::error::{
 pub(crate) use rustfs_ecstore::global::{
     GLOBAL_TierConfigMgr, get_global_lock_client, get_global_region, resolve_object_store_handle,
 };
-pub(crate) use rustfs_ecstore::metrics_realtime::{CollectMetricsOpts, MetricType, collect_local_metrics};
 pub(crate) use rustfs_ecstore::rio::WriteEncryption;
 pub(crate) use rustfs_ecstore::rpc::{
     LocalPeerS3Client, PEER_RESTSIGNAL, PEER_RESTSUB_SYS, PeerS3Client, SERVICE_SIGNAL_REFRESH_CONFIG,
     SERVICE_SIGNAL_RELOAD_DYNAMIC, verify_rpc_signature,
 };
 pub(crate) use rustfs_ecstore::set_disk::DEFAULT_READ_BUFFER_SIZE;
-pub(crate) use rustfs_ecstore::store::{ECStore, all_local_disk_path, find_local_disk_by_ref};
 
 pub(crate) type GetObjectReader = <ECStore as rustfs_storage_api::ObjectIO>::GetObjectReader;
 pub(crate) type ObjectInfo = <ECStore as rustfs_storage_api::ObjectOperations>::ObjectInfo;

rustfs/src/storage_compat.rs

@@ -12,6 +12,15 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+#[cfg(test)]
+pub(crate) use rustfs_ecstore::api::layout::DisksLayout;
+pub(crate) use rustfs_ecstore::api::layout::EndpointServerPools;
+#[cfg(test)]
+pub(crate) use rustfs_ecstore::api::layout::{Endpoints, PoolEndpoints};
+pub(crate) use rustfs_ecstore::api::notification::new_global_notification_sys;
+pub(crate) use rustfs_ecstore::api::storage::{
+    ECStore, all_local_disk, init_local_disks, init_lock_clients, prewarm_local_disk_id_map,
+};
 pub(crate) use rustfs_ecstore::bucket::metadata_sys::{get_global_bucket_metadata_sys, init_bucket_metadata_sys};
 pub(crate) use rustfs_ecstore::bucket::migration::{try_migrate_bucket_metadata, try_migrate_iam_config};
 pub(crate) use rustfs_ecstore::bucket::replication::{
@@ -20,18 +29,11 @@ pub(crate) use rustfs_ecstore::bucket::replication::{
 pub(crate) use rustfs_ecstore::bucket::{metadata, metadata_sys, quota};
 pub(crate) use rustfs_ecstore::config::{com, init, init_global_config_sys, try_migrate_server_config};
 pub(crate) use rustfs_ecstore::disk::{DiskAPI, RUSTFS_META_BUCKET, endpoint::Endpoint};
-#[cfg(test)]
-pub(crate) use rustfs_ecstore::disks_layout::DisksLayout;
-pub(crate) use rustfs_ecstore::endpoints::EndpointServerPools;
-#[cfg(test)]
-pub(crate) use rustfs_ecstore::endpoints::{Endpoints, PoolEndpoints};
 pub(crate) use rustfs_ecstore::error::{Error as EcstoreError, Result as EcstoreResult, StorageError};
 pub(crate) use rustfs_ecstore::event_notification::{EventArgs as EcstoreEventArgs, register_event_dispatch_hook};
 pub(crate) use rustfs_ecstore::global::{
     get_global_endpoints_opt, get_global_lock_clients, get_global_region, is_dist_erasure, resolve_object_store_handle,
     set_global_endpoints, set_global_region, set_global_rustfs_port, shutdown_background_services, update_erasure_type,
 };
-pub(crate) use rustfs_ecstore::notification_sys::new_global_notification_sys;
 pub(crate) use rustfs_ecstore::rpc::{TONIC_RPC_PREFIX, verify_rpc_signature};
 pub(crate) use rustfs_ecstore::set_disk::get_lock_acquire_timeout;
-pub(crate) use rustfs_ecstore::store::{ECStore, all_local_disk, init_local_disks, init_lock_clients, prewarm_local_disk_id_map};