From: Matan Breizman Date: Mon, 24 Apr 2023 12:53:40 +0000 (+0000) Subject: crimson/osd/osd_operations/snaptrim_event: Add log lines and formatting X-Git-Tag: v18.1.0~55^2~3 X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=fc6868ee18e1c29cab1f0ab93e62685d57b441de;p=ceph-ci.git crimson/osd/osd_operations/snaptrim_event: Add log lines and formatting Signed-off-by: Matan Breizman (cherry picked from commit 51c70dc95dd6a0ce2d9044a0907e7fa46fc02619) --- diff --git a/src/crimson/osd/osd_operations/snaptrim_event.cc b/src/crimson/osd/osd_operations/snaptrim_event.cc index 29a7e12d058..d16e6c7c09b 100644 --- a/src/crimson/osd/osd_operations/snaptrim_event.cc +++ b/src/crimson/osd/osd_operations/snaptrim_event.cc @@ -139,6 +139,7 @@ SnapTrimEvent::with_pg( }).then_interruptible([&shard_services, this] (const auto& to_trim) { if (to_trim.empty()) { // the legit ENOENT -> done + logger().debug("{}: to_trim is empty! Stopping iteration", *this); return snap_trim_iertr::make_ready_future( seastar::stop_iteration::yes); } @@ -502,12 +503,12 @@ SnapTrimObjSubEvent::with_pg( return pg->obc_loader.with_head_and_clone_obc( coid, [this](auto head_obc, auto clone_obc) { - logger().debug("{}: got clone_obc={}", *this, fmt::ptr(clone_obc.get())); + logger().debug("{}: got clone_obc={}", *this, clone_obc->get_oid()); return enter_stage( pp().process ).then_interruptible( [this,clone_obc=std::move(clone_obc), head_obc=std::move(head_obc)]() mutable { - logger().debug("{}: processing clone_obc={}", *this, fmt::ptr(clone_obc.get())); + logger().debug("{}: processing clone_obc={}", *this, clone_obc->get_oid()); return remove_or_update( clone_obc, head_obc ).safe_then_unpack_interruptible([clone_obc, this]