From: Radoslaw Zarzynski <rzarzyns@redhat.com>
Date: Thu, 2 Jan 2020 12:31:48 +0000 (+0100)
Subject: crimson/osd: fix the lifetime management of OpsExecuter.
X-Git-Tag: v15.1.1~415^2
X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=5ba2b2c01793a57879beb7f88d8c3d92e40550cb;p=ceph-ci.git

crimson/osd: fix the lifetime management of OpsExecuter.

Signed-off-by: Radoslaw Zarzynski <rzarzyns@redhat.com>
---

diff --git a/src/crimson/osd/pg.cc b/src/crimson/osd/pg.cc
index 0dc06f561d0..40fbc948dc2 100644
--- a/src/crimson/osd/pg.cc
+++ b/src/crimson/osd/pg.cc
@@ -525,7 +525,7 @@ seastar::future<Ref<MOSDOpReply>> PG::do_osd_ops(
       obc->obs.oi.soid,
       ceph_osd_op_name(osd_op.op.op));
     return ox->execute_osd_op(osd_op);
-  }).safe_then([this, obc, m, ox = std::move(ox)] {
+  }).safe_then([this, obc, m, ox = ox.get()] {
     logger().debug(
       "do_osd_ops: {} - object {} all operations successful",
       *m,
@@ -547,7 +547,7 @@ seastar::future<Ref<MOSDOpReply>> PG::do_osd_ops(
           return submit_transaction(std::move(obc), std::move(txn), *m);
         }
       });
-  }).safe_then([m, obc, this] {
+  }).safe_then([m, obc, this, ox_deleter = std::move(ox)] {
     auto reply = make_message<MOSDOpReply>(m.get(), 0, get_osdmap_epoch(),
                                            0, false);
     reply->add_flags(CEPH_OSD_FLAG_ACK | CEPH_OSD_FLAG_ONDISK);