sdgoij/rustfs
1
0
Fork 0
mirror of https://github.com/rustfs/rustfs.git synced 2026-01-17 01:30:33 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix meta bucket check

Browse Source
This commit is contained in:
weisd
2025-12-04 17:12:01 +08:00
parent c43166c4c6
commit 2a5ccd2211
2 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
crates/ahm/src/scanner/lifecycle.rs
View File

@@ -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

3
crates/ahm/src/scanner/node_scanner.rs
View File

@@ -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;
}