From 7ce82cf2d5d6ef045cbcec4e9d1879460aab6062 Mon Sep 17 00:00:00 2001 From: Andrea Barbadoro Date: Wed, 29 Nov 2023 12:20:59 +0100 Subject: [PATCH 1/4] cluster/tx_gateway_frontend: missing tx_id in log msg (cherry picked from commit 548f6c61607a306690c2710e3719d0373ea20745) --- src/v/cluster/tx_gateway_frontend.cc | 1 + 1 file changed, 1 insertion(+) diff --git a/src/v/cluster/tx_gateway_frontend.cc b/src/v/cluster/tx_gateway_frontend.cc index de36c3de517e6..d6e49d9997c05 100644 --- a/src/v/cluster/tx_gateway_frontend.cc +++ b/src/v/cluster/tx_gateway_frontend.cc @@ -1035,6 +1035,7 @@ ss::future tx_gateway_frontend::init_tm_tx( txlog.trace, "[tx_id: {}] waiting for {} topic to apper in metadata cache, " "retries left: {}", + tx_id, model::tx_manager_nt, retries); if (_metadata_cache.local().contains(model::tx_manager_nt)) { From 04e5ce2003ec796117a38b6b0c0982de8d3239cb Mon Sep 17 00:00:00 2001 From: Andrea Barbadoro Date: Wed, 29 Nov 2023 12:21:39 +0100 Subject: [PATCH 2/4] raft/consensus: missing broker id in log msg (cherry picked from commit 736a80b695ff19e72486bd5ed69256d1581dc109) --- src/v/raft/consensus.cc | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/v/raft/consensus.cc b/src/v/raft/consensus.cc index 442b2b6a05ef2..b20508d1bb03f 100644 --- a/src/v/raft/consensus.cc +++ b/src/v/raft/consensus.cc @@ -983,7 +983,8 @@ consensus::update_group_member(model::broker broker) { if (!cfg.contains_broker(broker.id())) { vlog( _ctxlog.warn, - "Node with id {} does not exists in current configuration"); + "Node with id {} does not exists in current configuration", + broker.id()); return ss::make_ready_future( errc::node_does_not_exists); } From 26a175450382f4e127746c0aaec9180e02d19e1d Mon Sep 17 00:00:00 2001 From: Andrea Barbadoro Date: Wed, 29 Nov 2023 12:23:47 +0100 Subject: [PATCH 3/4] storage/offset_translator_state: missing ntp in log msg (cherry picked from commit 3cffb23dc5db95b1a82aa66fef9696336135a4aa) --- src/v/storage/offset_translator_state.cc | 1 + 1 file changed, 1 insertion(+) diff --git a/src/v/storage/offset_translator_state.cc b/src/v/storage/offset_translator_state.cc index 6171114833c1d..e5093f4418945 100644 --- a/src/v/storage/offset_translator_state.cc +++ b/src/v/storage/offset_translator_state.cc @@ -115,6 +115,7 @@ model::offset offset_translator_state::to_log_offset( vassert( interval_end_it != _last_offset2batch.begin(), "ntp {}: log offset search start too small: {}", + _ntp, search_start); auto delta = std::prev(interval_end_it)->second.next_delta; From d813188a0a7f0ccd35bfc823e88486f963e94ace Mon Sep 17 00:00:00 2001 From: Andrea Barbadoro Date: Wed, 29 Nov 2023 12:24:34 +0100 Subject: [PATCH 4/4] storage/segment_appender: missing parameters in vassert messages (cherry picked from commit 7c60a4da09048c220a240ebb9d24943dc0e037e4) --- src/v/storage/segment_appender.cc | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/v/storage/segment_appender.cc b/src/v/storage/segment_appender.cc index 616b1096049a7..0713f76066453 100644 --- a/src/v/storage/segment_appender.cc +++ b/src/v/storage/segment_appender.cc @@ -297,6 +297,7 @@ ss::future<> segment_appender::truncate(size_t n) { n <= file_byte_offset(), "Cannot ask to truncate at:{} which is more bytes than we have:{} - {}", file_byte_offset(), + n, *this); return hard_flush() .then([this, n] { return do_truncation(n); }) @@ -663,7 +664,10 @@ bool segment_appender::inflight_write::try_merge( // writes should form a contiguous series of writes and we only check // the last write for merging. vassert( - committed_offset == pco, "in try_merge writes didn't touch: {} {}"); + committed_offset == pco, + "in try_merge writes didn't touch: {} {}", + committed_offset, + pco); // the lhs write cannot be full since then how could the next write // share its chunk: it must use a new chunk