diff options
author | Adam C. Emerson <aemerson@redhat.com> | 2018-08-07 22:40:57 +0200 |
---|---|---|
committer | Adam C. Emerson <aemerson@redhat.com> | 2019-11-04 19:28:53 +0100 |
commit | 73f5249f3f14886831a9da5fb7731b0c227b8d69 (patch) | |
tree | 4d6e0ffc1443d447fe42f690183f24a146197921 /src/ceph_osd.cc | |
parent | buffer: base exceptions on system_error (diff) | |
download | ceph-73f5249f3f14886831a9da5fb7731b0c227b8d69.tar.xz ceph-73f5249f3f14886831a9da5fb7731b0c227b8d69.zip |
monc: Asifoact MonClient
Of course now everyone has to feed an io_context into the MonClient.
Signed-off-by: Adam C. Emerson <aemerson@redhat.com>
Diffstat (limited to 'src/ceph_osd.cc')
-rw-r--r-- | src/ceph_osd.cc | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/src/ceph_osd.cc b/src/ceph_osd.cc index 3e03e863239..18101dee122 100644 --- a/src/ceph_osd.cc +++ b/src/ceph_osd.cc @@ -664,7 +664,10 @@ flushjournal_out: srand(time(NULL) + getpid()); - MonClient mc(g_ceph_context); + ceph::async::io_context_pool poolctx( + cct->_conf.get_val<std::uint64_t>("osd_asio_thread_count")); + + MonClient mc(g_ceph_context, poolctx); if (mc.build_initial_monmap() < 0) return -1; global_init_chdir(g_ceph_context); @@ -685,7 +688,8 @@ flushjournal_out: ms_objecter, &mc, data_path, - journal_path); + journal_path, + poolctx); int err = osdptr->pre_init(); if (err < 0) { @@ -740,6 +744,7 @@ flushjournal_out: shutdown_async_signal_handler(); // done + poolctx.stop(); delete osdptr; delete ms_public; delete ms_hb_front_client; |