RepoMirrors/ceph
1
0
Fork 0
mirror of https://github.com/ceph/ceph synced 2025-02-22 18:47:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

ReplicatedPG::release_op_ctx_locks: requeue in scrub queue if blocked

Browse Source 
Otherwise we can reorder an op around another op which got blocked by a
scrub which started after the first blocked on an obc.

Fixes: #11691
Signed-off-by: Samuel Just <sjust@redhat.com>
This commit is contained in:
Samuel Just 2015-05-20 16:10:02 -07:00
parent 5c2b795724
commit be873eb8da
1 changed files with 14 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/osd/ReplicatedPG.h
View File

@ -866,7 +866,20 @@ protected:
requeue_snaptrimmer_clone ||
requeue_snaptrimmer_snapset)
queue_snap_trim();
requeue_ops(to_req);
if (!to_req.empty()) {
assert(ctx->obc);
// requeue at front of scrub blocking queue if we are blocked by scrub
if (scrubber.write_blocked_by_scrub(ctx->obc->obs.oi.soid.get_head())) {
waiting_for_active.splice(
waiting_for_active.begin(),
to_req,
to_req.begin(),
to_req.end());
} else {
requeue_ops(to_req);
}
}
}
// replica ops