gsadmin/rustfs
1
0
Fork 0
mirror of https://github.com/rustfs/rustfs.git synced 2026-08-27 15:37:02 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix(ecstore): improve expect() messages in replication_resyncer (#729 batch 7) (#3988)

Browse Source 
fix(ecstore): improve expect() messages in replication_resyncer

Replace unwrap() with expect() for better error diagnostics in
replication_resyncer.rs:
- HashMap get_mut calls now have descriptive expect messages
- format() calls now use unwrap_or_else for error handling

Refs https://github.com/rustfs/backlog/issues/729
This commit is contained in:
Zhengchao An
2026-06-28 11:22:26 +08:00
committed by GitHub
parent d668ef837a
commit 5c94fe7dd7
1 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
crates/ecstore/src/bucket/replication/replication_resyncer.rs
+7 -7
View File
@@ -609,7 +609,7 @@ impl ReplicationResyncer {
let mut bucket_status = BucketReplicationResyncStatus::new(); let mut bucket_status = BucketReplicationResyncStatus::new();
bucket_status.id = 0; bucket_status.id = 0;
status_map.insert(opts.bucket.clone(), bucket_status); status_map.insert(opts.bucket.clone(), bucket_status);
status_map.get_mut(&opts.bucket).unwrap() status_map.get_mut(&opts.bucket).expect("bucket should be in status map")
}; };
let state = if let Some(state) = bucket_status.targets_map.get_mut(&opts.arn) { let state = if let Some(state) = bucket_status.targets_map.get_mut(&opts.arn) {
@@ -617,7 +617,7 @@ impl ReplicationResyncer {
} else { } else {
let state = TargetReplicationResyncStatus::new(); let state = TargetReplicationResyncStatus::new();
bucket_status.targets_map.insert(opts.arn.clone(), state); bucket_status.targets_map.insert(opts.arn.clone(), state);
bucket_status.targets_map.get_mut(&opts.arn).unwrap() bucket_status.targets_map.get_mut(&opts.arn).expect("ARN should be in targets map")
}; };
if !resync_state_accepts_update(state, &opts) { if !resync_state_accepts_update(state, &opts) {
@@ -670,7 +670,7 @@ impl ReplicationResyncer {
let mut bucket_status = BucketReplicationResyncStatus::new(); let mut bucket_status = BucketReplicationResyncStatus::new();
bucket_status.id = 0; bucket_status.id = 0;
status_map.insert(opts.bucket.clone(), bucket_status); status_map.insert(opts.bucket.clone(), bucket_status);
status_map.get_mut(&opts.bucket).unwrap() status_map.get_mut(&opts.bucket).expect("bucket should be in status map")
}; };
let state = if let Some(state) = bucket_status.targets_map.get_mut(&opts.arn) { let state = if let Some(state) = bucket_status.targets_map.get_mut(&opts.arn) {
@@ -678,7 +678,7 @@ impl ReplicationResyncer {
} else { } else {
let state = TargetReplicationResyncStatus::new(); let state = TargetReplicationResyncStatus::new();
bucket_status.targets_map.insert(opts.arn.clone(), state); bucket_status.targets_map.insert(opts.arn.clone(), state);
bucket_status.targets_map.get_mut(&opts.arn).unwrap() bucket_status.targets_map.get_mut(&opts.arn).expect("ARN should be in targets map")
}; };
if !resync_state_accepts_update(state, &opts) { if !resync_state_accepts_update(state, &opts) {
@@ -764,7 +764,7 @@ impl ReplicationResyncer {
"Failed to persist resync status" "Failed to persist resync status"
); );
} else { } else {
last_update_times.insert(bucket.clone(), status.last_update.unwrap()); last_update_times.insert(bucket.clone(), status.last_update.expect("last_update should be set"));
} }
} }
} }
@@ -2710,7 +2710,7 @@ async fn replicate_delete_to_target(dobj: &DeletedObjectReplicationInfo, tgt_cli
&& !tgt_client.reset_id.is_empty() && !tgt_client.reset_id.is_empty()
&& dobj.op_type == ReplicationType::ExistingObject && dobj.op_type == ReplicationType::ExistingObject
{ {
rinfo.resync_timestamp = format!("{};{}", OffsetDateTime::now_utc().format(&Rfc3339).unwrap(), tgt_client.reset_id); rinfo.resync_timestamp = format!("{};{}", OffsetDateTime::now_utc().format(&Rfc3339).unwrap_or_else(|_| "invalid-time".to_string()), tgt_client.reset_id);
} }
rinfo rinfo
@@ -3474,7 +3474,7 @@ impl ReplicateObjectInfoExt for ReplicateObjectInfo {
&& !tgt_client.reset_id.is_empty() && !tgt_client.reset_id.is_empty()
{ {
rinfo.resync_timestamp = rinfo.resync_timestamp =
format!("{};{}", OffsetDateTime::now_utc().format(&Rfc3339).unwrap(), tgt_client.reset_id); format!("{};{}", OffsetDateTime::now_utc().format(&Rfc3339).unwrap_or_else(|_| "invalid-time".to_string()), tgt_client.reset_id);
rinfo.replication_resynced = true; rinfo.replication_resynced = true;
} }