]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
Merge pull request #45526 from xxhdx1985126/wip-coordinate-segment-seq
authorSamuel Just <sjust@redhat.com>
Wed, 30 Mar 2022 03:53:30 +0000 (20:53 -0700)
committerGitHub <noreply@github.com>
Wed, 30 Mar 2022 03:53:30 +0000 (20:53 -0700)
crimson/os/seastore: coordinate segment seq of journal and ool segments

Reviewed-by: Yingxin Cheng <yingxin.cheng@intel.com>
Reviewed-by: Samuel Just <sjust@redhat.com>
1  2 
src/crimson/os/seastore/journal/segment_allocator.cc

index 1d805ce2678e6dbaa7d8b9e77d2e95e95e3446f9,0533121aa9af6ffa0d2667c5b97bc9097712e113..a3684d91c82537ba8aaa9e439296d28a12b27775
@@@ -16,14 -16,18 +16,16 @@@ SegmentAllocator::SegmentAllocator
    std::string name,
    segment_type_t type,
    SegmentProvider &sp,
-   SegmentManager &sm)
+   SegmentManager &sm,
+   SegmentSeqAllocator &ssa)
    : name{name},
 +    print_name{fmt::format("D?_{}", name)},
      type{type},
      segment_provider{sp},
-     segment_manager{sm}
+     segment_manager{sm},
+     segment_seq_allocator(ssa)
  {
    ceph_assert(type != segment_type_t::NULL_SEG);
 -  std::ostringstream oss;
 -  oss << "D?_" << name;
 -  print_name = oss.str();
    reset();
  }