]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
crimson/osd/snaptrim_event: avoid leaking txn ops for updating head obcs 51638/head
authorXuehan Xu <xxhdx1985126@gmail.com>
Thu, 27 Apr 2023 03:32:04 +0000 (03:32 +0000)
committerMatan Breizman <mbreizma@redhat.com>
Sun, 21 May 2023 09:36:00 +0000 (09:36 +0000)
when removing clones

Signed-off-by: Xuehan Xu <xxhdx1985126@gmail.com>
(cherry picked from commit 08625c27f9e158ffb46d0d5d008f500ee9677b42)

src/crimson/osd/osd_operations/snaptrim_event.cc

index 2c44e70c470a9aa895edb1fddcbe521dd370091e..72144d1a57198cfa2574591b675d7b9f672780e8 100644 (file)
@@ -430,7 +430,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<pg_log_entry_t> log_entries{};
 
   int64_t num_objects_before_trim = delta_stats.num_objects;
@@ -466,7 +466,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<remove_or_update_ret_t>(
       std::make_pair(std::move(txn), std::move(log_entries)));
   });