gsadmin/rustfs
1
0
Fork 0
mirror of https://github.com/rustfs/rustfs.git synced 2026-08-20 11:32:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #358 from rustfs/pref

Browse Source 
Pref
This commit is contained in:
guojidan
2025-04-24 16:13:44 +08:00
committed by GitHub
parent 56575d58f4 b2da8148bd
commit 35dac63c36
4 changed files with 88 additions and 55 deletions
Download Patch File Download Diff File Expand all files Collapse all files
ecstore/src/set_disk.rs
+24 -19
View File
@@ -325,6 +325,7 @@ impl SetDisks {
}
}
let mut futures = Vec::with_capacity(disks.len());
if let Some(err) = reduce_write_quorum_errs(&errs, object_op_ignored_errs().as_ref(), write_quorum) {
// TODO: 并发
for (i, err) in errs.iter().enumerate() {
@@ -334,26 +335,30 @@ impl SetDisks {
if let Some(disk) = disks[i].as_ref() {
let fi = file_infos[i].clone();
let _ = disk
.delete_version(
src_bucket,
src_object,
fi,
false,
DeleteOptions {
undo_write: true,
old_data_dir: data_dirs[i],
..Default::default()
},
)
.await
.map_err(|e| {
debug!("rename_data delete_version err {:?}", e);
e
});
let old_data_dir = data_dirs[i];
futures.push(async move {
let _ = disk
.delete_version(
src_bucket,
src_object,
fi,
false,
DeleteOptions {
undo_write: true,
old_data_dir: old_data_dir,
..Default::default()
},
)
.await
.map_err(|e| {
debug!("rename_data delete_version err {:?}", e);
e
});
});
}
}
let _ = join_all(futures).await;
return Err(err);
}
@@ -3793,7 +3798,7 @@ impl ObjectIO for SetDisks {
error!("close_bitrot_writers err {:?}", err);
}
let etag = etag_stream.etag();
let etag = etag_stream.etag().await;
//TODO: userDefined
user_defined.insert("etag".to_owned(), etag.clone());
@@ -4384,7 +4389,7 @@ impl StorageAPI for SetDisks {
error!("close_bitrot_writers err {:?}", err);
}
let mut etag = etag_stream.etag();
let mut etag = etag_stream.etag().await;
if let Some(ref tag) = opts.preserve_etag {
etag = tag.clone();