]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
PG: remove last_epoch_started asserts in proc_primary_info
authorSamuel Just <sam.just@inktank.com>
Tue, 4 Dec 2012 19:36:58 +0000 (11:36 -0800)
committerYehuda Sadeh <yehuda@inktank.com>
Sat, 8 Dec 2012 06:36:36 +0000 (22:36 -0800)
These asserts are valid for a uniform cluster, but they won't hold
for a replica running a version without the info.last_epoch_started
patch.

Signed-off-by: Samuel Just <sam.just@inktank.com>
Reviewed-by: Greg Farnum <greg@inktank.com>
(cherry picked from commit 0756052cff542ab02d653b40c37a645b395f31b3)

src/osd/PG.cc

index b81bfed36f4a9478fbcdfcb2b0c8e2e94150885c..93f1e919ba801f2de66437d4541ab521466e8fcc 100644 (file)
@@ -4530,10 +4530,6 @@ void PG::proc_primary_info(ObjectStore::Transaction &t, const pg_info_t &oinfo)
     dirty_info = true;
   osd->reg_last_pg_scrub(info.pgid, info.history.last_scrub_stamp);
 
-  assert(oinfo.last_epoch_started == info.last_epoch_started);
-  assert(info.history.last_epoch_started == oinfo.last_epoch_started);
-  assert(oinfo.history.last_epoch_started == oinfo.last_epoch_started);
-
   // Handle changes to purged_snaps ONLY IF we have caught up
   if (last_complete_ondisk.epoch >= info.history.last_epoch_started) {
     interval_set<snapid_t> p;