]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
osd: remove useless proc_replica_log() side-effect
authorSage Weil <sage.weil@dreamhost.com>
Wed, 9 Nov 2011 23:47:35 +0000 (15:47 -0800)
committerSage Weil <sage@newdream.net>
Thu, 10 Nov 2011 00:33:56 +0000 (16:33 -0800)
Signed-off-by: Sage Weil <sage.weil@dreamhost.com>
src/osd/PG.cc

index bebf3b6ae7b3fea1e50cf02d9d7aabba5b599221..7cfdfcd0630ee55e49213ef85a500c38f8745649 100644 (file)
@@ -225,13 +225,6 @@ void PG::proc_replica_log(ObjectStore::Transaction& t, Info &oinfo, Log &olog, M
 {
   dout(10) << "proc_replica_log for osd." << from << ": " << oinfo << " " << olog << " " << omissing << dendl;
 
-  // This was a side effect in _process_pg_info. At this point I don't
-  // think it's necessary, since we're in the GetMissing state,
-  // but we'll keep it here for now
-  osd->unreg_last_pg_scrub(info.pgid, info.history.last_scrub_stamp);
-  info.history.merge(oinfo.history);
-  osd->reg_last_pg_scrub(info.pgid, info.history.last_scrub_stamp);
-
   /*
     basically what we're doing here is rewinding the remote log,
     dropping divergent entries, until we find something that matches