summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGreg Farnum <gregory.farnum@dreamhost.com>2011-09-04 16:53:47 -0700
committerGreg Farnum <gregory.farnum@dreamhost.com>2011-09-04 16:53:47 -0700
commit479e9ca674e4271a1635c59ef3680e9ab8b89f73 (patch)
treebd288b19a0e429e102318c3449f537346aee9f2e
parent933e7945acf9ed5dff658062437a42d429cb882c (diff)
downloadceph-479e9ca674e4271a1635c59ef3680e9ab8b89f73.tar.gz
ReplicatedPG: use the client_messenger for OSD Op replies
We were erroneously using the cluster_messenger instead -- looks like the initial conversion just went wrong since this is in the repop handling code. Reported-by: Huang Jin <hjwsm1989@gmail.com> Signed-off-by: Greg Farnum <gregory.farnum@dreamhost.com>
-rw-r--r--src/osd/ReplicatedPG.cc3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/osd/ReplicatedPG.cc b/src/osd/ReplicatedPG.cc
index 73b42acf133..700b02c01c3 100644
--- a/src/osd/ReplicatedPG.cc
+++ b/src/osd/ReplicatedPG.cc
@@ -2817,7 +2817,8 @@ void ReplicatedPG::eval_repop(RepGather *repop)
reply = new MOSDOpReply(op, 0, osd->osdmap->get_epoch(), 0);
reply->add_flags(CEPH_OSD_FLAG_ACK);
dout(10) << " sending ack on " << *repop << " " << reply << dendl;
- osd->cluster_messenger->send_message(reply, op->get_connection());
+ assert(entity_name_t::TYPE_OSD != op->get_connection()->peer_type);
+ osd->client_messenger->send_message(reply, op->get_connection());
repop->sent_ack = true;
}