From patchwork Wed Sep 7 04:00:05 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sage Weil X-Patchwork-Id: 1127112 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter1.kernel.org (8.14.4/8.14.4) with ESMTP id p873sj7j025213 for ; Wed, 7 Sep 2011 03:54:49 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755236Ab1IGDyc (ORCPT ); Tue, 6 Sep 2011 23:54:32 -0400 Received: from cobra.newdream.net ([66.33.216.30]:53207 "EHLO cobra.newdream.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755113Ab1IGDyc (ORCPT ); Tue, 6 Sep 2011 23:54:32 -0400 Received: from cobra.newdream.net (localhost [127.0.0.1]) by cobra.newdream.net (Postfix) with ESMTP id 15626BC7A1; Tue, 6 Sep 2011 21:00:06 -0700 (PDT) DomainKey-Signature: a=rsa-sha1; c=nofws; d=newdream.net; h=date:from:to:cc :subject:message-id:mime-version:content-type; q=dns; s= newdream.net; b=HNPU0Hp7v0NwfNiLb2c/MgCc/SSrQLF7AJKrd/nQO1MR7TH0 uo8mROTrficOSEzTStVyCczw/c0oZiqe0xVC7I0MxQvQnYwXCtv9iZrfHAZPZmOS KyZmqU0PmVgyQoMEKcCOfF2rMSvDBtATuW5XEp23d6bMswJo9/73PMKy5ds= DKIM-Signature: v=1; a=rsa-sha1; c=relaxed; d=newdream.net; h=date:from :to:cc:subject:message-id:mime-version:content-type; s= newdream.net; bh=1nwcyb949rnQGHojmSd2l/kc++Q=; b=mAqoHWdseguzD/A wGcrdp1jJSsyM8S/VvwrUmzBF3RzwwWVmhLR8wiHYKKzFzuXuXm1vXUKvziWxePi nys1o/20Won0qwpvkACy+UWZ6bBvpcr9WIxrqLCMaPIvd/0gf1Gol9/wZwGSQbVS xdhme1dSpNc8z0qqGayoJNfHcNEA= Received: by cobra.newdream.net (Postfix, from userid 1031) id F3A3ABC7BD; Tue, 6 Sep 2011 21:00:05 -0700 (PDT) Received: from localhost (localhost [127.0.0.1]) by cobra.newdream.net (Postfix) with ESMTP id D7EEFBC7A1; Tue, 6 Sep 2011 21:00:05 -0700 (PDT) Date: Tue, 6 Sep 2011 21:00:05 -0700 (PDT) From: Sage Weil To: huang jun cc: ceph-devel@vger.kernel.org Subject: Re: the messenger to send osd write ack|ondisk Message-ID: MIME-Version: 1.0 Sender: ceph-devel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: ceph-devel@vger.kernel.org X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by milter-greylist-4.2.6 (demeter1.kernel.org [140.211.167.41]); Wed, 07 Sep 2011 03:54:49 +0000 (UTC) Ah, nice catch. This fixes it: Pushing to master. Thanks! sage --- To unsubscribe from this list: send the line "unsubscribe ceph-devel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html diff --git a/src/osd/ReplicatedPG.cc b/src/osd/ReplicatedPG.cc index 73b42ac..48ee6bb 100644 --- a/src/osd/ReplicatedPG.cc +++ b/src/osd/ReplicatedPG.cc @@ -2817,7 +2817,7 @@ 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()); + osd->client_messenger->send_message(reply, op->get_connection()); repop->sent_ack = true; }