From: Samuel Just Date: Tue, 12 Oct 2021 05:17:52 +0000 (-0700) Subject: Merge pull request #43181 from xxhdx1985126/wip-extent-placement-manager-multi-device-3 X-Git-Tag: v17.1.0~712 X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=c349666838899746bd65ac11631ff12bf1b34d7a;p=ceph.git Merge pull request #43181 from xxhdx1985126/wip-extent-placement-manager-multi-device-3 crimson/os/seastore: add multi-device support Reviewed-by: Samuel Just --- c349666838899746bd65ac11631ff12bf1b34d7a diff --cc src/crimson/os/seastore/cache.cc index 129e7e183aa5,20a8c2c16822..f67614d6f41e --- a/src/crimson/os/seastore/cache.cc +++ b/src/crimson/os/seastore/cache.cc @@@ -991,15 -943,9 +994,15 @@@ record_t Cache::prepare_record(Transact auto& ool_stats = t.get_ool_write_stats(); ceph_assert(ool_stats.extents.num == t.ool_block_list.size()); efforts.num_ool_records += ool_stats.num_records; - efforts.ool_record_overhead_bytes += ool_stats.overhead_bytes; + efforts.ool_record_overhead_bytes += ool_stats.header_bytes; + + auto& record_header_fullness = get_by_src( + stats.record_header_fullness_by_src, t.get_src()); + record_header_fullness.ool_stats.filled_bytes += ool_stats.header_raw_bytes; + record_header_fullness.ool_stats.total_bytes += ool_stats.header_bytes; + auto record_size = get_encoded_record_length( - record, segment_manager.get_block_size()); + record, block_size); auto inline_overhead = record_size.mdlength + record_size.dlength - record.get_raw_data_size(); efforts.inline_record_overhead_bytes += inline_overhead;