]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
osd/ReplicatedPG: remove the peer_type assertion in eval_repop
authorZhiqiang Wang <zhiqiang.wang@intel.com>
Thu, 11 Dec 2014 04:36:56 +0000 (12:36 +0800)
committerSamuel Just <sjust@redhat.com>
Tue, 18 Aug 2015 18:25:17 +0000 (11:25 -0700)
When moving to proxy write, this assertion doesn't hold any more.

Signed-off-by: Zhiqiang Wang <zhiqiang.wang@intel.com>
Conflicts:
src/osd/ReplicatedPG.cc

src/osd/ReplicatedPG.cc

index 4d2edc0988167ce2d214ac29eb6d976ddcd94a91..ee20bc72fa4fc96d6c0c2fb2baf4932ac4222e3f 100644 (file)
@@ -7571,7 +7571,6 @@ void ReplicatedPG::eval_repop(RepGather *repop)
       }
       reply->add_flags(CEPH_OSD_FLAG_ACK);
       dout(10) << " sending ack on " << *repop << " " << reply << dendl;
-      assert(entity_name_t::TYPE_OSD != m->get_connection()->peer_type);
       osd->send_message_osd_client(reply, m->get_connection());
       repop->sent_ack = true;
     }