From: Samuel Just <sjust@redhat.com>
Date: Wed, 30 Mar 2022 03:53:30 +0000 (-0700)
Subject: Merge pull request #45526 from xxhdx1985126/wip-coordinate-segment-seq
X-Git-Tag: v18.0.0~1165
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=32ee47a864efbf956a2d24a05e7c1dbd96db1854;p=ceph.git

Merge pull request #45526 from xxhdx1985126/wip-coordinate-segment-seq

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>
---

32ee47a864efbf956a2d24a05e7c1dbd96db1854
diff --cc src/crimson/os/seastore/journal/segment_allocator.cc
index 1d805ce2678,0533121aa9a..a3684d91c82
--- a/src/crimson/os/seastore/journal/segment_allocator.cc
+++ b/src/crimson/os/seastore/journal/segment_allocator.cc
@@@ -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();
  }