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

Browse Source
This commit is contained in:
houseme
2025-05-27 12:05:45 +08:00
parent faf195cc4b
commit e4ac7d7a3e
1 changed files with 32 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files
ecstore/src/set_disk.rs
+32 -36
View File
@@ -1452,7 +1452,7 @@ impl SetDisks {
} }
}; };
// check endpoint是否一致 // check endpoint 是否一致
let _ = new_disk.set_disk_id(Some(fm.erasure.this)).await; let _ = new_disk.set_disk_id(Some(fm.erasure.this)).await;
@@ -1643,7 +1643,7 @@ impl SetDisks {
..Default::default() ..Default::default()
}, },
) )
.await .await
} else { } else {
Err(Error::new(DiskError::DiskNotFound)) Err(Error::new(DiskError::DiskNotFound))
} }
@@ -2232,7 +2232,7 @@ impl SetDisks {
object, object,
opts.scan_mode, opts.scan_mode,
) )
.await?; .await?;
// info!( // info!(
// "disks_with_all_parts: got available_disks: {:?}, data_errs_by_disk: {:?}, data_errs_by_part: {:?}, lastest_meta: {:?}", // "disks_with_all_parts: got available_disks: {:?}, data_errs_by_disk: {:?}, data_errs_by_part: {:?}, lastest_meta: {:?}",
@@ -2509,7 +2509,7 @@ impl SetDisks {
DEFAULT_BITROT_ALGO, DEFAULT_BITROT_ALGO,
erasure.shard_size(erasure.block_size), erasure.shard_size(erasure.block_size),
) )
.await?; .await?;
writers.push(Some(writer)); writers.push(Some(writer));
} else { } else {
@@ -2601,7 +2601,7 @@ impl SetDisks {
..Default::default() ..Default::default()
}, },
) )
.await?; .await?;
} }
for (i, v) in result.before.drives.iter().enumerate() { for (i, v) in result.before.drives.iter().enumerate() {
@@ -3359,10 +3359,10 @@ impl SetDisks {
} }
if bucket == RUSTFS_META_BUCKET if bucket == RUSTFS_META_BUCKET
&& (Pattern::new("buckets/*/.metacache/*") && (Pattern::new("buckets/*/.metacache/*")
.map(|p| p.matches(&entry.name)) .map(|p| p.matches(&entry.name))
.unwrap_or(false) .unwrap_or(false)
|| Pattern::new("tmp/.trash/*").map(|p| p.matches(&entry.name)).unwrap_or(false) || Pattern::new("tmp/.trash/*").map(|p| p.matches(&entry.name)).unwrap_or(false)
|| Pattern::new("multipart/*").map(|p| p.matches(&entry.name)).unwrap_or(false)) || Pattern::new("multipart/*").map(|p| p.matches(&entry.name)).unwrap_or(false))
{ {
defer.await; defer.await;
return; return;
@@ -3550,7 +3550,7 @@ impl SetDisks {
..Default::default() ..Default::default()
}, },
) )
.await .await
{ {
ret_err = Some(err); ret_err = Some(err);
} }
@@ -3601,7 +3601,7 @@ impl SetDisks {
..Default::default() ..Default::default()
}, },
) )
.await .await
} else { } else {
Ok(()) Ok(())
} }
@@ -3687,7 +3687,7 @@ impl ObjectIO for SetDisks {
set_index, set_index,
pool_index, pool_index,
) )
.await .await
{ {
error!("get_object_with_fileinfo err {:?}", e); error!("get_object_with_fileinfo err {:?}", e);
}; };
@@ -3814,7 +3814,7 @@ impl ObjectIO for SetDisks {
DEFAULT_BITROT_ALGO, DEFAULT_BITROT_ALGO,
erasure.shard_size(erasure.block_size), erasure.shard_size(erasure.block_size),
) )
.await?; .await?;
writers.push(Some(writer)); writers.push(Some(writer));
} else { } else {
@@ -3880,7 +3880,7 @@ impl ObjectIO for SetDisks {
object, object,
write_quorum, write_quorum,
) )
.await?; .await?;
if let Some(old_dir) = op_old_dir { if let Some(old_dir) = op_old_dir {
self.commit_rename_data_dir(&shuffle_disks, bucket, object, &old_dir.to_string(), write_quorum) self.commit_rename_data_dir(&shuffle_disks, bucket, object, &old_dir.to_string(), write_quorum)
@@ -3984,9 +3984,9 @@ impl StorageAPI for SetDisks {
if ErasureError::ErasureReadQuorum.is(&err) if ErasureError::ErasureReadQuorum.is(&err)
&& !src_bucket.starts_with(RUSTFS_META_BUCKET) && !src_bucket.starts_with(RUSTFS_META_BUCKET)
&& self && self
.delete_if_dang_ling(src_bucket, src_object, &metas, &errs, &HashMap::new(), src_opts.clone()) .delete_if_dang_ling(src_bucket, src_object, &metas, &errs, &HashMap::new(), src_opts.clone())
.await .await
.is_ok() .is_ok()
{ {
if src_opts.version_id.is_some() { if src_opts.version_id.is_some() {
err = Error::new(DiskError::FileVersionNotFound) err = Error::new(DiskError::FileVersionNotFound)
@@ -4266,7 +4266,7 @@ impl StorageAPI for SetDisks {
false, false,
false, false,
) )
.await? .await?
} else { } else {
Self::read_all_xl(&disks, bucket, object, false, false).await Self::read_all_xl(&disks, bucket, object, false, false).await
} }
@@ -4278,9 +4278,9 @@ impl StorageAPI for SetDisks {
if ErasureError::ErasureReadQuorum.is(&err) if ErasureError::ErasureReadQuorum.is(&err)
&& !bucket.starts_with(RUSTFS_META_BUCKET) && !bucket.starts_with(RUSTFS_META_BUCKET)
&& self && self
.delete_if_dang_ling(bucket, object, &metas, &errs, &HashMap::new(), opts.clone()) .delete_if_dang_ling(bucket, object, &metas, &errs, &HashMap::new(), opts.clone())
.await .await
.is_ok() .is_ok()
{ {
if opts.version_id.is_some() { if opts.version_id.is_some() {
err = Error::new(DiskError::FileVersionNotFound) err = Error::new(DiskError::FileVersionNotFound)
@@ -4446,7 +4446,7 @@ impl StorageAPI for SetDisks {
DEFAULT_BITROT_ALGO, DEFAULT_BITROT_ALGO,
shared_size, shared_size,
) )
.await .await
{ {
Ok(writer) => Ok(Some(writer)), Ok(writer) => Ok(Some(writer)),
Err(e) => Err(e), Err(e) => Err(e),
@@ -4502,7 +4502,7 @@ impl StorageAPI for SetDisks {
fi_buff, fi_buff,
write_quorum, write_quorum,
) )
.await?; .await?;
let ret: PartInfo = PartInfo { let ret: PartInfo = PartInfo {
etag: Some(etag.clone()), etag: Some(etag.clone()),
@@ -4758,8 +4758,8 @@ impl StorageAPI for SetDisks {
&parts_metadatas, &parts_metadatas,
write_quorum, write_quorum,
) )
.await .await
.map_err(|e| to_object_err(e, vec![bucket, object]))?; .map_err(|e| to_object_err(e, vec![bucket, object]))?;
// evalDisks // evalDisks
@@ -5007,7 +5007,7 @@ impl StorageAPI for SetDisks {
object, object,
write_quorum, write_quorum,
) )
.await?; .await?;
for (i, op_disk) in online_disks.iter().enumerate() { for (i, op_disk) in online_disks.iter().enumerate() {
if let Some(disk) = op_disk { if let Some(disk) = op_disk {
@@ -5428,7 +5428,7 @@ async fn disks_with_all_parts(
checksum_info.hash, checksum_info.hash,
meta.erasure.shard_size(meta.erasure.block_size), meta.erasure.shard_size(meta.erasure.block_size),
) )
.await) .await)
.err(); .err();
if let Some(vec) = data_errs_by_part.get_mut(&0) { if let Some(vec) = data_errs_by_part.get_mut(&0) {
@@ -5890,7 +5890,7 @@ mod tests {
erasure: ErasureInfo { erasure: ErasureInfo {
data_blocks: 4, data_blocks: 4,
parity_blocks: 2, parity_blocks: 2,
index: 1, // Must be > 0 for is_valid() to return true index: 1, // Must be > 0 for is_valid() to return true
distribution: vec![1, 2, 3, 4, 5, 6], // Must match data_blocks + parity_blocks distribution: vec![1, 2, 3, 4, 5, 6], // Must match data_blocks + parity_blocks
..Default::default() ..Default::default()
}, },
@@ -5902,7 +5902,7 @@ mod tests {
erasure: ErasureInfo { erasure: ErasureInfo {
data_blocks: 6, data_blocks: 6,
parity_blocks: 3, parity_blocks: 3,
index: 1, // Must be > 0 for is_valid() to return true index: 1, // Must be > 0 for is_valid() to return true
distribution: vec![1, 2, 3, 4, 5, 6, 7, 8, 9], // Must match data_blocks + parity_blocks distribution: vec![1, 2, 3, 4, 5, 6, 7, 8, 9], // Must match data_blocks + parity_blocks
..Default::default() ..Default::default()
}, },
@@ -5914,7 +5914,7 @@ mod tests {
erasure: ErasureInfo { erasure: ErasureInfo {
data_blocks: 2, data_blocks: 2,
parity_blocks: 1, parity_blocks: 1,
index: 1, // Must be > 0 for is_valid() to return true index: 1, // Must be > 0 for is_valid() to return true
distribution: vec![1, 2, 3], // Must match data_blocks + parity_blocks distribution: vec![1, 2, 3], // Must match data_blocks + parity_blocks
..Default::default() ..Default::default()
}, },
@@ -6019,11 +6019,7 @@ mod tests {
#[test] #[test]
fn test_join_errs() { fn test_join_errs() {
// Test joining error messages // Test joining error messages
let errs = vec![ let errs = vec![None, Some(Error::from_string("error1")), Some(Error::from_string("error2"))];
None,
Some(Error::from_string("error1")),
Some(Error::from_string("error2")),
];
let joined = join_errs(&errs); let joined = join_errs(&errs);
assert!(joined.contains("<nil>")); assert!(joined.contains("<nil>"));
assert!(joined.contains("error1")); assert!(joined.contains("error1"));
@@ -6098,4 +6094,4 @@ mod tests {
assert_eq!(result2.len(), 3); assert_eq!(result2.len(), 3);
assert!(result2.iter().all(|d| d.is_none())); assert!(result2.iter().all(|d| d.is_none()));
} }
} }