Merge pull request #23399 from nvartolomei/nv/adjacent-segment-merger…

…-better-sizing

archival: use correct segment size in adjacent segment merger

src/v/cluster/archival/ntp_archiver_service.cc

@@ -3239,13 +3239,10 @@ ss::future<bool> ntp_archiver::do_upload_remote(
 }
 
 size_t ntp_archiver::get_local_segment_size() const {
-    auto log_segment_size = config::shard_local_cfg().log_segment_size.value();
-    const auto& cfg = _parent.raft()->log_config();
-    if (cfg.has_overrides()) {
-        log_segment_size = cfg.get_overrides().segment_size.value_or(
-          log_segment_size);
-    }
-    return log_segment_size;
+    auto& disk_log = dynamic_cast<storage::disk_log_impl&>(
+      *_parent.raft()->log());
+
+    return disk_log.max_segment_size();
 }
 
 ss::future<bool>

src/v/storage/disk_log_impl.h

@@ -221,6 +221,8 @@ class disk_log_impl final : public log {
     static ss::future<>
     remove_kvstore_state(const model::ntp&, storage::kvstore&);
 
+    size_t max_segment_size() const;
+
 private:
     friend class disk_log_appender; // for multi-term appends
     friend class disk_log_builder;  // for tests
@@ -352,7 +354,6 @@ class disk_log_impl final : public log {
     size_t get_log_truncation_counter() const noexcept override;
 
 private:
-    size_t max_segment_size() const;
     // Computes the segment size based on the latest max_segment_size
     // configuration. This takes into consideration any segment size
     // overrides since the last time it was called.