From 2a5ccd2211bf8f758cf5ab61e944a39ec8ea7f92 Mon Sep 17 00:00:00 2001 From: weisd Date: Thu, 4 Dec 2025 17:12:01 +0800 Subject: [PATCH] fix meta bucket check --- crates/ahm/src/scanner/lifecycle.rs | 7 +++++-- crates/ahm/src/scanner/node_scanner.rs | 3 ++- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/crates/ahm/src/scanner/lifecycle.rs b/crates/ahm/src/scanner/lifecycle.rs index 79bf330b..4bcef12a 100644 --- a/crates/ahm/src/scanner/lifecycle.rs +++ b/crates/ahm/src/scanner/lifecycle.rs @@ -18,7 +18,6 @@ use crate::{ }; use rustfs_common::data_usage::SizeSummary; use rustfs_common::metrics::IlmAction; -use rustfs_ecstore::bucket::replication::{GLOBAL_REPLICATION_POOL, ReplicationConfig, get_heal_replicate_object_info}; use rustfs_ecstore::bucket::{ lifecycle::{ bucket_lifecycle_audit::LcEventSrc, @@ -31,6 +30,10 @@ use rustfs_ecstore::bucket::{ versioning::VersioningApi, versioning_sys::BucketVersioningSys, }; +use rustfs_ecstore::bucket::{ + replication::{GLOBAL_REPLICATION_POOL, ReplicationConfig, get_heal_replicate_object_info}, + utils::is_meta_bucketname, +}; use rustfs_ecstore::store_api::{ObjectInfo, ObjectToDelete}; use rustfs_filemeta::{FileInfo, ReplicationStatusType, replication_statuses_map}; use rustfs_utils::http::headers::{AMZ_BUCKET_REPLICATION_STATUS, HeaderExt, VERSION_PURGE_STATUS_KEY}; @@ -288,7 +291,7 @@ impl ScannerItem { info!("apply_lifecycle: Lifecycle config exists for object: {}", oi.name); - let (olcfg, rcfg) = if self.bucket != ".minio.sys" { + let (olcfg, rcfg) = if !is_meta_bucketname(&self.bucket) { ( get_object_lock_config(&self.bucket).await.ok(), None, // FIXME: replication config diff --git a/crates/ahm/src/scanner/node_scanner.rs b/crates/ahm/src/scanner/node_scanner.rs index 5f3d4d43..8e6d747d 100644 --- a/crates/ahm/src/scanner/node_scanner.rs +++ b/crates/ahm/src/scanner/node_scanner.rs @@ -19,6 +19,7 @@ use crate::scanner::{ }; use rustfs_common::data_usage::DataUsageInfo; use rustfs_ecstore::StorageAPI; +use rustfs_ecstore::bucket::utils::is_meta_bucketname; use rustfs_ecstore::disk::{DiskAPI, DiskStore}; use serde::{Deserialize, Serialize}; use std::{ @@ -879,7 +880,7 @@ impl NodeScanner { let bucket_name = &bucket_info.name; // skip system internal buckets - if bucket_name == ".minio.sys" { + if is_meta_bucketname(bucket_name) { continue; }