From fd598a0d23d61c645633ae774c3404a43d035e3c Mon Sep 17 00:00:00 2001 From: David Zafman Date: Tue, 18 Jul 2017 15:08:14 -0700 Subject: [PATCH] osd: scrub_to specifies clone ver, but transaction include head write ver Fixes: http://tracker.ceph.com/issues/20041 Signed-off-by: David Zafman --- src/osd/PrimaryLogPG.cc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/osd/PrimaryLogPG.cc b/src/osd/PrimaryLogPG.cc index 33ef908f6920..1a6ad2225c50 100644 --- a/src/osd/PrimaryLogPG.cc +++ b/src/osd/PrimaryLogPG.cc @@ -8980,7 +8980,7 @@ void PrimaryLogPG::op_applied(const eversion_t &applied_version) last_update_applied = applied_version; if (is_primary()) { if (scrubber.active) { - if (last_update_applied == scrubber.subset_last_update) { + if (last_update_applied >= scrubber.subset_last_update) { if (ops_blocked_by_scrub()) { requeue_scrub(true); } else { @@ -8993,7 +8993,7 @@ void PrimaryLogPG::op_applied(const eversion_t &applied_version) } } else { if (scrubber.active_rep_scrub) { - if (last_update_applied == static_cast( + if (last_update_applied >= static_cast( scrubber.active_rep_scrub->get_req())->scrub_to) { osd->enqueue_back( info.pgid, -- 2.47.3