Skip to content

Commit 415059c

Browse files
xxhdx1985126xxhdx1985126
committed
crimson/os/seastore/cache: get_absent_extent doesn't need to query cache
anymore Signed-off-by: Xuehan Xu <[email protected]>
1 parent 15cb6c7 commit 415059c

File tree

2 files changed

+161
-64
lines changed

2 files changed

+161
-64
lines changed

‎src/crimson/os/seastore/cache.cc‎

Lines changed: 112 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2264,6 +2264,118 @@ Cache::get_root_ret Cache::get_root(Transaction &t)
22642264
}
22652265
}
22662266

2267+
Cache::get_extent_by_type_ret
2268+
Cache::_get_absent_extent_by_type(
2269+
Transaction &t,
2270+
extent_types_t type,
2271+
paddr_t offset,
2272+
laddr_t laddr,
2273+
extent_len_t length,
2274+
extent_init_func_t &&extent_init_func)
2275+
{
2276+
LOG_PREFIX(Cache::_get_absent_extent_by_type);
2277+
2278+
#ifndef NDEBUG
2279+
{
2280+
CachedExtentRef ret;
2281+
auto r = t.get_extent(offset, &ret);
2282+
if (r != Transaction::get_extent_ret::ABSENT) {
2283+
SUBERRORT(seastore_cache, "unexpected non-absent extent {}", t, *ret);
2284+
ceph_abort();
2285+
}
2286+
assert(!query_cache(offset));
2287+
}
2288+
#endif
2289+
2290+
const auto t_src = t.get_src();
2291+
2292+
// partial read
2293+
CachedExtentRef ret;
2294+
switch (type) {
2295+
case extent_types_t::ROOT:
2296+
ceph_assert(0 == "ROOT is never directly read");
2297+
break;
2298+
case extent_types_t::BACKREF_INTERNAL:
2299+
ret = CachedExtent::make_cached_extent_ref<
2300+
backref::BackrefInternalNode>(length);
2301+
break;
2302+
case extent_types_t::BACKREF_LEAF:
2303+
ret = CachedExtent::make_cached_extent_ref<
2304+
backref::BackrefLeafNode>(length);
2305+
break;
2306+
case extent_types_t::LADDR_INTERNAL:
2307+
ret = CachedExtent::make_cached_extent_ref<
2308+
lba::LBAInternalNode>(length);
2309+
break;
2310+
case extent_types_t::LADDR_LEAF:
2311+
ret = CachedExtent::make_cached_extent_ref<
2312+
lba::LBALeafNode>(length);
2313+
break;
2314+
case extent_types_t::ROOT_META:
2315+
ret = CachedExtent::make_cached_extent_ref<
2316+
RootMetaBlock>(length);
2317+
break;
2318+
case extent_types_t::OMAP_INNER:
2319+
ret = CachedExtent::make_cached_extent_ref<
2320+
omap_manager::OMapInnerNode>(length);
2321+
break;
2322+
case extent_types_t::OMAP_LEAF:
2323+
ret = CachedExtent::make_cached_extent_ref<
2324+
omap_manager::OMapLeafNode>(length);
2325+
break;
2326+
case extent_types_t::COLL_BLOCK:
2327+
ret = CachedExtent::make_cached_extent_ref<
2328+
collection_manager::CollectionNode>(length);
2329+
break;
2330+
case extent_types_t::ONODE_BLOCK_STAGED:
2331+
ret = CachedExtent::make_cached_extent_ref<
2332+
onode::SeastoreNodeExtent>(length);
2333+
break;
2334+
case extent_types_t::OBJECT_DATA_BLOCK:
2335+
ret = CachedExtent::make_cached_extent_ref<ObjectDataBlock>(length);
2336+
break;
2337+
case extent_types_t::RETIRED_PLACEHOLDER:
2338+
ceph_assert(0 == "impossible");
2339+
break;
2340+
case extent_types_t::TEST_BLOCK:
2341+
ret = CachedExtent::make_cached_extent_ref<TestBlock>(length);
2342+
break;
2343+
case extent_types_t::TEST_BLOCK_PHYSICAL:
2344+
ret = CachedExtent::make_cached_extent_ref<TestBlockPhysical>(length);
2345+
break;
2346+
case extent_types_t::NONE:
2347+
ceph_assert(0 == "NONE is an invalid extent type");
2348+
break;
2349+
default:
2350+
ceph_assert(0 == "impossible");
2351+
}
2352+
ret->init(CachedExtent::extent_state_t::CLEAN,
2353+
offset,
2354+
PLACEMENT_HINT_NULL,
2355+
NULL_GENERATION,
2356+
TRANS_ID_NULL);
2357+
DEBUGT("{} length=0x{:x} is absent, add extent ... -- {}",
2358+
t, type, length, *ret);
2359+
add_extent(ret);
2360+
extent_init_func(*ret);
2361+
cache_access_stats_t& access_stats = get_by_ext(
2362+
get_by_src(stats.access_by_src_ext, t_src),
2363+
type);
2364+
++access_stats.load_absent;
2365+
++stats.access.load_absent;
2366+
t.add_to_read_set(CachedExtentRef(ret));
2367+
touch_extent_fully(*ret, &t_src, t.get_cache_hint());
2368+
return trans_intr::make_interruptible(
2369+
read_extent(std::move(ret), 0, length, &t_src
2370+
).safe_then([laddr](auto extent) {
2371+
if (extent->is_logical()) {
2372+
extent->template cast<LogicalCachedExtent>()->set_laddr(laddr);
2373+
}
2374+
return extent;
2375+
})
2376+
);
2377+
}
2378+
22672379
Cache::get_extent_ertr::future<CachedExtentRef>
22682380
Cache::do_get_caching_extent_by_type(
22692381
extent_types_t type,

‎src/crimson/os/seastore/cache.h‎

Lines changed: 49 additions & 64 deletions
Original file line numberDiff line numberDiff line change
@@ -396,40 +396,46 @@ class Cache : public ExtentTransViewRetriever,
396396
extent_len_t partial_off,
397397
extent_len_t partial_len,
398398
Func &&extent_init_func) {
399-
CachedExtentRef ret;
400399
LOG_PREFIX(Cache::get_absent_extent);
401400

402401
#ifndef NDEBUG
403-
auto r = t.get_extent(offset, &ret);
404-
if (r != Transaction::get_extent_ret::ABSENT) {
405-
SUBERRORT(seastore_cache, "unexpected non-absent extent {}", t, *ret);
406-
ceph_abort();
402+
{
403+
CachedExtentRef ret;
404+
auto r = t.get_extent(offset, &ret);
405+
if (r != Transaction::get_extent_ret::ABSENT) {
406+
SUBERRORT(seastore_cache, "unexpected non-absent extent {}", t, *ret);
407+
ceph_abort();
408+
}
407409
}
408410
#endif
409411

410412
SUBTRACET(seastore_cache, "{} {}~0x{:x} is absent on t, query cache ...",
411413
t, T::TYPE, offset, length);
412414
const auto t_src = t.get_src();
413-
auto f = [&t, this, partial_off, partial_len, t_src](CachedExtent &ext) {
414-
// XXX: is_stable_dirty() may not be linked in lba tree
415-
assert(ext.is_stable());
416-
assert(T::TYPE == ext.get_type());
417-
cache_access_stats_t& access_stats = get_by_ext(
418-
get_by_src(stats.access_by_src_ext, t_src),
419-
T::TYPE);
420-
++access_stats.load_absent;
421-
++stats.access.load_absent;
422-
423-
t.add_to_read_set(CachedExtentRef(&ext));
424-
touch_extent_by_range(
425-
ext, &t_src, t.get_cache_hint(),
426-
partial_off, partial_len);
427-
};
415+
416+
// partial read
417+
TCachedExtentRef<T> ret = CachedExtent::make_cached_extent_ref<T>(length);
418+
ret->init(CachedExtent::extent_state_t::CLEAN,
419+
offset,
420+
PLACEMENT_HINT_NULL,
421+
NULL_GENERATION,
422+
TRANS_ID_NULL);
423+
SUBDEBUG(seastore_cache,
424+
"{} {}~0x{:x} is absent, add extent and reading range 0x{:x}~0x{:x} ... -- {}",
425+
T::TYPE, offset, length, partial_off, partial_len, *ret);
426+
add_extent(ret);
427+
extent_init_func(*ret);
428+
cache_access_stats_t& access_stats = get_by_ext(
429+
get_by_src(stats.access_by_src_ext, t_src),
430+
T::TYPE);
431+
++access_stats.load_absent;
432+
++stats.access.load_absent;
433+
t.add_to_read_set(CachedExtentRef(ret));
434+
touch_extent_by_range(
435+
*ret, &t_src, t.get_cache_hint(),
436+
partial_off, partial_len);
428437
return trans_intr::make_interruptible(
429-
do_get_caching_extent<T>(
430-
offset, length, partial_off, partial_len,
431-
std::forward<Func>(extent_init_func), std::move(f), &t_src)
432-
);
438+
read_extent<T>(std::move(ret), partial_off, partial_len, &t_src));
433439
}
434440

435441
/*
@@ -960,40 +966,7 @@ class Cache : public ExtentTransViewRetriever,
960966
paddr_t offset,
961967
laddr_t laddr,
962968
extent_len_t length,
963-
extent_init_func_t &&extent_init_func
964-
) {
965-
LOG_PREFIX(Cache::_get_absent_extent_by_type);
966-
967-
#ifndef NDEBUG
968-
CachedExtentRef ret;
969-
auto r = t.get_extent(offset, &ret);
970-
if (r != Transaction::get_extent_ret::ABSENT) {
971-
SUBERRORT(seastore_cache, "unexpected non-absent extent {}", t, *ret);
972-
ceph_abort();
973-
}
974-
#endif
975-
976-
SUBTRACET(seastore_cache, "{} {}~0x{:x} {} is absent on t, query cache ...",
977-
t, type, offset, length, laddr);
978-
const auto t_src = t.get_src();
979-
auto f = [&t, this, t_src](CachedExtent &ext) {
980-
// XXX: is_stable_dirty() may not be linked in lba tree
981-
assert(ext.is_stable());
982-
cache_access_stats_t& access_stats = get_by_ext(
983-
get_by_src(stats.access_by_src_ext, t_src),
984-
ext.get_type());
985-
++access_stats.load_absent;
986-
++stats.access.load_absent;
987-
988-
t.add_to_read_set(CachedExtentRef(&ext));
989-
touch_extent_fully(ext, &t_src, t.get_cache_hint());
990-
};
991-
return trans_intr::make_interruptible(
992-
do_get_caching_extent_by_type(
993-
type, offset, laddr, length,
994-
std::move(extent_init_func), std::move(f), &t_src)
995-
);
996-
}
969+
extent_init_func_t &&extent_init_func);
997970

998971
backref_entryrefs_by_seq_t backref_entryrefs_by_seq;
999972
backref_entry_mset_t backref_entry_mset;
@@ -1878,13 +1851,12 @@ class Cache : public ExtentTransViewRetriever,
18781851
/// also see do_read_extent_maybe_partial().
18791852
///
18801853
/// May return an invalid extent due to transaction conflict.
1881-
template <typename T>
1882-
read_extent_ret<T> read_extent(
1883-
TCachedExtentRef<T>&& extent,
1854+
get_extent_ertr::future<CachedExtentRef> _read_extent(
1855+
CachedExtentRef &&extent,
18841856
extent_len_t offset,
18851857
extent_len_t length,
1886-
const Transaction::src_t* p_src
1887-
) {
1858+
const Transaction::src_t *p_src)
1859+
{
18881860
LOG_PREFIX(Cache::read_extent);
18891861
assert(extent->state == CachedExtent::extent_state_t::EXIST_CLEAN ||
18901862
extent->state == CachedExtent::extent_state_t::CLEAN);
@@ -1938,7 +1910,7 @@ class Cache : public ExtentTransViewRetriever,
19381910
offset, length, *extent);
19391911
}
19401912
extent->complete_io();
1941-
return get_extent_ertr::make_ready_future<TCachedExtentRef<T>>(
1913+
return get_extent_ertr::make_ready_future<CachedExtentRef>(
19421914
std::move(extent));
19431915
},
19441916
get_extent_ertr::pass_further{},
@@ -1948,6 +1920,19 @@ class Cache : public ExtentTransViewRetriever,
19481920
);
19491921
}
19501922

1923+
template <typename T>
1924+
read_extent_ret<T> read_extent(
1925+
TCachedExtentRef<T>&& extent,
1926+
extent_len_t offset,
1927+
extent_len_t length,
1928+
const Transaction::src_t* p_src
1929+
) {
1930+
return _read_extent(std::move(extent), offset, length, p_src
1931+
).safe_then([](auto extent) {
1932+
return extent->template cast<T>();
1933+
});
1934+
}
1935+
19511936
// Extents in cache may contain placeholders
19521937
CachedExtentRef query_cache(paddr_t offset) {
19531938
if (auto iter = extents_index.find_offset(offset);

0 commit comments

Comments
 (0)