]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
Merge pull request #32601 from adamemerson/wip-objection-triumphant
authorAdam C. Emerson <aemerson@redhat.com>
Fri, 22 May 2020 17:15:01 +0000 (13:15 -0400)
committerGitHub <noreply@github.com>
Fri, 22 May 2020 17:15:01 +0000 (13:15 -0400)
Asynchronous work on objecter and asynchronous RADOS library.

Reviewed-by: Patrick Donnelly <pdonnell@redhat.com>
12 files changed:
1  2 
src/client/Client.cc
src/client/Client.h
src/cls/rgw/cls_rgw_types.h
src/common/ceph_timer.h
src/common/options.cc
src/crimson/osd/pg.h
src/libcephfs.cc
src/librbd/Journal.cc
src/mds/CInode.cc
src/mds/Server.cc
src/osdc/Filer.cc
src/test/common/CMakeLists.txt

Simple merge
Simple merge
Simple merge
index 94444742034997028c80f0b33a96ae2db47b88fb,ae895db745bb56df99539bd1c2373d48ce4ed785..2be077834b17e45129b0eb6f544d03672fd7ae98
  #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 {
  
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
index 67486298f4804df7b0ab74d32ff45ed13478b4a4,93a01347838a7663629e7b10c97d63c1a2159c5f..25eb51285b1baeefd3854fc3068cedb486703436
@@@ -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)