]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
Merge pull request #43181 from xxhdx1985126/wip-extent-placement-manager-multi-device-3
authorSamuel Just <sjust@redhat.com>
Tue, 12 Oct 2021 05:17:52 +0000 (22:17 -0700)
committerGitHub <noreply@github.com>
Tue, 12 Oct 2021 05:17:52 +0000 (22:17 -0700)
crimson/os/seastore: add multi-device support

Reviewed-by: Samuel Just <sjust@redhat.com>
1  2 
src/crimson/os/seastore/cache.cc
src/crimson/os/seastore/cache.h
src/crimson/os/seastore/extent_placement_manager.cc
src/crimson/os/seastore/extent_placement_manager.h
src/crimson/os/seastore/seastore_types.cc
src/crimson/os/seastore/seastore_types.h

index 129e7e183aa57e84bd4e28d5236ccaf9b3f3c882,20a8c2c168228647e6d3f24ed30c09310df6b278..f67614d6f41e27ff981c8739120bf7c9d159b9b2
@@@ -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;
Simple merge