From 84eb5aebefcd5295e1408bc58db9bee357dc631a Mon Sep 17 00:00:00 2001 From: houseme Date: Sun, 23 Aug 2026 12:07:20 +0800 Subject: [PATCH] fix(ecstore): remove inline write debug noise (#6408) * fix(ecstore): remove inline write debug noise Co-Authored-By: heihutu * fix(ecstore): satisfy warning-as-error lints Co-Authored-By: heihutu --------- Co-authored-by: heihutu --- crates/ecstore/src/set_disk/ops/object.rs | 15 +-------------- crates/ecstore/src/store/object.rs | 2 +- crates/ecstore/src/store/rebalance/support.rs | 2 +- 3 files changed, 3 insertions(+), 16 deletions(-) diff --git a/crates/ecstore/src/set_disk/ops/object.rs b/crates/ecstore/src/set_disk/ops/object.rs index 8f07a7ff7..bb3c9fbf9 100644 --- a/crates/ecstore/src/set_disk/ops/object.rs +++ b/crates/ecstore/src/set_disk/ops/object.rs @@ -2124,26 +2124,13 @@ impl SetDisks { let put_object_size = known_put_object_storage_size(data.size()); let shard_file_size_raw = erasure.shard_file_size(put_object_size); - let is_inline_buffer = - storage_class_config.should_inline(shard_file_size_raw, erasure.data_shards, opts.versioned); + let is_inline_buffer = storage_class_config.should_inline(shard_file_size_raw, erasure.data_shards, opts.versioned); let collect_stage_timing = rustfs_io_metrics::put_stage_metrics_enabled() || issue3031_diag_enabled(); let shard_file_size = shard_file_size_raw; let shard_size = erasure.shard_size(); let write_path = classify_put_write_path(is_inline_buffer, put_object_size, fi.erasure.block_size); let direct_inline_commit = matches!(write_path, SmallWritePath::Inline); - { - use std::io::Write; - let msg = format!( - "INLINE_DEBUG: bucket={} obj={} size={} shard_fs={} ds={} bs={} inline={} direct={} path={} iblock={} ver={}\n", - bucket, object, put_object_size, shard_file_size_raw, erasure.data_shards, fi.erasure.block_size, - is_inline_buffer, direct_inline_commit, write_path.metric_label(), storage_class_config.inline_block(), opts.versioned - ); - if let Ok(mut f) = std::fs::OpenOptions::new().create(true).append(true).open("/tmp/rustfs_inline_debug.log") { - let _ = f.write_all(msg.as_bytes()); - } - let _ = std::io::stderr().write_all(msg.as_bytes()); - } rustfs_io_metrics::record_put_object_path(write_path.metric_label()); let writer_setup_stage_start = collect_stage_timing.then(Instant::now); let (mut writers, errors) = if direct_inline_commit { diff --git a/crates/ecstore/src/store/object.rs b/crates/ecstore/src/store/object.rs index 79a8232f7..7a8653415 100644 --- a/crates/ecstore/src/store/object.rs +++ b/crates/ecstore/src/store/object.rs @@ -3194,7 +3194,7 @@ impl ECStore { // Default return value let mut del_objects = vec![DeletedObject::default(); objects.len()]; - let mut accounting = vec![None; objects.len()]; + let accounting = vec![None; objects.len()]; let mut del_errs = Vec::with_capacity(objects.len()); for _ in 0..objects.len() { diff --git a/crates/ecstore/src/store/rebalance/support.rs b/crates/ecstore/src/store/rebalance/support.rs index 6e4db41b8..434f9c29d 100644 --- a/crates/ecstore/src/store/rebalance/support.rs +++ b/crates/ecstore/src/store/rebalance/support.rs @@ -271,7 +271,7 @@ pub(super) fn resolve_latest_object_info_candidates( .filter(|candidate| latest_candidate_mod_time(candidate) == Some(latest_mod_time)) .collect::>(); - latest_candidates.sort_by(|left, right| right.idx.cmp(&left.idx)); + latest_candidates.sort_by_key(|candidate| std::cmp::Reverse(candidate.idx)); let Some(winner) = latest_candidates.first() else { return Err(Error::ErasureReadQuorum);