Skip to content

Commit

Permalink
librbd/cache/pwl: cancel advance dispatch of external flush request
Browse files Browse the repository at this point in the history
For external flush request, it new syncpoint after passing
guardedrequest and before dispatch. Then dispatch bypass deferred
queue But the last write request may still in the deferred queue.
It don't dispatch and not associated with any syncpoint. The
external flush request will bypass the previous write request in
deferred queue now. This does not conform to the semantics of
external flush requests. External flush request should strictly
follow the order of dispath.

But for internal flush request, it will be dispatched after all
write request which associated with previous syncpoint, persisted
in cache. C_gather guarantee it.

It is necessary to distinguish between external and internal
flush requests. Internal flush can and should be dispatched in
advance bypass deferred queue. At the same time, the order of
external requests needs to be kept unchanged. So cancel advance
dispatch of external flush request.

Fixes: https://tracker.ceph.com/issues/52599

Signed-off-by: Yin Congmin <[email protected]>
  • Loading branch information
CongMinYin committed Oct 28, 2021
1 parent 2bce57f commit 9951868
Showing 1 changed file with 3 additions and 2 deletions.
5 changes: 3 additions & 2 deletions src/librbd/cache/pwl/AbstractWriteLog.cc
Original file line number Diff line number Diff line change
Expand Up @@ -1440,8 +1440,9 @@ void AbstractWriteLog<I>::alloc_and_dispatch_io_req(C_BlockIORequestT *req)
std::lock_guard locker(m_lock);
dispatch_here = m_deferred_ios.empty();
// Only flush req's total_bytes is the max uint64
if ((req->image_extents_summary.total_bytes ==
std::numeric_limits<uint64_t>::max())) {
if (req->image_extents_summary.total_bytes ==
std::numeric_limits<uint64_t>::max() &&
static_cast<C_FlushRequestT *>(req)->internal == true) {
dispatch_here = true;
}
}
Expand Down

0 comments on commit 9951868

Please sign in to comment.