From: David Zafman <dzafman@redhat.com>
Date: Tue, 18 Jul 2017 22:08:14 +0000 (-0700)
Subject: osd: scrub_to specifies clone ver, but transaction include head write ver
X-Git-Tag: v12.1.2~102^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=fd598a0d23d61c645633ae774c3404a43d035e3c;p=ceph.git

osd: scrub_to specifies clone ver, but transaction include head write ver

Fixes: http://tracker.ceph.com/issues/20041

Signed-off-by: David Zafman <dzafman@redhat.com>
---

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<const MOSDRepScrub*>(
+      if (last_update_applied >= static_cast<const MOSDRepScrub*>(
 	    scrubber.active_rep_scrub->get_req())->scrub_to) {
 	osd->enqueue_back(
 	  info.pgid,