RepoMirrors/ceph
1
0
Fork 0
mirror of https://github.com/ceph/ceph synced 2025-03-11 02:39:05 +00:00
Code Issues Packages Projects Releases Wiki Activity

seastore/.../staged_fltree/node: check for conflict in Node::load

Browse Source 
This will be unnecessary once converted to interruptible_future.

Signed-off-by: Samuel Just <sjust@redhat.com>
This commit is contained in:
Samuel Just 2021-06-24 16:25:54 -07:00
parent 9a514cccaa
commit 6df608159e
1 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/crimson/os/seastore/onode_manager/staged-fltree/node.cc
View File

@ -684,7 +684,12 @@ eagain_future<Ref<Node>> Node::load(
c.t, addr, expect_is_level_tail);
ceph_abort("fatal error");
})
).safe_then([FNAME, c, addr, expect_is_level_tail](auto extent) {
).safe_then([FNAME, c, addr, expect_is_level_tail](auto extent)
-> eagain_future<Ref<Node>> {
if (c.t.is_conflicted()) {
return crimson::ct_error::eagain::make();
}
assert(extent->is_valid());
auto header = extent->get_header();
auto field_type = header.get_field_type();
if (!field_type) {
@ -709,7 +714,8 @@ eagain_future<Ref<Node>> Node::load(
ceph_abort("fatal error");
}
auto impl = LeafNodeImpl::load(extent, *field_type);
return Ref<Node>(new LeafNode(impl.get(), std::move(impl)));
return eagain_ertr::make_ready_future<Ref<Node>>(
new LeafNode(impl.get(), std::move(impl)));
} else if (node_type == node_type_t::INTERNAL) {
if (extent->get_length() != c.vb.get_internal_node_size()) {
ERRORT("load addr={:x}, is_level_tail={} error, "
@ -718,7 +724,8 @@ eagain_future<Ref<Node>> Node::load(
ceph_abort("fatal error");
}
auto impl = InternalNodeImpl::load(extent, *field_type);
return Ref<Node>(new InternalNode(impl.get(), std::move(impl)));
return eagain_ertr::make_ready_future<Ref<Node>>(
new InternalNode(impl.get(), std::move(impl)));
} else {
ceph_abort("impossible path");
}