[1/2] libceph: add debugging to understand how bad msg tag is getting sent

Commit Message

Jim Schutt May 12, 2011, 9:32 p.m. UTC

---
 net/ceph/messenger.c |   13 +++++++------
 1 files changed, 7 insertions(+), 6 deletions(-)

Patch

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);
 	}