diff options
author | Kefu Chai <kchai@redhat.com> | 2019-10-23 10:08:38 +0200 |
---|---|---|
committer | Kefu Chai <kchai@redhat.com> | 2019-10-24 06:37:30 +0200 |
commit | 4589fff6bff8dadd7347fccfc62ed4a49e2b101d (patch) | |
tree | 3643bcc9d3e29c60378980897cda62f58c3b2884 /src/crimson/osd/replicated_backend.cc | |
parent | crimson/osd/osd_operation.h: s/ceph_assert/assert/ (diff) | |
download | ceph-4589fff6bff8dadd7347fccfc62ed4a49e2b101d.tar.xz ceph-4589fff6bff8dadd7347fccfc62ed4a49e2b101d.zip |
crimson: s/ceph/crimson/ in namespace names
to help differentiate the symbols shared by classic and crimson osd,
after this change, all crimson code will live in "crimson::" namespaces.
and in a follow-up change, all classic code used by crimson will live in
"ceph::" namespaces.
Signed-off-by: Kefu Chai <kchai@redhat.com>
Diffstat (limited to 'src/crimson/osd/replicated_backend.cc')
-rw-r--r-- | src/crimson/osd/replicated_backend.cc | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/crimson/osd/replicated_backend.cc b/src/crimson/osd/replicated_backend.cc index 9cddf664e0c..a72d3f19462 100644 --- a/src/crimson/osd/replicated_backend.cc +++ b/src/crimson/osd/replicated_backend.cc @@ -9,14 +9,14 @@ namespace { seastar::logger& logger() { - return ceph::get_logger(ceph_subsys_osd); + return crimson::get_logger(ceph_subsys_osd); } } ReplicatedBackend::ReplicatedBackend(pg_t pgid, pg_shard_t whoami, ReplicatedBackend::CollectionRef coll, - ceph::osd::ShardServices& shard_services) + crimson::osd::ShardServices& shard_services) : PGBackend{whoami.shard, coll, &shard_services.get_store()}, pgid{pgid}, whoami{whoami}, @@ -31,7 +31,7 @@ seastar::future<bufferlist> ReplicatedBackend::_read(const hobject_t& hoid, return store->read(coll, ghobject_t{hoid}, off, len, flags); } -seastar::future<ceph::osd::acked_peers_t> +seastar::future<crimson::osd::acked_peers_t> ReplicatedBackend::_submit_transaction(std::set<pg_shard_t>&& pg_shards, const hobject_t& hoid, ceph::os::Transaction&& txn, @@ -70,7 +70,7 @@ ReplicatedBackend::_submit_transaction(std::set<pg_shard_t>&& pg_shards, pending_txn->second.all_committed = {}; auto acked_peers = std::move(pending_txn->second.acked_peers); pending_trans.erase(pending_txn); - return seastar::make_ready_future<ceph::osd::acked_peers_t>(std::move(acked_peers)); + return seastar::make_ready_future<crimson::osd::acked_peers_t>(std::move(acked_peers)); }); } |