RepoMirrors/ceph
1
0
Fork 0
mirror of https://github.com/ceph/ceph synced 2025-01-10 21:20:46 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #27730 from cbodley/wip-rgw-boost-170

Browse Source 
rgw: fix compile errors with boost 1.70

Reviewed-by: Adam C. Emerson <aemerson@redhat.com>
This commit is contained in:
Casey Bodley 2019-04-29 13:06:47 -04:00 committed by GitHub
commit f0a9719d2c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 18 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/rgw/rgw_asio_frontend.cc
View File

@ -81,7 +81,8 @@ class StreamIO : public rgw::asio::ClientIO {
using SharedMutex = ceph::async::SharedMutex<boost::asio::io_context::executor_type>;
template <typename Stream>
void handle_connection(RGWProcessEnv& env, Stream& stream,
void handle_connection(boost::asio::io_context& context,
RGWProcessEnv& env, Stream& stream,
boost::beast::flat_buffer& buffer, bool is_ssl,
SharedMutex& pause_mutex,
rgw::dmclock::Scheduler *scheduler,
@ -152,7 +153,7 @@ void handle_connection(RGWProcessEnv& env, Stream& stream,
rgw::io::add_conlen_controlling(
&real_client))));
RGWRestfulIO client(cct, &real_client_io);
auto y = optional_yield{socket.get_io_context(), yield};
auto y = optional_yield{context, yield};
process_request(env.store, env.rest, &req, env.uri_prefix,
*env.auth_registry, &client, env.olog, y, scheduler);
}
@ -560,7 +561,7 @@ void AsioFrontend::accept(Listener& l, boost::system::error_code ec)
return;
}
buffer.consume(bytes);
handle_connection(env, stream, buffer, true, pause_mutex,
handle_connection(context, env, stream, buffer, true, pause_mutex,
scheduler.get(), ec, yield);
if (!ec) {
// ssl shutdown (ignoring errors)
@ -578,7 +579,7 @@ void AsioFrontend::accept(Listener& l, boost::system::error_code ec)
auto c = connections.add(conn);
boost::beast::flat_buffer buffer;
boost::system::error_code ec;
handle_connection(env, s, buffer, false, pause_mutex,
handle_connection(context, env, s, buffer, false, pause_mutex,
scheduler.get(), ec, yield);
s.shutdown(tcp::socket::shutdown_both, ec);
});

5
src/rgw/rgw_dmclock_async_scheduler.h
View File

@ -82,7 +82,12 @@ class AsyncScheduler : public md_config_obs_t, public Scheduler {
using Completion = async::Completion<Signature, async::AsBase<Request>>;
using Clock = ceph::coarse_real_clock;
#if BOOST_VERSION < 107000
using Timer = boost::asio::basic_waitable_timer<Clock>;
#else
using Timer = boost::asio::basic_waitable_timer<Clock,
boost::asio::wait_traits<Clock>, executor_type>;
#endif
Timer timer; //< timer for the next scheduled request
CephContext *const cct;

9
src/rgw/rgw_reshard.h
View File

@ -183,7 +183,14 @@ class RGWReshardWait {
ceph::condition_variable cond;
struct Waiter : boost::intrusive::list_base_hook<> {
boost::asio::basic_waitable_timer<Clock> timer;
#if BOOST_VERSION < 107000
using Timer = boost::asio::basic_waitable_timer<Clock>;
#else
using Executor = boost::asio::io_context::executor_type;
using Timer = boost::asio::basic_waitable_timer<Clock,
boost::asio::wait_traits<Clock>, Executor>;
#endif
Timer timer;
explicit Waiter(boost::asio::io_context& ioc) : timer(ioc) {}
};
boost::intrusive::list<Waiter> waiters;