From: Samuel Just <sam.just@inktank.com>
Date: Tue, 3 Jul 2012 18:23:16 +0000 (-0700)
Subject: ReplicatedPG: remove faulty scrub assert in sub_op_modify_applied
X-Git-Tag: v0.49~31^2~7
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=151bf0eef59acae2d1fcf3f0feb8b6aa963dc2f6;p=ceph.git

ReplicatedPG: remove faulty scrub assert in sub_op_modify_applied

This assert assumed that all ops submitted before MOSDRepScrub was
submitted were processed by the time that MOSDRepScrub was
processed.  In fact, MOSDRepScrub's scrub_to may refer to a
last_update yet to be seen by the replica.

Bug #2693

Signed-off-by: Samuel Just <sam.just@inktank.com>
---

diff --git a/src/osd/ReplicatedPG.cc b/src/osd/ReplicatedPG.cc
index a2a0efcdce98..933bdb599281 100644
--- a/src/osd/ReplicatedPG.cc
+++ b/src/osd/ReplicatedPG.cc
@@ -4286,7 +4286,6 @@ void ReplicatedPG::sub_op_modify_applied(RepModify *rm)
   last_update_applied = m->version;
   if (finalizing_scrub) {
     assert(active_rep_scrub);
-    assert(info.last_update <= active_rep_scrub->scrub_to);
     if (last_update_applied == active_rep_scrub->scrub_to) {
       osd->rep_scrub_wq.queue(active_rep_scrub);
       active_rep_scrub = 0;