refactor: consolidate ecstore owner module layout (#3934)

* refactor: shrink ecstore root owner facades

* refactor: remove ecstore core store root shims

* refactor: move ecstore erasure owner modules

* refactor: remove ecstore root rpc facade

* refactor: move ecstore services domain modules

crates/ecstore/src/core/mod.rs

@@ -0,0 +1,21 @@
+// Copyright 2024 RustFS Team
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+pub(crate) mod pools;
+pub(crate) mod sets;
+
+#[cfg(test)]
+mod pools_test;
+#[cfg(test)]
+mod store_test;

crates/ecstore/src/core/pools.rs

@@ -27,18 +27,18 @@ use crate::bucket::{
 use crate::cache_value::metacache_set::{ListPathRawOptions, list_path_raw};
 use crate::config::com::{CONFIG_PREFIX, read_config, read_config_no_lock, save_config, save_config_with_opts};
 use crate::data_movement;
-use crate::data_movement_backpressure::{self, DataMovementOperation};
+use crate::data_movement::backpressure::{self, DataMovementOperation};
 use crate::data_usage::DATA_USAGE_CACHE_NAME;
 use crate::disk::error::DiskError;
 use crate::disk::{BUCKET_META_PREFIX, RUSTFS_META_BUCKET};
-use crate::endpoints::EndpointServerPools;
 use crate::error::{Error, Result};
 use crate::error::{
     StorageError, is_err_bucket_exists, is_err_bucket_not_found, is_err_object_not_found, is_err_version_not_found,
 };
+use crate::layout::endpoints::EndpointServerPools;
 use crate::object_api::{GetObjectReader, ObjectOptions};
-use crate::rebalance::{REBAL_META_NAME, RebalanceMeta, is_rebalance_conflicting_with_decommission};
-use crate::runtime_sources;
+use crate::runtime::sources as runtime_sources;
+use crate::services::rebalance::{REBAL_META_NAME, RebalanceMeta, is_rebalance_conflicting_with_decommission};
 use crate::set_disk::{SetDisks, get_lock_acquire_timeout};
 use crate::storage_api_contracts::{
     admin::StorageAdminApi,
@@ -47,7 +47,7 @@ use crate::storage_api_contracts::{
     namespace::NamespaceLocking as _,
     object::{ObjectIO as _, ObjectOperations as _},
 };
-use crate::{sets::Sets, store::ECStore};
+use crate::{core::sets::Sets, store::ECStore};
 use byteorder::{ByteOrder, LittleEndian, WriteBytesExt};
 use futures::{StreamExt, future::BoxFuture, stream::FuturesUnordered};
 use http::HeaderMap;
@@ -3123,12 +3123,9 @@ impl ECStore {
                             return;
                         }
 
-                        if let Err(err) = data_movement_backpressure::wait_for_data_movement_admission(
-                            DataMovementOperation::Decommission,
-                            idx,
-                            &callback_rx,
-                        )
-                        .await
+                        if let Err(err) =
+                            backpressure::wait_for_data_movement_admission(DataMovementOperation::Decommission, idx, &callback_rx)
+                                .await
                         {
                             if matches!(err, Error::OperationCanceled) {
                                 return;
@@ -4926,9 +4923,9 @@ mod pools_tests {
     };
     use crate::data_movement;
     use crate::disk::endpoint::Endpoint;
-    use crate::endpoints::{EndpointServerPools, Endpoints, PoolEndpoints};
     use crate::error::Error;
-    use crate::rebalance::{RebalStatus, RebalanceInfo, RebalanceMeta, RebalanceStats};
+    use crate::layout::endpoints::{EndpointServerPools, Endpoints, PoolEndpoints};
+    use crate::services::rebalance::{RebalStatus, RebalanceInfo, RebalanceMeta, RebalanceStats};
     use rustfs_filemeta::{FileInfo, FileInfoVersions, MetaCacheEntry, ObjectPartInfo};
     use rustfs_rio::Index;
     use std::sync::{

crates/ecstore/src/core/pools_test.rs

@@ -14,7 +14,7 @@
 
 #[cfg(test)]
 mod capacity_dedup_tests {
-    use crate::pools::{
+    use crate::core::pools::{
         fallback_free_capacity_dedup, fallback_total_capacity_dedup, get_total_usable_capacity, get_total_usable_capacity_free,
     };
 

crates/ecstore/src/core/sets.rs

@@ -30,12 +30,12 @@ use crate::{
         format::{DistributionAlgoVersion, FormatV3},
         new_disk,
     },
-    endpoints::{Endpoints, PoolEndpoints},
     error::StorageError,
+    layout::endpoints::{Endpoints, PoolEndpoints},
     object_api::{GetObjectReader, ObjectInfo, ObjectOptions, PutObjReader},
-    runtime_sources,
+    runtime::sources as runtime_sources,
     set_disk::SetDisks,
-    store_init::{check_format_erasure_values, get_format_erasure_in_quorum, load_format_erasure_all, save_format_file},
+    store::init_format::{check_format_erasure_values, get_format_erasure_in_quorum, load_format_erasure_all, save_format_file},
 };
 use futures::{
     future::join_all,
@@ -1090,8 +1090,8 @@ async fn init_storage_disks_with_errors(
 #[cfg(test)]
 mod tests {
     use super::*;
-    use crate::endpoints::SetupType;
     use crate::layout::endpoint::Endpoint;
+    use crate::layout::endpoints::SetupType;
     use crate::storage_api_contracts::heal::HealOperations as _;
     use crate::storage_api_contracts::list::ListOperations as _;
     use rustfs_lock::client::local::LocalClient;