Merge pull request redpanda-data#15861 from vbotbuildovich/backport-p…

…r-15846-v23.2.x-400
vbotbuildovich · Dec 22, 2023 · 7db730e · 7db730e
2 parents 945bcf1 + 9eedf09
commit 7db730e
Showing 1 changed file with 4 additions and 1 deletion.
diff --git a/src/v/kafka/server/handlers/fetch.cc b/src/v/kafka/server/handlers/fetch.cc
@@ -797,7 +797,10 @@ class simple_fetch_planner final : public fetch_planner::impl {
               .strict_max_bytes = octx.response_size > 0,
               .skip_read = bytes_left_in_plan == 0 && max_bytes == 0,
               .read_from_follower = octx.request.has_rack_id(),
-              .consumer_rack_id = octx.request.data.rack_id,
+              .consumer_rack_id = octx.request.has_rack_id()
+                                    ? std::make_optional(
+                                      octx.request.data.rack_id)
+                                    : std::nullopt,
               .abort_source = octx.rctx.abort_source(),
               .client_address = model::client_address_t{client_address},
             };