]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
Merge pull request #20173 from liewegas/wip-os-ch
authorJosh Durgin <jdurgin@redhat.com>
Wed, 7 Feb 2018 22:04:08 +0000 (14:04 -0800)
committerGitHub <noreply@github.com>
Wed, 7 Feb 2018 22:04:08 +0000 (14:04 -0800)
os: unify Sequencer and CollectionHandle

Reviewed-by: Josh Durgin <jdurgin@redhat.com>
1  2 
src/os/bluestore/BlueStore.cc
src/osd/PG.cc
src/osd/PrimaryLogPG.cc
src/osd/ReplicatedBackend.cc
src/test/CMakeLists.txt
src/test/objectstore/store_test.cc

Simple merge
diff --cc src/osd/PG.cc
Simple merge
Simple merge
Simple merge
Simple merge
index 9db8a582ce96d923aaa5ebad27f34f487a381fd7,b4b35081c1a561bec113dd51757ee83c250bfbec..66a11b74c0f914bbaaf0b9569cadedded9a6201c
@@@ -5763,9 -5786,9 +5786,8 @@@ void doMany4KWritesTest(boost::scoped_p
                          unsigned max_ops,
                          unsigned max_object_size,
                          unsigned max_write_size,
 -                        unsigned write_alignment,
 -                        store_statfs_t* res_stat)
 +                        unsigned write_alignment)
  {
-   ObjectStore::Sequencer osr("test");
    MixedGenerator gen(555);
    gen_type rng(time(NULL));
    coll_t cid(spg_t(pg_t(0,555), shard_id_t::NO_SHARD));