|
 |
bf4b7ae |
--- ceph-16.1.0/src/librbd/AsioEngine.h.orig 2021-01-27 09:52:12.314415539 -0500
|
|
|
bf4b7ae |
+++ ceph-16.1.0/src/librbd/AsioEngine.h 2021-01-27 09:55:35.289955105 -0500
|
|
|
bf4b7ae |
@@ -39,7 +39,8 @@
|
|
|
bf4b7ae |
inline operator boost::asio::io_context&() {
|
|
|
bf4b7ae |
return m_io_context;
|
|
|
bf4b7ae |
}
|
|
|
bf4b7ae |
- inline boost::asio::io_context::executor_type get_executor() {
|
|
|
bf4b7ae |
+ using executor_type = boost::asio::io_context::executor_type;
|
|
|
bf4b7ae |
+ inline executor_type get_executor() {
|
|
|
bf4b7ae |
return m_io_context.get_executor();
|
|
|
bf4b7ae |
}
|
|
|
bf4b7ae |
|
|
|
bf4b7ae |
--- ceph-16.1.0/src/librbd/migration/FileStream.cc.orig 2021-01-27 09:58:21.984505879 -0500
|
|
|
bf4b7ae |
+++ ceph-16.1.0/src/librbd/migration/FileStream.cc 2021-01-27 09:58:48.945241982 -0500
|
|
|
bf4b7ae |
@@ -121,7 +121,8 @@
|
|
|
bf4b7ae |
template <typename I>
|
|
|
bf4b7ae |
FileStream::FileStream(I* image_ctx, const json_spirit::mObject& json_object)
|
|
|
bf4b7ae |
: m_cct(image_ctx->cct), m_asio_engine(image_ctx->asio_engine),
|
|
|
bf4b7ae |
- m_json_object(json_object), m_strand(*m_asio_engine) {
|
|
|
bf4b7ae |
+ m_json_object(json_object),
|
|
|
bf4b7ae |
+ m_strand(boost::asio::make_strand(*m_asio_engine)) {
|
|
|
bf4b7ae |
}
|
|
|
bf4b7ae |
|
|
|
bf4b7ae |
template <typename I>
|
|
|
bf4b7ae |
--- ceph-16.1.0/src/librbd/migration/FileStream.h.orig 2021-01-27 09:59:03.542640537 -0500
|
|
|
bf4b7ae |
+++ ceph-16.1.0/src/librbd/migration/FileStream.h 2021-01-27 09:59:42.054692043 -0500
|
|
|
bf4b7ae |
@@ -6,7 +6,8 @@
|
|
|
bf4b7ae |
|
|
|
bf4b7ae |
#include "include/int_types.h"
|
|
|
bf4b7ae |
#include "librbd/migration/StreamInterface.h"
|
|
|
bf4b7ae |
-#include <boost/asio/io_context_strand.hpp>
|
|
|
bf4b7ae |
+#include <boost/asio/io_context.hpp>
|
|
|
bf4b7ae |
+#include <boost/asio/strand.hpp>
|
|
|
bf4b7ae |
#include <boost/asio/posix/basic_stream_descriptor.hpp>
|
|
|
bf4b7ae |
#include <json_spirit/json_spirit.h>
|
|
|
bf4b7ae |
#include <memory>
|
|
|
bf4b7ae |
@@ -48,7 +49,7 @@
|
|
|
bf4b7ae |
std::shared_ptr<AsioEngine> m_asio_engine;
|
|
|
bf4b7ae |
json_spirit::mObject m_json_object;
|
|
|
bf4b7ae |
|
|
|
bf4b7ae |
- boost::asio::io_context::strand m_strand;
|
|
|
bf4b7ae |
+ boost::asio::strand<boost::asio::io_context::executor_type> m_strand;
|
|
|
bf4b7ae |
#ifdef BOOST_ASIO_HAS_POSIX_STREAM_DESCRIPTOR
|
|
|
bf4b7ae |
std::optional<boost::asio::posix::stream_descriptor> m_stream_descriptor;
|
|
|
bf4b7ae |
|
|
|
bf4b7ae |
--- ceph-16.1.0/src/librbd/migration/HttpClient.cc.orig 2021-01-27 10:00:04.167295789 -0500
|
|
|
bf4b7ae |
+++ ceph-16.1.0/src/librbd/migration/HttpClient.cc 2021-01-27 10:00:34.303118596 -0500
|
|
|
bf4b7ae |
@@ -764,7 +764,8 @@
|
|
|
bf4b7ae |
template <typename I>
|
|
|
bf4b7ae |
HttpClient::HttpClient(I* image_ctx, const std::string& url)
|
|
|
bf4b7ae |
: m_cct(image_ctx->cct), m_image_ctx(image_ctx),
|
|
|
bf4b7ae |
- m_asio_engine(image_ctx->asio_engine), m_url(url), m_strand(*m_asio_engine),
|
|
|
bf4b7ae |
+ m_asio_engine(image_ctx->asio_engine), m_url(url),
|
|
|
bf4b7ae |
+ m_strand(boost::asio::make_strand(*m_asio_engine)),
|
|
|
bf4b7ae |
m_ssl_context(boost::asio::ssl::context::sslv23_client) {
|
|
|
bf4b7ae |
m_ssl_context.set_default_verify_paths();
|
|
|
bf4b7ae |
}
|
|
|
bf4b7ae |
--- ceph-16.1.0/src/librbd/migration/HttpClient.h.orig 2021-01-27 10:00:49.626536973 -0500
|
|
|
bf4b7ae |
+++ ceph-16.1.0/src/librbd/migration/HttpClient.h 2021-01-27 10:01:38.728877629 -0500
|
|
|
bf4b7ae |
@@ -9,7 +9,8 @@
|
|
|
bf4b7ae |
#include "librbd/io/Types.h"
|
|
|
bf4b7ae |
#include "librbd/migration/HttpProcessorInterface.h"
|
|
|
bf4b7ae |
#include "librbd/migration/Types.h"
|
|
|
bf4b7ae |
-#include <boost/asio/io_context_strand.hpp>
|
|
|
bf4b7ae |
+#include <boost/asio/io_context.hpp>
|
|
|
bf4b7ae |
+#include <boost/asio/strand.hpp>
|
|
|
bf4b7ae |
#include <boost/asio/ip/tcp.hpp>
|
|
|
bf4b7ae |
#include <boost/asio/ssl/context.hpp>
|
|
|
bf4b7ae |
#include <boost/beast/version.hpp>
|
|
|
bf4b7ae |
@@ -171,7 +172,7 @@
|
|
|
bf4b7ae |
|
|
|
bf4b7ae |
HttpProcessorInterface* m_http_processor = nullptr;
|
|
|
bf4b7ae |
|
|
|
bf4b7ae |
- boost::asio::io_context::strand m_strand;
|
|
|
bf4b7ae |
+ boost::asio::strand<boost::asio::io_context::executor_type> m_strand;
|
|
|
bf4b7ae |
|
|
|
bf4b7ae |
boost::asio::ssl::context m_ssl_context;
|
|
|
bf4b7ae |
std::unique_ptr<HttpSessionInterface> m_http_session;
|