From 5a563d63e754d5163424486dbd0d665165615794 Mon Sep 17 00:00:00 2001 From: Xuehan Xu Date: Fri, 14 Jul 2023 11:56:12 +0800 Subject: [PATCH 1/2] crimson/os/seastore/cache: correct log prefix for get_absent_extent() Signed-off-by: Xuehan Xu --- src/crimson/os/seastore/cache.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/crimson/os/seastore/cache.h b/src/crimson/os/seastore/cache.h index 3185c49012f..2981330a178 100644 --- a/src/crimson/os/seastore/cache.h +++ b/src/crimson/os/seastore/cache.h @@ -505,7 +505,7 @@ public: extent_len_t length, Func &&extent_init_func) { CachedExtentRef ret; - LOG_PREFIX(Cache::get_extent); + LOG_PREFIX(Cache::get_absent_extent); #ifndef NDEBUG auto r = t.get_extent(offset, &ret); From c1fdb2a8a41c6f0f204c980c4f3af7cfac28723d Mon Sep 17 00:00:00 2001 From: Xuehan Xu Date: Fri, 14 Jul 2023 11:59:06 +0800 Subject: [PATCH 2/2] crimson/os/seastore/object_data_handler: add ObjectDataHandler(extent_len_t) Signed-off-by: Xuehan Xu --- src/crimson/os/seastore/object_data_handler.h | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/crimson/os/seastore/object_data_handler.h b/src/crimson/os/seastore/object_data_handler.h index 6fd73dc762a..ca648f12c2e 100644 --- a/src/crimson/os/seastore/object_data_handler.h +++ b/src/crimson/os/seastore/object_data_handler.h @@ -19,10 +19,12 @@ namespace crimson::os::seastore { struct ObjectDataBlock : crimson::os::seastore::LogicalCachedExtent { using Ref = TCachedExtentRef; - ObjectDataBlock(ceph::bufferptr &&ptr) + explicit ObjectDataBlock(ceph::bufferptr &&ptr) : LogicalCachedExtent(std::move(ptr)) {} - ObjectDataBlock(const ObjectDataBlock &other) + explicit ObjectDataBlock(const ObjectDataBlock &other) : LogicalCachedExtent(other) {} + explicit ObjectDataBlock(extent_len_t length) + : LogicalCachedExtent(length) {} CachedExtentRef duplicate_for_write(Transaction&) final { return CachedExtentRef(new ObjectDataBlock(*this));