RepoMirrors/ceph
1
0
Fork 0
mirror of https://github.com/ceph/ceph synced 2025-01-19 09:32:00 +00:00
Code Issues Packages Projects Releases Wiki Activity

crimson/os/seastore/cache: mark conflict in get_extent

Browse Source 
After wait_io, the extent may have been mutated again, so it may be
invalid.  Check in the caller and mark the transaction conflicted as
needed.

Signed-off-by: Samuel Just <sjust@redhat.com>
This commit is contained in:
Samuel Just 2021-06-24 15:24:09 -07:00
parent add641a286
commit 2bc257beb2
1 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/crimson/os/seastore/cache.h
View File

@ -181,7 +181,7 @@ public:
auto ret = TCachedExtentRef<T>(static_cast<T*>(&*iter));
return ret->wait_io(
).then([ret=std::move(ret)]() mutable -> get_extent_ret<T> {
assert(ret->is_valid());
// ret may be invalid, caller must check
return get_extent_ret<T>(
get_extent_ertr::ready_future_marker{},
std::move(ret));
@ -267,9 +267,14 @@ public:
get_extent<T>(offset, length)
).si_then(
[&t](auto ref) mutable {
t.add_to_read_set(ref);
return get_extent_iertr::make_ready_future<TCachedExtentRef<T>>(
std::move(ref));
if (!ref->is_valid()) {
t.conflicted = true;
return get_extent_iertr::make_ready_future<TCachedExtentRef<T>>();
} else {
t.add_to_read_set(ref);
return get_extent_iertr::make_ready_future<TCachedExtentRef<T>>(
std::move(ref));
}
});
}
}