]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
osd: remove recovery-from-backlog kludge last_update
authorSage Weil <sage.weil@dreamhost.com>
Sat, 3 Dec 2011 00:33:35 +0000 (16:33 -0800)
committerSamuel Just <samuel.just@dreamhost.com>
Wed, 14 Dec 2011 19:31:33 +0000 (11:31 -0800)
Signed-off-by: Sage Weil <sage.weil@dreamhost.com>
src/osd/ReplicatedPG.cc

index 028a03f6f37da471bee1f022fa03e9889e8e573f..63bab14fa6a006d0b45b7d3fb4161a24b5061eef 100644 (file)
@@ -4244,12 +4244,7 @@ void ReplicatedPG::recover_primary_got(hobject_t oid, eversion_t v)
       dout(10) << "last_complete now " << info.last_complete
               << " log.complete_to at end" << dendl;
       assert(missing.num_missing() == 0);  // otherwise, complete_to was wrong.
-      if (info.last_complete != info.last_update) {
-       // this happens if the log we are recovering from was a
-       // backlog, and the most recent entry wasn't last_update.
-       info.last_complete = info.last_update;
-       dout(10) << "setting last_complete to last_update " << info.last_complete << dendl;
-      }
+      assert(info.last_complete == info.last_update);
     }
   }
 }