Merge pull request #24737 from bharathv/fix_rm_stm_tests_broken

rm_stm_tests: fix broken test
redpanda-data · Jan 10, 2025 · f7e0746 · f7e0746
2 parents 959b2a4 + b203acf
commit f7e0746
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 14 deletions.
diff --git a/src/v/cluster/producer_state.cc b/src/v/cluster/producer_state.cc
@@ -294,12 +294,13 @@ std::ostream& operator<<(std::ostream& o, const producer_state& state) {
     fmt::print(
       o,
       "{{ id: {}, group: {}, requests: {}, "
-      "ms_since_last_update: {}, evicted: {}, ",
+      "ms_since_last_update: {}, evicted: {}, last_known_sequence: {}, ",
       state._id,
       state._group,
       state._requests,
       state.ms_since_last_update(),
-      state._evicted);
+      state._evicted,
+      state.last_sequence_number());
     if (state._transaction_state) {
         fmt::print(o, "transaction_state: {}", *state._transaction_state);
     } else {

diff --git a/src/v/cluster/tests/rm_stm_tests.cc b/src/v/cluster/tests/rm_stm_tests.cc
@@ -47,18 +47,22 @@ static batches_with_identity make_rreader(
   int first_seq,
   int count,
   bool is_transactional) {
-    return batches_with_identity{
-      .id = model::
-        batch_identity{.pid = pid, .first_seq = first_seq, .last_seq = first_seq + count - 1, .record_count = count, .is_transactional = is_transactional},
-      .batches = random_batches(model::test::record_batch_spec{
-                                  .offset = model::offset(0),
-                                  .allow_compression = true,
-                                  .count = count,
-                                  .producer_id = pid.id,
-                                  .producer_epoch = pid.epoch,
-                                  .base_sequence = first_seq,
-                                  .is_transactional = is_transactional})
-                   .get()};
+    batches_with_identity result;
+    result.id = {
+      .pid = pid,
+      .first_seq = first_seq,
+      .last_seq = first_seq + count - 1,
+      .record_count = count,
+      .is_transactional = is_transactional};
+    result.batches.push_back(model::test::make_random_batch(
+      {.offset = model::offset(0),
+       .allow_compression = true,
+       .count = count,
+       .producer_id = pid.id,
+       .producer_epoch = pid.epoch,
+       .base_sequence = first_seq,
+       .is_transactional = is_transactional}));
+    return result;
 }
 
 void check_snapshot_sizes(cluster::rm_stm& stm, raft::consensus* c) {