crimson/os/seastore/omap_manager: fix error when listing multiple omap tree inner...

Fixes: https://tracker.ceph.com/issues/56399
Signed-off-by: Xuehan Xu <xxhdx1985126@gmail.com>

diff --git a/src/crimson/os/seastore/omap_manager/btree/omap_btree_node_impl.cc b/src/crimson/os/seastore/omap_manager/btree/omap_btree_node_impl.cc
index e23c183738a0c3ceae69fd5066b2e6722253f4fd..4b61d119c9072ae5e034677ab034b9c8c2f89d56 100644 (file)
--- a/src/crimson/os/seastore/omap_manager/btree/omap_btree_node_impl.cc
+++ b/src/crimson/os/seastore/omap_manager/btree/omap_btree_node_impl.cc
@@ -214,7 +214,15 @@ OMapInnerNode::list(
     child_iter,
     iter_cend(),
     list_bare_ret(false, {}),
-    [=, &start](auto &biter, auto &eiter, auto &ret) {
+    true,
+    start,
+    [this, oc, config](
+      auto &biter,
+      auto &eiter,
+      auto &ret,
+      bool &first_entry,
+      auto &start)
+    {
       auto &complete = std::get<0>(ret);
       auto &result = std::get<1>(ret);
       return trans_intr::repeat(
@@ -231,7 +239,7 @@ OMapInnerNode::list(
          ).si_then([&, config, oc] (auto &&extent) {
            return extent->list(
              oc,
-             start,
+             first_entry ? start : std::nullopt,
              config.with_reduced_max(result.size())
            ).si_then([&, config](auto &&child_ret) mutable {
              boost::ignore_unused(config);   // avoid clang warning;
@@ -239,12 +247,13 @@ OMapInnerNode::list(
              if (result.size() && child_result.size()) {
                assert(child_result.begin()->first > result.rbegin()->first);
              }
-             if (child_result.size() && start) {
+             if (child_result.size() && start && first_entry) {
                assert(child_result.begin()->first > *start);
              }
              result.merge(std::move(child_result));
              ++biter;
              assert(child_complete || result.size() == config.max_result_size);
+             first_entry = false;
              return list_iertr::make_ready_future<seastar::stop_iteration>(
                seastar::stop_iteration::no);
            });