From: Matan Breizman <mbreizma@redhat.com>
Date: Wed, 6 Sep 2023 11:46:01 +0000 (+0000)
Subject: crimson/osd/pg: do_osd_ops_execute refactor
X-Git-Tag: v19.0.0~204^2~9
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=e0fb615c9757da60ad1545529b44df3eda5331b7;p=ceph.git

crimson/osd/pg: do_osd_ops_execute refactor

add verbosity around returned futures, no change in behavior.

Signed-off-by: Matan Breizman <mbreizma@redhat.com>
---

diff --git a/src/crimson/osd/pg.cc b/src/crimson/osd/pg.cc
index 7cf3b158c89c..0c1ed5b863cd 100644
--- a/src/crimson/osd/pg.cc
+++ b/src/crimson/osd/pg.cc
@@ -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(