From: Adam C. Emerson <aemerson@redhat.com>
Date: Fri, 22 May 2020 17:15:01 +0000 (-0400)
Subject: Merge pull request #32601 from adamemerson/wip-objection-triumphant
X-Git-Tag: v17.0.0~2298
X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=f717065cc8674d67c71a149e4903c2a4740dc624;p=ceph.git

Merge pull request #32601 from adamemerson/wip-objection-triumphant

Asynchronous work on objecter and asynchronous RADOS library.

Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
---

f717065cc8674d67c71a149e4903c2a4740dc624
diff --cc src/common/ceph_timer.h
index 9444474203499,ae895db745bb5..2be077834b17e
--- a/src/common/ceph_timer.h
+++ b/src/common/ceph_timer.h
@@@ -25,8 -25,9 +25,10 @@@
  #include <boost/intrusive/set.hpp>
  
  #include "include/function2.hpp"
 +#include "include/compat.h"
  
+ #include "common/detail/construct_suspended.h"
+ 
  namespace bi = boost::intrusive;
  namespace ceph {
  
diff --cc src/test/common/CMakeLists.txt
index 67486298f4804,93a01347838a7..25eb51285b1ba
--- a/src/test/common/CMakeLists.txt
+++ b/src/test/common/CMakeLists.txt
@@@ -335,4 -335,9 +335,8 @@@ target_link_libraries(unittest_rabin_ch
  add_ceph_unittest(unittest_rabin_chunk)
  
  add_executable(unittest_ceph_timer test_ceph_timer.cc)
 -target_link_libraries(unittest_rabin_chunk GTest::GTest)
  add_ceph_unittest(unittest_ceph_timer)
+ 
+ add_executable(unittest_blocked_completion test_blocked_completion.cc)
+ add_ceph_unittest(unittest_blocked_completion)
+ target_link_libraries(unittest_blocked_completion Boost::system GTest::GTest)