gsadmin/rustfs
1
0
Fork 0
mirror of https://github.com/rustfs/rustfs.git synced 2026-08-24 21:26:28 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix(scanner): restore s3s footprint baseline (#6486)

Browse Source 
chore(scanner): narrow s3s DTO references
This commit is contained in:
Zhengchao An
2026-08-24 14:30:16 +08:00
committed by GitHub
parent 5142775387
commit cd1363d519
2 changed files with 12 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
crates/scanner/src/scanner_folder.rs
+3 -1
View File
@@ -49,7 +49,9 @@ use rustfs_filemeta::{
MetaCacheHealCandidateKind, MetaCacheHealCandidateKind,
}; };
use rustfs_utils::path::{SLASH_SEPARATOR, path_join_buf}; use rustfs_utils::path::{SLASH_SEPARATOR, path_join_buf};
use s3s::dto::{BucketLifecycleConfiguration, ObjectLockConfiguration, VersioningConfiguration}; use s3s::dto::{BucketLifecycleConfiguration, LifecycleRuleFilter, ObjectLockConfiguration, VersioningConfiguration};
#[cfg(test)]
use s3s::dto::{ExpirationStatus, LifecycleRule};
use time::OffsetDateTime; use time::OffsetDateTime;
use tokio::select; use tokio::select;
use tokio::sync::mpsc; use tokio::sync::mpsc;
crates/scanner/src/scanner_folder/item_actions.rs
+9 -9
View File
@@ -251,7 +251,7 @@ fn resolve_sizes(object_infos: &[ObjectInfo]) -> Vec<SizeResolution> {
} }
fn lifecycle_rule_has_size_filter(lifecycle: &BucketLifecycleConfiguration, rule_id: &str) -> bool { fn lifecycle_rule_has_size_filter(lifecycle: &BucketLifecycleConfiguration, rule_id: &str) -> bool {
let filter_has_size = |filter: &s3s::dto::LifecycleRuleFilter| { let filter_has_size = |filter: &LifecycleRuleFilter| {
filter.object_size_greater_than.is_some() filter.object_size_greater_than.is_some()
|| filter.object_size_less_than.is_some() || filter.object_size_less_than.is_some()
|| filter || filter
@@ -1637,13 +1637,13 @@ mod tests {
#[test] #[test]
fn malformed_size_blocks_size_dependent_transition_but_allows_time_only_expiry() { fn malformed_size_blocks_size_dependent_transition_but_allows_time_only_expiry() {
let size_filtered = BucketLifecycleConfiguration { let size_filtered = BucketLifecycleConfiguration {
rules: vec![s3s::dto::LifecycleRule { rules: vec![LifecycleRule {
status: s3s::dto::ExpirationStatus::from_static(s3s::dto::ExpirationStatus::ENABLED), status: ExpirationStatus::from_static(ExpirationStatus::ENABLED),
expiration: None, expiration: None,
abort_incomplete_multipart_upload: None, abort_incomplete_multipart_upload: None,
del_marker_expiration: None, del_marker_expiration: None,
id: Some("size".to_string()), id: Some("size".to_string()),
filter: Some(s3s::dto::LifecycleRuleFilter { filter: Some(LifecycleRuleFilter {
object_size_greater_than: Some(1), object_size_greater_than: Some(1),
..Default::default() ..Default::default()
}), }),
@@ -1676,8 +1676,8 @@ mod tests {
let mixed_filters = BucketLifecycleConfiguration { let mixed_filters = BucketLifecycleConfiguration {
rules: vec![ rules: vec![
size_filtered.rules[0].clone(), size_filtered.rules[0].clone(),
s3s::dto::LifecycleRule { LifecycleRule {
status: s3s::dto::ExpirationStatus::from_static(s3s::dto::ExpirationStatus::ENABLED), status: ExpirationStatus::from_static(ExpirationStatus::ENABLED),
expiration: None, expiration: None,
abort_incomplete_multipart_upload: None, abort_incomplete_multipart_upload: None,
del_marker_expiration: None, del_marker_expiration: None,
@@ -1733,13 +1733,13 @@ mod tests {
)); ));
assert!(lifecycle_rule_has_size_filter( assert!(lifecycle_rule_has_size_filter(
&BucketLifecycleConfiguration { &BucketLifecycleConfiguration {
rules: vec![s3s::dto::LifecycleRule { rules: vec![LifecycleRule {
status: s3s::dto::ExpirationStatus::from_static(s3s::dto::ExpirationStatus::ENABLED), status: ExpirationStatus::from_static(ExpirationStatus::ENABLED),
expiration: None, expiration: None,
abort_incomplete_multipart_upload: None, abort_incomplete_multipart_upload: None,
del_marker_expiration: None, del_marker_expiration: None,
id: None, id: None,
filter: Some(s3s::dto::LifecycleRuleFilter { filter: Some(LifecycleRuleFilter {
object_size_greater_than: Some(1), object_size_greater_than: Some(1),
..Default::default() ..Default::default()
}), }),