gsadmin/rustfs
1
0
Fork 0
mirror of https://github.com/rustfs/rustfs.git synced 2026-09-05 19:55:37 +00:00
Code Issues Packages Projects Releases Wiki Activity

chore: merge main after ECStore compile repair

Browse Source
This commit is contained in:
overtrue
2026-09-05 18:46:53 +08:00
parent ea993d482c e8a7f4bc4a
commit 3aab93bdff
3 changed files with 3 additions and 1001 deletions
Download Patch File Download Diff File Expand all files Collapse all files
crates/ecstore/src/disk/local.rs
-997
View File
File diff suppressed because it is too large Load Diff
rustfs/src/app/object/shared.rs
+1 -1
View File
@@ -309,7 +309,7 @@ fn classify_bucket_default_sse_lookup(
) -> S3Result<Option<(ServerSideEncryptionConfiguration, OffsetDateTime)>> { ) -> S3Result<Option<(ServerSideEncryptionConfiguration, OffsetDateTime)>> {
match lookup { match lookup {
Ok(config) => Ok(Some(config)), Ok(config) => Ok(Some(config)),
Err(err) if err == StorageError::ConfigNotFound => Ok(None), Err(StorageError::ConfigNotFound) => Ok(None),
Err(err) => { Err(err) => {
let api_error = ApiError::from(err); let api_error = ApiError::from(err);
error!( error!(
rustfs/src/site_replication/tests.rs
+2 -3
View File
@@ -867,7 +867,6 @@ fn test_retry_drain_bounds_each_peer_round_to_one_small_request_chain() {
r#type: "tags".to_string(), r#type: "tags".to_string(),
..Default::default() ..Default::default()
}], }],
..Default::default()
}; };
let make = RetryDrainAction::BucketOpReplay { let make = RetryDrainAction::BucketOpReplay {
operation: SITE_REPLICATION_BUCKET_OP_MAKE_WITH_VERSIONING.to_string(), operation: SITE_REPLICATION_BUCKET_OP_MAKE_WITH_VERSIONING.to_string(),
@@ -973,7 +972,7 @@ fn test_lightweight_bucket_retry_plan_orders_real_metadata_and_counts_it() {
operator_replication.rules.push(operator_rule("operator-backup")); operator_replication.rules.push(operator_rule("operator-backup"));
let mut bucket_with_operator_rule = bucket; let mut bucket_with_operator_rule = bucket;
bucket_with_operator_rule.replication_config = bucket_with_operator_rule.replication_config =
Some(BASE64_STANDARD.encode_to_string(&serialize(&operator_replication).expect("operator replication config"))); Some(BASE64_STANDARD.encode_to_string(serialize(&operator_replication).expect("operator replication config")));
let plan = site_replication_bucket_retry_plan_from_info(&bucket_with_operator_rule, false).expect("targeted retry plan"); let plan = site_replication_bucket_retry_plan_from_info(&bucket_with_operator_rule, false).expect("targeted retry plan");
assert!( assert!(
plan.bucket_items.iter().any(|item| item.r#type == "replication-config"), plan.bucket_items.iter().any(|item| item.r#type == "replication-config"),
@@ -1050,7 +1049,7 @@ fn test_reachable_probe_promotion_is_fenced_by_the_observed_event() {
.peers .peers
.insert("remote".to_string(), peer("remote", "https://remote.example.com")); .insert("remote".to_string(), peer("remote", "https://remote.example.com"));
assert_eq!(mark_reachable_deferred_retry_events(&mut state, &[recovered.clone()]), 1); assert_eq!(mark_reachable_deferred_retry_events(&mut state, std::slice::from_ref(&recovered)), 1);
assert_eq!(state.retry_queue[0].updated_at, None); assert_eq!(state.retry_queue[0].updated_at, None);
assert!(!state.retry_queue[0].peer_unreachable); assert!(!state.retry_queue[0].peer_unreachable);
assert_eq!( assert_eq!(