From patchwork Thu May 12 21:32:33 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jim Schutt X-Patchwork-Id: 781192 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter2.kernel.org (8.14.4/8.14.3) with ESMTP id p4CLXa2N010590 for ; Thu, 12 May 2011 21:33:36 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932810Ab1ELVd0 (ORCPT ); Thu, 12 May 2011 17:33:26 -0400 Received: from sentry-two.sandia.gov ([132.175.109.14]:50855 "EHLO sentry-two.sandia.gov" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932821Ab1ELVdX (ORCPT ); Thu, 12 May 2011 17:33:23 -0400 X-WSS-ID: 0LL3QJL-0B-0V3-02 X-M-MSG: Received: from interceptor1.sandia.gov (interceptor1.sandia.gov [132.175.109.5]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by sentry-two.sandia.gov (Postfix) with ESMTP id 1141D26A061; Thu, 12 May 2011 15:33:21 -0600 (MDT) Received: from sentry.sandia.gov (sentry.sandia.gov [132.175.109.20]) by interceptor1.sandia.gov (RSA Interceptor); Thu, 12 May 2011 15:26:28 -0600 Received: from [132.175.109.1] by sentry.sandia.gov with ESMTP (SMTP Relay 01 (Email Firewall v6.3.2)); Thu, 12 May 2011 15:32:59 -0600 X-Server-Uuid: 6BFC7783-7E22-49B4-B610-66D6BE496C0E Received: from localhost.localdomain (skynetcore1.sandia.gov [134.253.138.22]) by mailgate.sandia.gov (8.14.4/8.14.4) with ESMTP id p4CLWf01029671; Thu, 12 May 2011 15:32:42 -0600 From: "Jim Schutt" To: sage@newdream.net cc: ceph-devel@vger.kernel.org, "Jim Schutt" Subject: [PATCH 1/2] libceph: add debugging to understand how bad msg tag is getting sent Date: Thu, 12 May 2011 15:32:33 -0600 Message-ID: <1305235954-9860-1-git-send-email-jaschut@sandia.gov> X-Mailer: git-send-email 1.6.6 In-Reply-To: References: X-PMX-Version: 5.6.0.2009776, Antispam-Engine: 2.7.2.376379, Antispam-Data: 2011.5.12.212424 X-PMX-Spam: Gauge=IIIIIIII, Probability=8%, Report=' BODYTEXTP_SIZE_3000_LESS 0, BODY_SIZE_1800_1899 0, BODY_SIZE_2000_LESS 0, BODY_SIZE_5000_LESS 0, BODY_SIZE_7000_LESS 0, DATE_TZ_NA 0, NO_URI_FOUND 0, __HAS_MSGID 0, __HAS_X_MAILER 0, __MIME_TEXT_ONLY 0, __SANE_MSGID 0, __TO_MALFORMED_2 0, __TO_NO_NAME 0' X-TMWD-Spam-Summary: TS=20110512213303; ID=1; SEV=2.3.1; DFV=B2011051221; IFV=NA; AIF=B2011051221; RPD=5.03.0010; ENG=NA; RPDID=7374723D303030312E30413031303230312E34444343353230462E303031383A534346535441543838363133332C73733D312C6667733D30; CAT=NONE; CON=NONE; SIG=AAAAAAAAAAAAAAAAAAAAAAAAfQ== X-MMS-Spam-Filter-ID: B2011051221_5.03.0010 MIME-Version: 1.0 X-WSS-ID: 61D28D812K43675505-01-01 X-RSA-Inspected: yes X-RSA-Classifications: public X-RSA-Action: allow 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 (demeter2.kernel.org [140.211.167.43]); Thu, 12 May 2011 21:33:36 +0000 (UTC) --- net/ceph/messenger.c | 13 +++++++------ 1 files changed, 7 insertions(+), 6 deletions(-) diff --git a/net/ceph/messenger.c b/net/ceph/messenger.c index e15a82c..db12abc 100644 --- a/net/ceph/messenger.c +++ b/net/ceph/messenger.c @@ -502,8 +502,8 @@ static void prepare_write_message(struct ceph_connection *con) m->needs_out_seq = false; } - dout("prepare_write_message %p seq %lld type %d len %d+%d+%d %d pgs\n", - m, con->out_seq, le16_to_cpu(m->hdr.type), + dout("prepare_write_message %p msg %p seq %lld type %d len %d+%d+%d %d pgs\n", + con, m, con->out_seq, le16_to_cpu(m->hdr.type), le32_to_cpu(m->hdr.front_len), le32_to_cpu(m->hdr.middle_len), le32_to_cpu(m->hdr.data_len), m->nr_pages); @@ -1708,7 +1708,8 @@ static int try_write(struct ceph_connection *con) atomic_read(&con->nref)); more: - dout("try_write out_kvec_bytes %d\n", con->out_kvec_bytes); + dout("try_write %p out_msg %p out_kvec_bytes %d\n", + con, con->out_msg, con->out_kvec_bytes); /* open the socket first? */ if (con->sock == NULL) { @@ -1783,7 +1784,7 @@ do_next: /* Nothing to do! */ clear_bit(WRITE_PENDING, &con->state); - dout("try_write nothing else to write.\n"); + dout("try_write nothing else to write on %p.\n", con); ret = 0; out: dout("try_write done on %p ret %d\n", con, ret); @@ -1959,13 +1960,13 @@ static void con_work(struct work_struct *work) goto done; } if (test_bit(CLOSED, &con->state)) { /* e.g. if we are replaced */ - dout("con_work CLOSED\n"); + dout("con_work %p CLOSED\n", con); con_close_socket(con); goto done; } if (test_and_clear_bit(OPENING, &con->state)) { /* reopen w/ new peer */ - dout("con_work OPENING\n"); + dout("con_work %p OPENING\n", con); con_close_socket(con); }