mirror of
https://github.com/rustfs/rustfs.git
synced 2026-08-16 09:58:21 +00:00
69719c257e
* chore(ecstore): remove the pool-level ListObjects pagination copy The ListObjects pagination pipeline existed in three near-copies in one file; production listing never reaches the Sets copy, which ECStore bypasses by expanding straight to per-set disks. This removes it: impl ListOperations for Sets (61 lines of pure forwarding in core/sets.rs) and the impl Sets pagination block (826 lines of inner_list_objects_v2 / list_objects_generic / inner_list_object_versions / list_path / list_merged / walk_internal in store/list_objects.rs). Two preconditions verified before deleting rather than taken on faith: the architecture guard pins only set_disks_implements_storage_list_operations_contract, so nothing requires the Sets trait impl; and the four Sets pagination methods had no cross-file caller besides that trait impl. The single test consumer moves to the surviving pipeline instead of being deleted: writes still go through the pool, and the listing assertion now targets the set-level implementation. It is renamed accordingly so the name still describes what it covers. The logging guardrail's TRACE-only requirement for Sets::list_objects_v2 retires in the same diff — the wrapper it pinned no longer exists. The ECStore and SetDisks entries are untouched. The SetDisks copy stays for now: its trait impl is guard-pinned, so replacing the duplicate pipeline behind it needs the generic helper the issue schedules for post-1.0. Verification: cargo nextest run -p rustfs-ecstore 4020 passed; check_architecture_migration_rules.sh and check_logging_guardrails.sh pass; clippy --lib --tests -D warnings clean; make pre-commit green. Ref rustfs/backlog#1821 (PR1). * chore(ecstore): fold the ListObjects forwarders into the ECStore impl store/list.rs held two thin forwarders, handle_list_objects_v2 and handle_list_object_versions, that only re-entered the inner_* implementations. The ListOperations impl now calls those directly and the file goes away. The logging guardrail's trace_hot_spans list pinned handle_list_objects_v2 as TRACE-only; that entry is retired in the same diff, adjacent to the sets.rs entry retired by the preceding commit. Ref rustfs/backlog#1821. * chore(ecstore): drop the type aliases orphaned by the pagination removal core/sets.rs declared four local type aliases — ListObjectsV2Info, ListObjectVersionsInfo, ObjectInfoOrErr and WalkOptions — used only by the pool-level pagination pipeline removed earlier in this branch. store/list_objects.rs keeps its own live copies of the same aliases. They only surface now that #6087 removed the core module's dead_code blanket: on that older base each PR was warning-free on its own, and the combination is what exposes them. Their storage_api_contracts imports go with them. Ref rustfs/backlog#1823, rustfs/backlog#1821. * fix(ecstore): preserve Sets listing compatibility
216 lines
6.8 KiB
Rust
216 lines
6.8 KiB
Rust
// 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.
|
|
|
|
mod storage_api;
|
|
|
|
use rustfs_common::heal_channel::HealOpts;
|
|
use rustfs_filemeta::FileInfo;
|
|
use rustfs_lock::NamespaceLockWrapper;
|
|
use rustfs_madmin::heal_commands::HealResultItem;
|
|
use storage_api::contract_compat::{
|
|
CompletePart, DeletedObject, DiskStore, ECStore, Error, GetObjectReader, HTTPRangeSpec, ListMultipartsInfo, ListPartsInfo,
|
|
MultipartInfo, MultipartUploadResult, ObjectInfo, ObjectOptions, ObjectToDelete, PartInfo, PutObjReader, SetDisks,
|
|
StorageAdminApi, StorageBucketOperations, StorageHealOperations, StorageListObjectVersionsInfo, StorageListObjectsV2Info,
|
|
StorageListOperations, StorageMultipartOperations, StorageNamespaceLocking, StorageObjectIO, StorageObjectInfoOrErr,
|
|
StorageObjectOperations, StorageWalkOptions,
|
|
};
|
|
use tokio_util::sync::CancellationToken;
|
|
|
|
type ListObjectsV2Info = StorageListObjectsV2Info<ObjectInfo>;
|
|
type ListObjectVersionsInfo = StorageListObjectVersionsInfo<ObjectInfo>;
|
|
type ObjectInfoOrErr = StorageObjectInfoOrErr<ObjectInfo, Error>;
|
|
type WalkOptions = StorageWalkOptions<fn(&FileInfo) -> bool>;
|
|
|
|
fn storage_admin_api_type_name<T>() -> &'static str
|
|
where
|
|
T: StorageAdminApi<
|
|
BackendInfo = rustfs_madmin::BackendInfo,
|
|
StorageInfo = rustfs_madmin::StorageInfo,
|
|
Disk = DiskStore,
|
|
Error = Error,
|
|
>,
|
|
{
|
|
std::any::type_name::<T>()
|
|
}
|
|
|
|
fn storage_namespace_locking_type_name<T>() -> &'static str
|
|
where
|
|
T: StorageNamespaceLocking<Error = Error, NamespaceLock = NamespaceLockWrapper>,
|
|
{
|
|
std::any::type_name::<T>()
|
|
}
|
|
|
|
fn storage_object_io_type_name<T>() -> &'static str
|
|
where
|
|
T: StorageObjectIO<
|
|
Error = Error,
|
|
RangeSpec = HTTPRangeSpec,
|
|
HeaderMap = http::HeaderMap,
|
|
ObjectOptions = ObjectOptions,
|
|
ObjectInfo = ObjectInfo,
|
|
GetObjectReader = GetObjectReader,
|
|
PutObjectReader = PutObjReader,
|
|
>,
|
|
{
|
|
std::any::type_name::<T>()
|
|
}
|
|
|
|
fn storage_bucket_operations_type_name<T>() -> &'static str
|
|
where
|
|
T: StorageBucketOperations<Error = Error>,
|
|
{
|
|
std::any::type_name::<T>()
|
|
}
|
|
|
|
fn storage_object_operations_type_name<T>() -> &'static str
|
|
where
|
|
T: StorageObjectOperations<
|
|
Error = Error,
|
|
ObjectInfo = ObjectInfo,
|
|
ObjectOptions = ObjectOptions,
|
|
FileInfo = FileInfo,
|
|
ObjectToDelete = ObjectToDelete,
|
|
DeletedObject = DeletedObject,
|
|
>,
|
|
{
|
|
std::any::type_name::<T>()
|
|
}
|
|
|
|
fn storage_list_operations_type_name<T>() -> &'static str
|
|
where
|
|
T: StorageListOperations<
|
|
Error = Error,
|
|
ListObjectsV2Info = ListObjectsV2Info,
|
|
ListObjectVersionsInfo = ListObjectVersionsInfo,
|
|
ObjectInfoOrErr = ObjectInfoOrErr,
|
|
WalkOptions = WalkOptions,
|
|
WalkCancellation = CancellationToken,
|
|
WalkResultSender = tokio::sync::mpsc::Sender<ObjectInfoOrErr>,
|
|
>,
|
|
{
|
|
std::any::type_name::<T>()
|
|
}
|
|
|
|
fn storage_multipart_operations_type_name<T>() -> &'static str
|
|
where
|
|
T: StorageMultipartOperations<
|
|
Error = Error,
|
|
ObjectInfo = ObjectInfo,
|
|
ObjectOptions = ObjectOptions,
|
|
PutObjectReader = PutObjReader,
|
|
CompletePart = CompletePart,
|
|
ListMultipartsInfo = ListMultipartsInfo,
|
|
MultipartUploadResult = MultipartUploadResult,
|
|
PartInfo = PartInfo,
|
|
MultipartInfo = MultipartInfo,
|
|
ListPartsInfo = ListPartsInfo,
|
|
>,
|
|
{
|
|
std::any::type_name::<T>()
|
|
}
|
|
|
|
fn storage_heal_operations_type_name<T>() -> &'static str
|
|
where
|
|
T: StorageHealOperations<Error = Error, HealResultItem = HealResultItem, HealOptions = HealOpts>,
|
|
{
|
|
std::any::type_name::<T>()
|
|
}
|
|
|
|
#[test]
|
|
fn ecstore_implements_storage_admin_api_contract() {
|
|
assert!(storage_admin_api_type_name::<ECStore>().ends_with("::ECStore"));
|
|
}
|
|
|
|
#[test]
|
|
fn ecstore_implements_storage_namespace_locking_contract() {
|
|
assert!(storage_namespace_locking_type_name::<ECStore>().ends_with("::ECStore"));
|
|
}
|
|
|
|
#[test]
|
|
fn ecstore_implements_storage_object_io_contract() {
|
|
assert!(storage_object_io_type_name::<ECStore>().ends_with("::ECStore"));
|
|
}
|
|
|
|
#[test]
|
|
fn ecstore_implements_storage_bucket_operations_contract() {
|
|
assert!(storage_bucket_operations_type_name::<ECStore>().ends_with("::ECStore"));
|
|
}
|
|
|
|
#[test]
|
|
fn ecstore_implements_storage_object_operations_contract() {
|
|
assert!(storage_object_operations_type_name::<ECStore>().ends_with("::ECStore"));
|
|
}
|
|
|
|
#[test]
|
|
fn ecstore_implements_storage_list_operations_contract() {
|
|
assert!(storage_list_operations_type_name::<ECStore>().ends_with("::ECStore"));
|
|
}
|
|
|
|
#[test]
|
|
fn ecstore_pools_expose_storage_list_operations_contract() {
|
|
fn assert_contract(store: &ECStore) {
|
|
let future = store.pools[0]
|
|
.clone()
|
|
.list_objects_v2("bucket", "", None, None, 1, false, None, false);
|
|
drop(future);
|
|
}
|
|
|
|
let _ = assert_contract;
|
|
}
|
|
|
|
#[test]
|
|
fn ecstore_implements_storage_multipart_operations_contract() {
|
|
assert!(storage_multipart_operations_type_name::<ECStore>().ends_with("::ECStore"));
|
|
}
|
|
|
|
#[test]
|
|
fn ecstore_implements_storage_heal_operations_contract() {
|
|
assert!(storage_heal_operations_type_name::<ECStore>().ends_with("::ECStore"));
|
|
}
|
|
|
|
#[test]
|
|
fn set_disks_implements_storage_namespace_locking_contract() {
|
|
assert!(storage_namespace_locking_type_name::<SetDisks>().ends_with("::SetDisks"));
|
|
}
|
|
|
|
#[test]
|
|
fn set_disks_implements_storage_object_io_contract() {
|
|
assert!(storage_object_io_type_name::<SetDisks>().ends_with("::SetDisks"));
|
|
}
|
|
|
|
#[test]
|
|
fn set_disks_implements_storage_bucket_operations_contract() {
|
|
assert!(storage_bucket_operations_type_name::<SetDisks>().ends_with("::SetDisks"));
|
|
}
|
|
|
|
#[test]
|
|
fn set_disks_implements_storage_object_operations_contract() {
|
|
assert!(storage_object_operations_type_name::<SetDisks>().ends_with("::SetDisks"));
|
|
}
|
|
|
|
#[test]
|
|
fn set_disks_implements_storage_list_operations_contract() {
|
|
assert!(storage_list_operations_type_name::<SetDisks>().ends_with("::SetDisks"));
|
|
}
|
|
|
|
#[test]
|
|
fn set_disks_implements_storage_multipart_operations_contract() {
|
|
assert!(storage_multipart_operations_type_name::<SetDisks>().ends_with("::SetDisks"));
|
|
}
|
|
|
|
#[test]
|
|
fn set_disks_implements_storage_heal_operations_contract() {
|
|
assert!(storage_heal_operations_type_name::<SetDisks>().ends_with("::SetDisks"));
|
|
}
|