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

fix:reduce_write_quorum_errs

Browse Source
This commit is contained in:
weisd
2024-09-03 09:12:32 +08:00
parent da627f24a3
commit ced17f6deb
2 changed files with 13 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
ecstore/src/erasure.rs
+8 -9
View File
@@ -1,4 +1,5 @@
use crate::error::{Error, Result, StdError};
use crate::quorum::{object_ignored_errs, reduce_write_quorum_errs};
use bytes::Bytes;
use futures::future::join_all;
use futures::{Stream, StreamExt};
@@ -49,7 +50,7 @@ impl Erasure {
writers: &mut [W],
// block_size: usize,
total_size: usize,
_write_quorum: usize,
write_quorum: usize,
) -> Result<usize>
where
S: Stream<Item = Result<Bytes, StdError>> + Send + Sync + 'static,
@@ -87,17 +88,15 @@ impl Erasure {
for (i, w) in writers.iter_mut().enumerate() {
match w.write_all(blocks[i].as_ref()).await {
Ok(_) => errs.push(None),
Err(e) => errs.push(Some(e)),
Err(e) => errs.push(Some(Error::new(e))),
}
}
// debug!("{} encode_data write errs:{:?}", self.id, errs);
// // TODO: reduceWriteQuorumErrs
// for err in errs.iter() {
// if err.is_some() {
// return Err(Error::msg("message"));
// }
// }
let err_idx = reduce_write_quorum_errs(&errs, object_ignored_errs().as_slice(), write_quorum)?;
if errs[err_idx].is_some() {
let err = errs[err_idx].take().unwrap();
return Err(err);
}
}
Err(e) => return Err(Error::from_std_error(e)),
}