From 4324c8b639003c6e7ce42a0760201a6e8a38dac9 Mon Sep 17 00:00:00 2001
From: Abhijat Malviya <abhijat@redpanda.com>
Date: Mon, 13 May 2024 13:19:05 +0530
Subject: [PATCH] storage/tests: Adjust step size deviance used in test

In the e2e storage test the index step size of 32KiB is used as possible
deviance from expected results. An allowance of 50KiB is used to prevent
the test failing because of index step size.

The change computes max step size across all segment indices and uses
that as the deviance.
---
 src/v/storage/segment_index.h           |  1 +
 src/v/storage/tests/storage_e2e_test.cc | 51 ++++++++++++++++++++-----
 2 files changed, 43 insertions(+), 9 deletions(-)

diff --git a/src/v/storage/segment_index.h b/src/v/storage/segment_index.h
index cfd6d2143727..5526754b08fe 100644
--- a/src/v/storage/segment_index.h
+++ b/src/v/storage/segment_index.h
@@ -258,6 +258,7 @@ class segment_index {
 
     friend class offset_index_utils_fixture;
     friend class log_replayer_fixture;
+    friend class segment_index_observer;
 
     friend std::ostream& operator<<(std::ostream&, const segment_index&);
 };
diff --git a/src/v/storage/tests/storage_e2e_test.cc b/src/v/storage/tests/storage_e2e_test.cc
index e4aef420752f..f6007c2246d6 100644
--- a/src/v/storage/tests/storage_e2e_test.cc
+++ b/src/v/storage/tests/storage_e2e_test.cc
@@ -4555,6 +4555,26 @@ FIXTURE_TEST(test_offset_range_size2_compacted, storage_test_fixture) {
       == std::nullopt);
 };
 
+namespace storage {
+class segment_index_observer {
+public:
+    explicit segment_index_observer(segment_index& index)
+      : _index{index} {}
+
+    size_t max_step_size() const {
+        fragmented_vector<size_t> diffs;
+        auto& pos = _index._state.position_index;
+        diffs.reserve(pos.size());
+        std::adjacent_difference(
+          pos.begin(), pos.end(), std::back_inserter(diffs));
+        return std::ranges::max(diffs);
+    }
+
+private:
+    segment_index& _index;
+};
+} // namespace storage
+
 FIXTURE_TEST(test_offset_range_size_incremental, storage_test_fixture) {
 #ifdef NDEBUG
     size_t num_segments = 300;
@@ -4575,15 +4595,14 @@ FIXTURE_TEST(test_offset_range_size_incremental, storage_test_fixture) {
         size_t max_size;
     };
     std::vector<size_target> size_classes = {
-      // can overshoot quite a lot because of the index step (32KiB)
-      {100, 0, 50_KiB},
-      {2000, 1_KiB, 50_KiB},
-      {10_KiB, 1_KiB, 50_KiB},
-      {50_KiB, 1_KiB, 100_KiB},
-      {500_KiB, 1_KiB, 550_KiB},
-      {1_MiB, 1_KiB, 1_MiB + 50_KiB},
-      {10_MiB, 1_KiB, 10_MiB + 50_KiB},
-      {100_MiB, 1_KiB, 100_MiB + 50_KiB},
+      {100, 0, 100},
+      {2000, 1_KiB, 2000},
+      {10_KiB, 1_KiB, 10_KiB},
+      {50_KiB, 1_KiB, 50_KiB},
+      {500_KiB, 1_KiB, 500_KiB},
+      {1_MiB, 1_KiB, 1_MiB},
+      {10_MiB, 1_KiB, 10_MiB},
+      {100_MiB, 1_KiB, 100_MiB},
     };
     auto cfg = default_log_config(test_dir);
     ss::abort_source as;
@@ -4608,6 +4627,7 @@ FIXTURE_TEST(test_offset_range_size_incremental, storage_test_fixture) {
         }
         log->force_roll(ss::default_priority_class()).get();
     }
+    size_t max_step_size = 0;
     for (auto& s : log->segments()) {
         if (s->size_bytes() == 0) {
             continue;
@@ -4618,6 +4638,19 @@ FIXTURE_TEST(test_offset_range_size_incremental, storage_test_fixture) {
           s->index().path(),
           s->index().size());
         BOOST_REQUIRE(s->index().size() > 0);
+        max_step_size = std::max(
+          max_step_size,
+          storage::segment_index_observer{s->index()}.max_step_size());
+    }
+
+    BOOST_REQUIRE(max_step_size > 0);
+    vlog(
+      e2e_test_log.info,
+      "Max index step size among all segments: {}",
+      max_step_size);
+
+    for (auto& sc : size_classes) {
+        sc.max_size += max_step_size + sc.target;
     }
 
     std::vector<batch_summary> summaries;