From 08625c27f9e158ffb46d0d5d008f500ee9677b42 Mon Sep 17 00:00:00 2001 From: Xuehan Xu Date: Thu, 27 Apr 2023 03:32:04 +0000 Subject: [PATCH] crimson/osd/snaptrim_event: avoid leaking txn ops for updating head obcs when removing clones Signed-off-by: Xuehan Xu --- src/crimson/osd/osd_operations/snaptrim_event.cc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/crimson/osd/osd_operations/snaptrim_event.cc b/src/crimson/osd/osd_operations/snaptrim_event.cc index 9b67f23ecca..e184cdb0e01 100644 --- a/src/crimson/osd/osd_operations/snaptrim_event.cc +++ b/src/crimson/osd/osd_operations/snaptrim_event.cc @@ -431,7 +431,7 @@ SnapTrimObjSubEvent::remove_or_update( } } - return seastar::do_with(ceph::os::Transaction{}, [=, this](auto&& txn) { + return seastar::do_with(ceph::os::Transaction{}, [=, this](auto &txn) { std::vector log_entries{}; int64_t num_objects_before_trim = delta_stats.num_objects; @@ -467,7 +467,7 @@ SnapTrimObjSubEvent::remove_or_update( //add_objects_trimmed_count(num_objects_trimmed); } }).safe_then_interruptible( - [txn=std::move(txn), log_entries=std::move(log_entries)] () mutable { + [&txn, log_entries=std::move(log_entries)] () mutable { return remove_or_update_iertr::make_ready_future( std::make_pair(std::move(txn), std::move(log_entries))); }); -- 2.39.5