mirror of
https://github.com/rustfs/rustfs.git
synced 2026-08-31 09:18:28 +00:00
Merge pull request #457 from rustfs/fix/spelling-errors
fix: correct spelling errors in error messages and variable names
This commit is contained in:
+15
-15
@@ -155,7 +155,7 @@ impl Erasure {
|
|||||||
|
|
||||||
// debug!("decode block from {} to {}", start_block, end_block);
|
// debug!("decode block from {} to {}", start_block, end_block);
|
||||||
|
|
||||||
let mut bytes_writed = 0;
|
let mut bytes_written = 0;
|
||||||
|
|
||||||
for block_idx in start_block..=end_block {
|
for block_idx in start_block..=end_block {
|
||||||
let (block_offset, block_length) = if start_block == end_block {
|
let (block_offset, block_length) = if start_block == end_block {
|
||||||
@@ -178,37 +178,37 @@ impl Erasure {
|
|||||||
|
|
||||||
let mut bufs = match reader.read().await {
|
let mut bufs = match reader.read().await {
|
||||||
Ok(bufs) => bufs,
|
Ok(bufs) => bufs,
|
||||||
Err(err) => return (bytes_writed, Some(err)),
|
Err(err) => return (bytes_written, Some(err)),
|
||||||
};
|
};
|
||||||
|
|
||||||
if self.parity_shards > 0 {
|
if self.parity_shards > 0 {
|
||||||
if let Err(err) = self.decode_data(&mut bufs) {
|
if let Err(err) = self.decode_data(&mut bufs) {
|
||||||
return (bytes_writed, Some(err));
|
return (bytes_written, Some(err));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
let writed_n = match self
|
let written_n = match self
|
||||||
.write_data_blocks(writer, bufs, self.data_shards, block_offset, block_length)
|
.write_data_blocks(writer, bufs, self.data_shards, block_offset, block_length)
|
||||||
.await
|
.await
|
||||||
{
|
{
|
||||||
Ok(n) => n,
|
Ok(n) => n,
|
||||||
Err(err) => {
|
Err(err) => {
|
||||||
error!("write_data_blocks err {:?}", &err);
|
error!("write_data_blocks err {:?}", &err);
|
||||||
return (bytes_writed, Some(err));
|
return (bytes_written, Some(err));
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
|
||||||
bytes_writed += writed_n;
|
bytes_written += written_n;
|
||||||
|
|
||||||
// debug!("decode {} writed_n {}, total_writed: {} ", block_idx, writed_n, bytes_writed);
|
// debug!("decode {} written_n {}, total_written: {} ", block_idx, written_n, bytes_written);
|
||||||
}
|
}
|
||||||
|
|
||||||
if bytes_writed != length {
|
if bytes_written != length {
|
||||||
// debug!("bytes_writed != length: {} != {} ", bytes_writed, length);
|
// debug!("bytes_written != length: {} != {} ", bytes_written, length);
|
||||||
return (bytes_writed, Some(Error::other("erasure decode less data")));
|
return (bytes_written, Some(Error::other("erasure decode less data")));
|
||||||
}
|
}
|
||||||
|
|
||||||
(bytes_writed, None)
|
(bytes_written, None)
|
||||||
}
|
}
|
||||||
|
|
||||||
async fn write_data_blocks<W>(
|
async fn write_data_blocks<W>(
|
||||||
@@ -241,7 +241,7 @@ impl Erasure {
|
|||||||
// debug!("write_data_blocks offset {}, length {}", offset, length);
|
// debug!("write_data_blocks offset {}, length {}", offset, length);
|
||||||
|
|
||||||
let mut write = length;
|
let mut write = length;
|
||||||
let mut total_writed = 0;
|
let mut total_written = 0;
|
||||||
|
|
||||||
for opt_buf in bufs.iter().take(data_blocks) {
|
for opt_buf in bufs.iter().take(data_blocks) {
|
||||||
let buf = opt_buf.as_ref().unwrap();
|
let buf = opt_buf.as_ref().unwrap();
|
||||||
@@ -263,7 +263,7 @@ impl Erasure {
|
|||||||
// debug!("write_data_blocks write buf less len {}", buf.len());
|
// debug!("write_data_blocks write buf less len {}", buf.len());
|
||||||
writer.write_all(buf).await?;
|
writer.write_all(buf).await?;
|
||||||
// debug!("write_data_blocks write done len {}", buf.len());
|
// debug!("write_data_blocks write done len {}", buf.len());
|
||||||
total_writed += buf.len();
|
total_written += buf.len();
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -272,10 +272,10 @@ impl Erasure {
|
|||||||
|
|
||||||
// debug!("write_data_blocks write done len {}", n);
|
// debug!("write_data_blocks write done len {}", n);
|
||||||
write -= n;
|
write -= n;
|
||||||
total_writed += n;
|
total_written += n;
|
||||||
}
|
}
|
||||||
|
|
||||||
Ok(total_writed)
|
Ok(total_written)
|
||||||
}
|
}
|
||||||
|
|
||||||
pub fn total_shard_count(&self) -> usize {
|
pub fn total_shard_count(&self) -> usize {
|
||||||
|
|||||||
@@ -161,7 +161,7 @@ pub enum StorageError {
|
|||||||
#[error("not first disk")]
|
#[error("not first disk")]
|
||||||
NotFirstDisk,
|
NotFirstDisk,
|
||||||
|
|
||||||
#[error("first disk wiat")]
|
#[error("first disk wait")]
|
||||||
FirstDiskWait,
|
FirstDiskWait,
|
||||||
|
|
||||||
#[error("Bucket policy not found")]
|
#[error("Bucket policy not found")]
|
||||||
|
|||||||
@@ -1939,7 +1939,7 @@ impl SetDisks {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
// debug!("ec decode {} writed size {}", part_number, n);
|
// debug!("ec decode {} written size {}", part_number, n);
|
||||||
|
|
||||||
total_readed += part_length;
|
total_readed += part_length;
|
||||||
part_offset = 0;
|
part_offset = 0;
|
||||||
|
|||||||
@@ -342,7 +342,7 @@ pub fn ec_drives_no_config(set_drive_count: usize) -> Result<usize> {
|
|||||||
// #[error("not first disk")]
|
// #[error("not first disk")]
|
||||||
// NotFirstDisk,
|
// NotFirstDisk,
|
||||||
|
|
||||||
// #[error("first disk wiat")]
|
// #[error("first disk wait")]
|
||||||
// FirstDiskWait,
|
// FirstDiskWait,
|
||||||
|
|
||||||
// #[error("invalid part id {0}")]
|
// #[error("invalid part id {0}")]
|
||||||
|
|||||||
Reference in New Issue
Block a user