]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.git/commitdiff
osd/PG: let proc_replica_info() do sanity check
authorxie xingguo <xie.xingguo@zte.com.cn>
Tue, 14 Mar 2017 10:52:00 +0000 (18:52 +0800)
committerxie xingguo <xie.xingguo@zte.com.cn>
Tue, 14 Mar 2017 10:57:04 +0000 (18:57 +0800)
As proc_replica_info() will do the check internally.

Signed-off-by: xie xingguo <xie.xingguo@zte.com.cn>
src/osd/PG.cc

index 1a0c66d6d03324f102a974436a5a045abeab3659..e77fb070a4fe64f609fbab190decf9830b65a8a0 100644 (file)
@@ -6052,14 +6052,8 @@ boost::statechart::result PG::RecoveryState::Primary::react(const MNotifyRec& no
 {
   PG *pg = context< RecoveryMachine >().pg;
   ldout(pg->cct, 7) << "handle_pg_notify from osd." << notevt.from << dendl;
-  if (pg->peer_info.count(notevt.from) &&
-      pg->peer_info[notevt.from].last_update == notevt.notify.info.last_update) {
-    ldout(pg->cct, 10) << *pg << " got dup osd." << notevt.from << " info "
-                      << notevt.notify.info << ", identical to ours" << dendl;
-  } else {
-    pg->proc_replica_info(
-      notevt.from, notevt.notify.info, notevt.notify.epoch_sent);
-  }
+  pg->proc_replica_info(
+    notevt.from, notevt.notify.info, notevt.notify.epoch_sent);
   return discard_event();
 }