]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
{osdc,test}: Supply missing executors to a couple calls in post
authorAdam C. Emerson <aemerson@redhat.com>
Sat, 10 Jan 2026 08:44:47 +0000 (03:44 -0500)
committerAdam C. Emerson <aemerson@redhat.com>
Thu, 15 Jan 2026 04:54:08 +0000 (23:54 -0500)
Likely due to the `inline_executor` changes, a couple places we
weren't finding an executor were erroring.

https://www.boost.org/doc/libs/latest/doc/html/boost_asio/history.html#boost_asio.history.asio_1_37_0

Signed-off-by: Adam C. Emerson <aemerson@redhat.com>
src/osdc/Objecter.h
src/test/common/test_blocked_completion.cc

index b98987d7e0eadab5a067012ac34779d2eb31aa07..a40ba465fcc7a037824c64122219223df94bab3c 100644 (file)
@@ -2789,7 +2789,7 @@ private:
        std::unique_lock l(rwlock);
        if (osdmap->get_epoch()) {
          l.unlock();
-         boost::asio::post(std::move(handler));
+         boost::asio::post(service.get_executor(), std::move(handler));
        } else {
          auto e = boost::asio::get_associated_executor(
            handler, service.get_executor());
@@ -2898,7 +2898,8 @@ public:
     return boost::asio::async_initiate<decltype(consigned), OpSignature>(
       [epoch, this](auto handler) {
        if (osdmap->get_epoch() >= epoch) {
-         boost::asio::post(boost::asio::append(
+          boost::asio::post(service.get_executor(),
+                            boost::asio::append(
                              std::move(handler),
                              boost::system::error_code{}));
        } else {
index 18f716e13e33b7e358559b19b51baac36cbc14e5..d5f0cbf9518e6c606c6ca0609d7d7d43ce9de6f3 100644 (file)
@@ -78,9 +78,10 @@ auto id(const Executor& executor, CompletionToken&& token,
        Args&& ...args)
 {
   return asio::async_initiate<CompletionToken, void(Args...)>(
-    []<typename ...Args2>(auto handler, Args2&& ...args2) mutable {
-      asio::post(asio::append(std::move(handler),
-                             std::forward<Args2>(args2)...));
+      [executor]<typename... Args2>(auto handler, Args2&&... args2) mutable {
+        asio::post(executor,
+                   asio::append(std::move(handler),
+                                std::forward<Args2>(args2)...));
     }, token, std::forward<Args>(args)...);
 }