gsadmin/rustfs
1
0
Fork 0
mirror of https://github.com/rustfs/rustfs.git synced 2026-08-13 08:36:54 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'main' of github.com:rustfs/s3-rustfs into feature/observability-metrics

Browse Source 
# Conflicts:
#	ecstore/src/file_meta.rs
#	ecstore/src/set_disk.rs
#	ecstore/src/store_api.rs
This commit is contained in:
houseme
2025-05-27 12:05:35 +08:00
parent a9c6bb8f0d 7abcfe31e8
commit faf195cc4b
3 changed files with 58 additions and 55 deletions
Download Patch File Download Diff File Expand all files Collapse all files
ecstore/src/set_disk.rs
+38 -34
View File
@@ -1643,7 +1643,7 @@ impl SetDisks {
..Default::default()
},
)
.await
.await
} else {
Err(Error::new(DiskError::DiskNotFound))
}
@@ -2232,7 +2232,7 @@ impl SetDisks {
object,
opts.scan_mode,
)
.await?;
.await?;
// info!(
// "disks_with_all_parts: got available_disks: {:?}, data_errs_by_disk: {:?}, data_errs_by_part: {:?}, lastest_meta: {:?}",
@@ -2378,7 +2378,7 @@ impl SetDisks {
if !lastest_meta.deleted && lastest_meta.erasure.distribution.len() != available_disks.len() {
let err_str = format!("unexpected file distribution ({:?}) from available disks ({:?}), looks like backend disks have been manually modified refusing to heal {}/{}({})",
lastest_meta.erasure.distribution, available_disks, bucket, object, version_id);
lastest_meta.erasure.distribution, available_disks, bucket, object, version_id);
warn!(err_str);
let err = Error::from_string(err_str);
return Ok((
@@ -2391,7 +2391,7 @@ impl SetDisks {
let latest_disks = Self::shuffle_disks(&available_disks, &lastest_meta.erasure.distribution);
if !lastest_meta.deleted && lastest_meta.erasure.distribution.len() != outdate_disks.len() {
let err_str = format!("unexpected file distribution ({:?}) from outdated disks ({:?}), looks like backend disks have been manually modified refusing to heal {}/{}({})",
lastest_meta.erasure.distribution, outdate_disks, bucket, object, version_id);
lastest_meta.erasure.distribution, outdate_disks, bucket, object, version_id);
warn!(err_str);
let err = Error::from_string(err_str);
return Ok((
@@ -2403,7 +2403,7 @@ impl SetDisks {
if !lastest_meta.deleted && lastest_meta.erasure.distribution.len() != parts_metadata.len() {
let err_str = format!("unexpected file distribution ({:?}) from metadata entries ({:?}), looks like backend disks have been manually modified refusing to heal {}/{}({})",
lastest_meta.erasure.distribution, parts_metadata.len(), bucket, object, version_id);
lastest_meta.erasure.distribution, parts_metadata.len(), bucket, object, version_id);
warn!(err_str);
let err = Error::from_string(err_str);
return Ok((
@@ -2509,7 +2509,7 @@ impl SetDisks {
DEFAULT_BITROT_ALGO,
erasure.shard_size(erasure.block_size),
)
.await?;
.await?;
writers.push(Some(writer));
} else {
@@ -2601,7 +2601,7 @@ impl SetDisks {
..Default::default()
},
)
.await?;
.await?;
}
for (i, v) in result.before.drives.iter().enumerate() {
@@ -3359,10 +3359,10 @@ impl SetDisks {
}
if bucket == RUSTFS_META_BUCKET
&& (Pattern::new("buckets/*/.metacache/*")
.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))
.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))
{
defer.await;
return;
@@ -3550,7 +3550,7 @@ impl SetDisks {
..Default::default()
},
)
.await
.await
{
ret_err = Some(err);
}
@@ -3601,7 +3601,7 @@ impl SetDisks {
..Default::default()
},
)
.await
.await
} else {
Ok(())
}
@@ -3687,7 +3687,7 @@ impl ObjectIO for SetDisks {
set_index,
pool_index,
)
.await
.await
{
error!("get_object_with_fileinfo err {:?}", e);
};
@@ -3814,7 +3814,7 @@ impl ObjectIO for SetDisks {
DEFAULT_BITROT_ALGO,
erasure.shard_size(erasure.block_size),
)
.await?;
.await?;
writers.push(Some(writer));
} else {
@@ -3880,7 +3880,7 @@ impl ObjectIO for SetDisks {
object,
write_quorum,
)
.await?;
.await?;
if let Some(old_dir) = op_old_dir {
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)
&& !src_bucket.starts_with(RUSTFS_META_BUCKET)
&& self
.delete_if_dang_ling(src_bucket, src_object, &metas, &errs, &HashMap::new(), src_opts.clone())
.await
.is_ok()
.delete_if_dang_ling(src_bucket, src_object, &metas, &errs, &HashMap::new(), src_opts.clone())
.await
.is_ok()
{
if src_opts.version_id.is_some() {
err = Error::new(DiskError::FileVersionNotFound)
@@ -4266,7 +4266,7 @@ impl StorageAPI for SetDisks {
false,
false,
)
.await?
.await?
} else {
Self::read_all_xl(&disks, bucket, object, false, false).await
}
@@ -4278,9 +4278,9 @@ impl StorageAPI for SetDisks {
if ErasureError::ErasureReadQuorum.is(&err)
&& !bucket.starts_with(RUSTFS_META_BUCKET)
&& self
.delete_if_dang_ling(bucket, object, &metas, &errs, &HashMap::new(), opts.clone())
.await
.is_ok()
.delete_if_dang_ling(bucket, object, &metas, &errs, &HashMap::new(), opts.clone())
.await
.is_ok()
{
if opts.version_id.is_some() {
err = Error::new(DiskError::FileVersionNotFound)
@@ -4446,7 +4446,7 @@ impl StorageAPI for SetDisks {
DEFAULT_BITROT_ALGO,
shared_size,
)
.await
.await
{
Ok(writer) => Ok(Some(writer)),
Err(e) => Err(e),
@@ -4502,7 +4502,7 @@ impl StorageAPI for SetDisks {
fi_buff,
write_quorum,
)
.await?;
.await?;
let ret: PartInfo = PartInfo {
etag: Some(etag.clone()),
@@ -4758,8 +4758,8 @@ impl StorageAPI for SetDisks {
&parts_metadatas,
write_quorum,
)
.await
.map_err(|e| to_object_err(e, vec![bucket, object]))?;
.await
.map_err(|e| to_object_err(e, vec![bucket, object]))?;
// evalDisks
@@ -5007,7 +5007,7 @@ impl StorageAPI for SetDisks {
object,
write_quorum,
)
.await?;
.await?;
for (i, op_disk) in online_disks.iter().enumerate() {
if let Some(disk) = op_disk {
@@ -5428,7 +5428,7 @@ async fn disks_with_all_parts(
checksum_info.hash,
meta.erasure.shard_size(meta.erasure.block_size),
)
.await)
.await)
.err();
if let Some(vec) = data_errs_by_part.get_mut(&0) {
@@ -5890,7 +5890,7 @@ mod tests {
erasure: ErasureInfo {
data_blocks: 4,
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
..Default::default()
},
@@ -5902,7 +5902,7 @@ mod tests {
erasure: ErasureInfo {
data_blocks: 6,
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
..Default::default()
},
@@ -5914,7 +5914,7 @@ mod tests {
erasure: ErasureInfo {
data_blocks: 2,
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
..Default::default()
},
@@ -6019,7 +6019,11 @@ mod tests {
#[test]
fn test_join_errs() {
// Test joining error messages
let errs = vec![None, Some(Error::from_string("error1")), Some(Error::from_string("error2"))];
let errs = vec![
None,
Some(Error::from_string("error1")),
Some(Error::from_string("error2")),
];
let joined = join_errs(&errs);
assert!(joined.contains("<nil>"));
assert!(joined.contains("error1"));
@@ -6094,4 +6098,4 @@ mod tests {
assert_eq!(result2.len(), 3);
assert!(result2.iter().all(|d| d.is_none()));
}
}
}