]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
crimson/osd/pg: do_osd_ops_execute refactor
authorMatan Breizman <mbreizma@redhat.com>
Wed, 6 Sep 2023 11:46:01 +0000 (11:46 +0000)
committerMatan Breizman <mbreizma@redhat.com>
Thu, 19 Oct 2023 12:12:58 +0000 (12:12 +0000)
add verbosity around returned futures, no change in behavior.

Signed-off-by: Matan Breizman <mbreizma@redhat.com>
src/crimson/osd/pg.cc

index 7cf3b158c89cfff19e0bd55ba49270048816136f..0c1ed5b863cde81c0d5272fe0659d740d3c99b0d 100644 (file)
@@ -902,13 +902,20 @@ PG::do_osd_ops_execute(
   }, OpsExecuter::osd_op_errorator::all_same_way(
     [rollbacker, failure_func_ptr]
     (const std::error_code& e) mutable {
-    return PG::do_osd_ops_iertr::make_ready_future<pg_rep_op_fut_t<Ret>>(
-        seastar::now(),
-        e.value() == ENOENT ? (*failure_func_ptr)(e) :
-        rollbacker.rollback_obc_if_modified(e).then_interruptible(
-          [e, failure_func_ptr] {
+
+    auto submitted_fut = seastar::now();
+
+    auto all_completed_fut = e.value() == ENOENT ?
+      (*failure_func_ptr)(e) :
+      rollbacker.rollback_obc_if_modified(e).then_interruptible(
+      [e, failure_func_ptr] {
           return (*failure_func_ptr)(e);
-        }));
+      });
+
+    return PG::do_osd_ops_iertr::make_ready_future<pg_rep_op_fut_t<Ret>>(
+      std::move(submitted_fut),
+      std::move(all_completed_fut)
+    );
   }));
 }
 seastar::future<> PG::submit_error_log(