RepoMirrors/ceph
1
0
Fork 0
mirror of https://github.com/ceph/ceph synced 2025-02-23 02:57:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #52221 from xxhdx1985126/wip-collection-bug-fix

Browse Source 
crimson/os/seastore/collection_manager: fill CollectionNode::decoded on clean reads

Reviewed-by: Samuel Just <sjust@redhat.com>
Reviewed-by: Yingxin Cheng <yingxin.cheng@intel.com>
This commit is contained in:
Yingxin 2023-07-24 09:56:37 +08:00 committed by GitHub
commit 8c4d93c2d7
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 10 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/crimson/os/seastore/collection_manager/collection_flat_node.cc
View File

@ -46,7 +46,6 @@ std::ostream &CollectionNode::print_detail_l(std::ostream &out) const
CollectionNode::list_ret
CollectionNode::list()
{
read_to_local();
logger().debug("CollectionNode:{}, {}", __func__, *this);
CollectionManager::list_ret_bare list_result;
for (auto &[coll, bits] : decoded) {
@ -60,7 +59,6 @@ CollectionNode::list()
CollectionNode::create_ret
CollectionNode::create(coll_context_t cc, coll_t coll, unsigned bits)
{
read_to_local();
logger().debug("CollectionNode:{}", __func__);
if (!is_mutable()) {
auto mut = cc.tm.get_mutable_extent(cc.t, this)->cast<CollectionNode>();
@ -88,8 +86,8 @@ CollectionNode::create(coll_context_t cc, coll_t coll, unsigned bits)
CollectionNode::update_ret
CollectionNode::update(coll_context_t cc, coll_t coll, unsigned bits)
{
read_to_local();
logger().debug("CollectionNode:{}", __func__);
logger().debug("trans.{} CollectionNode:{} {} {}",
cc.t.get_trans_id(), __func__, coll, bits);
if (!is_mutable()) {
auto mut = cc.tm.get_mutable_extent(cc.t, this)->cast<CollectionNode>();
return mut->update(cc, coll, bits);
@ -105,8 +103,8 @@ CollectionNode::update(coll_context_t cc, coll_t coll, unsigned bits)
CollectionNode::remove_ret
CollectionNode::remove(coll_context_t cc, coll_t coll)
{
read_to_local();
logger().debug("CollectionNode:{}", __func__);
logger().debug("trans.{} CollectionNode:{} {}",
cc.t.get_trans_id(),__func__, coll);
if (!is_mutable()) {
auto mut = cc.tm.get_mutable_extent(cc.t, this)->cast<CollectionNode>();
return mut->remove(cc, coll);

14
src/crimson/os/seastore/collection_manager/collection_flat_node.h
View File

@ -94,11 +94,11 @@ struct CollectionNode
: LogicalCachedExtent {
using CollectionNodeRef = TCachedExtentRef<CollectionNode>;
bool loaded = false;
template <typename... T>
CollectionNode(T&&... t)
: LogicalCachedExtent(std::forward<T>(t)...) {}
explicit CollectionNode(ceph::bufferptr &&ptr)
: LogicalCachedExtent(std::move(ptr)) {}
explicit CollectionNode(const CollectionNode &other)
: LogicalCachedExtent(other),
decoded(other.decoded) {}
static constexpr extent_types_t type = extent_types_t::COLL_BLOCK;
@ -134,13 +134,11 @@ struct CollectionNode
using update_ret = CollectionManager::update_ret;
update_ret update(coll_context_t cc, coll_t coll, unsigned bits);
void read_to_local() {
if (loaded) return;
void on_clean_read() final {
bufferlist bl;
bl.append(get_bptr());
auto iter = bl.cbegin();
decode((base_coll_map_t&)decoded, iter);
loaded = true;
}
void copy_to_node() {

1
src/crimson/os/seastore/collection_manager/flat_collection_manager.cc
View File

@ -80,7 +80,6 @@ FlatCollectionManager::create(coll_root_t &coll_root, Transaction &t,
coll_root.update(root_extent->get_laddr(), root_extent->get_length());
root_extent->decoded = extent->decoded;
root_extent->loaded = true;
return root_extent->create(
get_coll_context(t), cid, info.split_bits
).si_then([=, this, &t](auto result) {