refactor: move ecstore rpc metadata modules (#3933)

crates/ecstore/src/bucket/mod.rs

@@ -16,9 +16,12 @@ pub mod bandwidth;
 pub mod bucket_target_sys;
 pub mod error;
 pub mod lifecycle;
+#[path = "../metadata/bucket.rs"]
 pub mod metadata;
+#[path = "../metadata/bucket_sys.rs"]
 pub mod metadata_sys;
 #[cfg(test)]
+#[path = "../metadata/bucket_test.rs"]
 mod metadata_test;
 pub mod migration;
 mod msgp_decode;

crates/ecstore/src/cluster/mod.rs

@@ -13,6 +13,7 @@
 // limitations under the License.
 
 mod control_plane;
+pub(crate) mod rpc;
 
 pub use control_plane::{
     ClusterControlPlane, ClusterControlPlaneSnapshot, ClusterDriveMembership, ClusterEndpointType, ClusterLocalNodeStorage,

crates/ecstore/src/cluster/rpc/mod.rs

@@ -0,0 +1,38 @@
+// 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 client;
+pub(crate) mod context_propagation;
+pub(crate) mod http_auth;
+pub(crate) mod internode_data_transport;
+pub(crate) mod peer_rest_client;
+pub(crate) mod peer_s3_client;
+pub(crate) mod remote_disk;
+pub(crate) mod remote_locker;
+pub(crate) mod runtime_sources;
+
+pub use client::{
+    TonicInterceptor, gen_tonic_signature_interceptor, node_service_time_out_client, node_service_time_out_client_no_auth,
+};
+pub use http_auth::{TONIC_RPC_PREFIX, build_auth_headers, gen_signature_headers, verify_rpc_signature};
+#[cfg(test)]
+pub(crate) use internode_data_transport::TcpHttpInternodeDataTransport;
+pub use internode_data_transport::build_internode_data_transport_from_env;
+pub use peer_rest_client::{
+    PEER_RESTSIGNAL, PEER_RESTSUB_SYS, PeerRestClient, SERVICE_SIGNAL_REFRESH_CONFIG, SERVICE_SIGNAL_RELOAD_DYNAMIC,
+};
+pub(crate) use peer_s3_client::heal_bucket_local_on_disks;
+pub use peer_s3_client::{LocalPeerS3Client, PeerS3Client, S3PeerSys};
+pub use remote_disk::RemoteDisk;
+pub use remote_locker::RemoteClient;

crates/ecstore/src/rpc/mod.rs

@@ -12,27 +12,13 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-mod client;
-mod context_propagation;
-mod http_auth;
-mod internode_data_transport;
-mod peer_rest_client;
-mod peer_s3_client;
-mod remote_disk;
-mod remote_locker;
-mod runtime_sources;
-
-pub use client::{
-    TonicInterceptor, gen_tonic_signature_interceptor, node_service_time_out_client, node_service_time_out_client_no_auth,
-};
-pub use http_auth::{TONIC_RPC_PREFIX, build_auth_headers, gen_signature_headers, verify_rpc_signature};
 #[cfg(test)]
-pub(crate) use internode_data_transport::TcpHttpInternodeDataTransport;
-pub use internode_data_transport::build_internode_data_transport_from_env;
-pub use peer_rest_client::{
-    PEER_RESTSIGNAL, PEER_RESTSUB_SYS, PeerRestClient, SERVICE_SIGNAL_REFRESH_CONFIG, SERVICE_SIGNAL_RELOAD_DYNAMIC,
+pub(crate) use crate::cluster::rpc::TcpHttpInternodeDataTransport;
+pub(crate) use crate::cluster::rpc::heal_bucket_local_on_disks;
+pub use crate::cluster::rpc::{
+    LocalPeerS3Client, PEER_RESTSIGNAL, PEER_RESTSUB_SYS, PeerRestClient, PeerS3Client, RemoteClient, RemoteDisk, S3PeerSys,
+    SERVICE_SIGNAL_REFRESH_CONFIG, SERVICE_SIGNAL_RELOAD_DYNAMIC, TONIC_RPC_PREFIX, TonicInterceptor, build_auth_headers,
+    build_internode_data_transport_from_env, gen_signature_headers, gen_tonic_signature_interceptor,
+    node_service_time_out_client, node_service_time_out_client_no_auth, verify_rpc_signature,
 };
-pub(crate) use peer_s3_client::heal_bucket_local_on_disks;
-pub use peer_s3_client::{LocalPeerS3Client, PeerS3Client, S3PeerSys};
-pub use remote_disk::RemoteDisk;
-pub use remote_locker::RemoteClient;
+pub(crate) use crate::cluster::rpc::{client, context_propagation, internode_data_transport, runtime_sources};

crates/ecstore/src/set_disk/mod.rs

@@ -303,6 +303,7 @@ static OBJECT_LOCK_DIAG_ENABLED: OnceLock<bool> = OnceLock::new();
 mod heal;
 mod list;
 mod lock;
+#[path = "../metadata/set_disk.rs"]
 mod metadata;
 mod multipart;
 mod read;