]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
crimson/os/seastore: fix some debug outputs in omap manager 43124/head
authorXuehan Xu <xxhdx1985126@gmail.com>
Fri, 10 Sep 2021 02:33:40 +0000 (10:33 +0800)
committerXuehan Xu <xxhdx1985126@gmail.com>
Fri, 10 Sep 2021 02:39:53 +0000 (10:39 +0800)
Signed-off-by: Xuehan Xu <xxhdx1985126@gmail.com>
src/crimson/os/seastore/omap_manager/btree/omap_btree_node_impl.cc

index 1cd3d15381f1b27a163e9963c4ca733e933def26..46b5a46fceeebb389b36eafc83fc4a79f7703560 100644 (file)
@@ -323,7 +323,7 @@ OMapInnerNode::merge_entry(
   auto is_left = (iter + 1) == iter_end();
   auto donor_iter = is_left ? iter - 1 : iter + 1;
   return omap_load_extent(oc, donor_iter->get_val(), get_meta().depth - 1)
-    .si_then([=, px=this] (auto &&donor) mutable {
+    .si_then([=] (auto &&donor) mutable {
     auto [l, r] = is_left ?
       std::make_pair(donor, entry) : std::make_pair(entry, donor);
     auto [liter, riter] = is_left ?
@@ -332,8 +332,8 @@ OMapInnerNode::merge_entry(
       logger().debug("{}::merge_entry make_full_merge l {} r {}", __func__, *l, *r);
       assert(entry->extent_is_below_min());
       return l->make_full_merge(oc, r).si_then([liter=liter, riter=riter,
-                                                  l=l, r=r, oc, this, px] (auto &&replacement){
-       logger().debug("OMapInnerNode::merge_entry to update parent: {}", *px);
+                                                  l=l, r=r, oc, this] (auto &&replacement){
+       logger().debug("OMapInnerNode::merge_entry to update parent: {}", *this);
         journal_inner_update(liter, replacement->get_laddr(), maybe_get_delta_buffer());
         journal_inner_remove(riter, maybe_get_delta_buffer());
         //retire extent
@@ -354,8 +354,8 @@ OMapInnerNode::merge_entry(
     } else {
       logger().debug("{}::merge_entry balanced l {} r {}", __func__, *l, *r);
       return l->make_balanced(oc, r).si_then([liter=liter, riter=riter,
-                                                l=l, r=r, oc, this, px] (auto tuple) {
-       logger().debug("OMapInnerNode::merge_entry to update parent: {}", *px);
+                                                l=l, r=r, oc, this] (auto tuple) {
+       logger().debug("OMapInnerNode::merge_entry to update parent: {}", *this);
         auto [replacement_l, replacement_r, replacement_pivot] = tuple;
         //update operation will not cuase node overflow, so we can do it first
         journal_inner_update(liter, replacement_l->get_laddr(), maybe_get_delta_buffer());