From: Casey Bodley <cbodley@redhat.com>
Date: Thu, 9 Feb 2023 19:46:27 +0000 (-0500)
Subject: osdc: replace asio::io_context::strand with asio::strand<>
X-Git-Tag: v19.3.0~349^2~31
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=37ed6c41a9b92381fa13a8f6b43e8d1674039448;p=ceph.git

osdc: replace asio::io_context::strand with asio::strand<>

Signed-off-by: Casey Bodley <cbodley@redhat.com>
---

diff --git a/src/librados/RadosClient.h b/src/librados/RadosClient.h
index 052249a76db..e7144b2e3f9 100644
--- a/src/librados/RadosClient.h
+++ b/src/librados/RadosClient.h
@@ -96,7 +96,8 @@ private:
   int wait_for_osdmap();
 
 public:
-  boost::asio::io_context::strand finish_strand{poolctx.get_io_context()};
+  boost::asio::strand<boost::asio::io_context::executor_type>
+      finish_strand{poolctx.get_executor()};
 
   explicit RadosClient(CephContext *cct);
   ~RadosClient() override;
diff --git a/src/mon/MonClient.h b/src/mon/MonClient.h
index 081893ae9c4..803c74eb7f6 100644
--- a/src/mon/MonClient.h
+++ b/src/mon/MonClient.h
@@ -23,8 +23,8 @@
 #include <vector>
 
 #include <boost/asio/io_context.hpp>
-#include <boost/asio/io_context_strand.hpp>
 #include <boost/asio/steady_timer.hpp>
+#include <boost/asio/strand.hpp>
 
 #include "msg/Messenger.h"
 
@@ -301,7 +301,8 @@ private:
   mutable ceph::mutex monc_lock = ceph::make_mutex("MonClient::monc_lock");
   SafeTimer timer;
   boost::asio::io_context& service;
-  boost::asio::io_context::strand finish_strand{service};
+  boost::asio::strand<boost::asio::io_context::executor_type>
+      finish_strand{service.get_executor()};
 
   bool initialized;
   bool stopping = false;
diff --git a/src/osdc/Objecter.h b/src/osdc/Objecter.h
index a0d9d0b32e7..9ca09b47647 100644
--- a/src/osdc/Objecter.h
+++ b/src/osdc/Objecter.h
@@ -1643,7 +1643,8 @@ public:
   boost::asio::io_context& service;
   // The guaranteed sequenced, one-at-a-time execution and apparently
   // people sometimes depend on this.
-  boost::asio::io_context::strand finish_strand{service};
+  boost::asio::strand<boost::asio::io_context::executor_type>
+      finish_strand{service.get_executor()};
   ZTracer::Endpoint trace_endpoint{"0.0.0.0", 0, "Objecter"};
 private:
   std::unique_ptr<OSDMap> osdmap{std::make_unique<OSDMap>()};