mirror of
https://github.com/rustfs/rustfs.git
synced 2026-08-12 08:06:54 +00:00
63e57378d6
BucketMetadataSys::get_config lazily fabricated a default BucketMetadata (object-lock off) for any bucket whose .metadata.bin was ConfigNotFound and cached it in the map that the map-only, fail-closed metadata_sys::get() serves. The object-lock batch-delete gate (object_lock_delete_check_required, backlog#929 / #4297) treats that map as authoritative, so a metadata miss became a cached "no lock" answer: a versioning peek could poison the cache and let delete_objects skip the per-object retention/legal-hold stat. The same fabrication raced make_bucket (lost update overwriting freshly persisted lock-enabled metadata) and let the 15-minute refresh loop replace good cached metadata on a transient quorum dip. Production changes: - get_config caches only metadata actually read from disk; misses are recorded in a bounded negative cache (30s TTL, 10k entries, invalidated by set()) so repeated lookups for metadata-less names cost no extra namespace-lock + erasure-set fanout (reachable pre-auth via CORS preflight and per-key in DeleteObjects). - concurrent_load never lets a fabricated default REPLACE an existing map entry; startup insert-if-vacant behavior for legacy buckets is preserved. - delete_objects and new_ns_lock resolve dist-erasure, versioning, and the object-lock gate from the set's own instance context (backlog#1052) instead of the ambient facade, so a second in-process instance (or, in tests, another test's transient DistErasure window) cannot reroute locking onto an empty dist locker list or answer with the wrong instance's bucket state. Test-isolation changes (the bug that surfaced all of the above: the delete_objects lock-gating test failed deterministically when sharing a process with the lifecycle env tests): - The MinIO-migration test builds on an isolated InstanceContext instead of registering soon-deleted disks in the shared bootstrap registry. - The cached lifecycle env re-registers its disks on every use, surviving other serial tests' reset_local_disk_test_state. - Hermetic SetDisks helpers gain isolated-context variants pinned to plain erasure; tier-free non-serial test modules use them, guard-based SetupTypeGuard tests stay on the bootstrap context. - Three deterministic pin tests (nextest-safe) cover the caching contract, the delete gate resolution source, and the ns-lock resolution source. Verification: - cargo test -p rustfs-ecstore --lib -- --exact <4-test combo from the report> (previously failing, now green) - cargo test -p rustfs-ecstore --lib: 3169 passed / 0 failed across repeated runs; cargo fmt --check and cargo clippy --lib --tests clean - Adversarial validation (high-risk tier, all seven roles) run per AGENTS.md; all findings fixed or rebutted with evidence
106 lines
3.5 KiB
Rust
106 lines
3.5 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.
|
|
|
|
use super::{metadata_sys::get_bucket_metadata_sys, versioning::VersioningApi};
|
|
use crate::disk::RUSTFS_META_BUCKET;
|
|
use crate::error::Result;
|
|
use s3s::dto::VersioningConfiguration;
|
|
use tracing::warn;
|
|
|
|
pub struct BucketVersioningSys {}
|
|
|
|
impl Default for BucketVersioningSys {
|
|
fn default() -> Self {
|
|
Self::new()
|
|
}
|
|
}
|
|
|
|
impl BucketVersioningSys {
|
|
pub fn new() -> Self {
|
|
Self {}
|
|
}
|
|
pub async fn enabled(bucket: &str) -> bool {
|
|
match Self::get(bucket).await {
|
|
Ok(res) => res.enabled(),
|
|
Err(err) => {
|
|
warn!("{:?}", err);
|
|
false
|
|
}
|
|
}
|
|
}
|
|
|
|
pub async fn prefix_enabled(bucket: &str, prefix: &str) -> bool {
|
|
match Self::get(bucket).await {
|
|
Ok(res) => res.prefix_enabled(prefix),
|
|
Err(err) => {
|
|
warn!("{:?}", err);
|
|
false
|
|
}
|
|
}
|
|
}
|
|
|
|
pub async fn suspended(bucket: &str) -> bool {
|
|
match Self::get(bucket).await {
|
|
Ok(res) => res.suspended(),
|
|
Err(err) => {
|
|
warn!("{:?}", err);
|
|
false
|
|
}
|
|
}
|
|
}
|
|
|
|
pub async fn prefix_suspended(bucket: &str, prefix: &str) -> bool {
|
|
match Self::get(bucket).await {
|
|
Ok(res) => res.prefix_suspended(prefix),
|
|
Err(err) => {
|
|
warn!("{:?}", err);
|
|
false
|
|
}
|
|
}
|
|
}
|
|
|
|
pub async fn get(bucket: &str) -> Result<VersioningConfiguration> {
|
|
if bucket == RUSTFS_META_BUCKET || bucket.starts_with(RUSTFS_META_BUCKET) {
|
|
return Ok(VersioningConfiguration::default());
|
|
}
|
|
|
|
// Read lock is sufficient — get_versioning_config() handles its own
|
|
// internal locking via metadata_map RwLock. The previous write lock
|
|
// serialized all concurrent GET requests on this global lock.
|
|
let bucket_meta_sys_lock = get_bucket_metadata_sys()?;
|
|
let bucket_meta_sys = bucket_meta_sys_lock.read().await;
|
|
|
|
let (cfg, _) = bucket_meta_sys.get_versioning_config(bucket).await?;
|
|
|
|
Ok(cfg)
|
|
}
|
|
|
|
/// Instance-scoped variant of [`Self::get`] (backlog#1052): resolves the
|
|
/// caller's own instance context so a second in-process store never
|
|
/// answers with the first instance's versioning state; falls back to the
|
|
/// ambient system when the instance cell is not initialized.
|
|
pub(crate) async fn get_in(ctx: &crate::runtime::instance::InstanceContext, bucket: &str) -> Result<VersioningConfiguration> {
|
|
if bucket == RUSTFS_META_BUCKET || bucket.starts_with(RUSTFS_META_BUCKET) {
|
|
return Ok(VersioningConfiguration::default());
|
|
}
|
|
|
|
let bucket_meta_sys_lock = crate::bucket::metadata_sys::bucket_metadata_sys_of(ctx)?;
|
|
let bucket_meta_sys = bucket_meta_sys_lock.read().await;
|
|
|
|
let (cfg, _) = bucket_meta_sys.get_versioning_config(bucket).await?;
|
|
|
|
Ok(cfg)
|
|
}
|
|
}
|