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

fix(app): restore stable Rust 1.98 builds (#6487)

Browse Source 
* chore(scanner): narrow s3s DTO references

* fix(app): scope usage overlay import to tests

* fix(app): bound object-lock lookup future

* fix(log-analyzer): follow decommission migration logs
This commit is contained in:
Zhengchao An
2026-08-24 14:30:25 +08:00
committed by GitHub
parent cd1363d519
commit 51272d34dd
3 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
crates/log-analyzer/src/rules/seed/ops.rs
+2 -1
View File
@@ -21,7 +21,7 @@ use crate::model::LogLevel;
pub(super) fn rules() -> Vec<Rule> { pub(super) fn rules() -> Vec<Rule> {
vec![ vec![
Rule { Rule {
anchors: strings(["decommission_object err"]), anchors: strings(["Decommission object migration failed"]),
min_count: 3, min_count: 3,
..base( ..base(
"decom-object-failed", "decom-object-failed",
@@ -29,6 +29,7 @@ pub(super) fn rules() -> Vec<Rule> {
"ops", "ops",
"下线迁移部分对象失败", "下线迁移部分对象失败",
any([ any([
contains("Decommission object migration failed"),
contains("decommission_object err"), contains("decommission_object err"),
contains("get_object_reader err"), contains("get_object_reader err"),
contains("decommission_entry failed"), contains("decommission_entry failed"),
crates/log-analyzer/src/rules/seed/tests.rs
+1 -1
View File
@@ -265,7 +265,7 @@ fn every_rule_has_a_positive_sample() {
msg("failed to start decommission: insufficient target pool capacity: required 100 bytes available 50 bytes"), msg("failed to start decommission: insufficient target pool capacity: required 100 bytes available 50 bytes"),
), ),
// ops // ops
("decom-object-failed", msg("decommission_pool: decommission_object err timeout")), ("decom-object-failed", msg("Decommission object migration failed")),
("rebalance-worker-error", msg("Rebalance worker 3 error: disk gone")), ("rebalance-worker-error", msg("Rebalance worker 3 error: disk gone")),
( (
"datamove-same-pool", "datamove-same-pool",
rustfs/src/app/multipart_usecase.rs
+1 -1
View File
@@ -524,7 +524,7 @@ impl DefaultMultipartUsecase {
.await .await
.map_err(ApiError::from)?, .map_err(ApiError::from)?,
); );
let object_lock_config_state = load_bucket_object_lock_config_state(&bucket).await?; let object_lock_config_state = Box::pin(load_bucket_object_lock_config_state(&bucket)).await?;
let previous_current_sizes = match store.get_object_info(&bucket, &key, &current_opts).await { let previous_current_sizes = match store.get_object_info(&bucket, &key, &current_opts).await {
Ok(existing_obj_info) => { Ok(existing_obj_info) => {
validate_existing_object_lock_for_write(&object_lock_config_state, &existing_obj_info, &current_opts)?; validate_existing_object_lock_for_write(&object_lock_config_state, &existing_obj_info, &current_opts)?;