From: Vu Pham <vu@mellanox.com>
Date: Mon, 29 Dec 2014 16:37:13 +0000 (-0800)
Subject: xio: enable accelio debug on level 2
X-Git-Tag: v0.93~265^2~1
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=daefad7a4b58e1b0063abc423695d2d414066f80;p=ceph.git

xio: enable accelio debug on level 2

Enable accelio debug (mostly on connection) on level 2
and sync with XioConnection debug events

Signed-off-by: Vu Pham <vu@mellanox.com>
Signed-off-by: Matt Benjamin <matt@cohortfs.com>
---

diff --git a/src/msg/xio/XioConnection.cc b/src/msg/xio/XioConnection.cc
index 8b7e28b2ef41..8e33dd998d9b 100644
--- a/src/msg/xio/XioConnection.cc
+++ b/src/msg/xio/XioConnection.cc
@@ -456,6 +456,8 @@ int XioConnection::on_ow_msg_send_complete(struct xio_session *session,
     if ((send_ctr <= uint32_t(xio_qdepth_low_mark())) &&
 	(1 /* XXX memory <= memory low-water mark */))  {
       cstate.state_up_ready(XioConnection::CState::OP_FLAG_NONE);
+      ldout(msgr->cct,2) << "on_msg_delivered xcon: " << xmsg->xcon <<
+        " session: " << session << " up_ready from flow_controlled" << dendl;
     }
   }
 
@@ -466,7 +468,8 @@ int XioConnection::on_ow_msg_send_complete(struct xio_session *session,
 
 void XioConnection::msg_send_fail(XioMsg *xmsg, int code)
 {
-  ldout(msgr->cct,4) << "xio_send_msg FAILED " << &xmsg->req_0.msg << " code=" << code <<
+  ldout(msgr->cct,2) << "xio_send_msg FAILED xcon: " << this <<
+    " xmsg: " << &xmsg->req_0.msg << " code=" << code <<
     " (" << xio_strerror(code) << ")" << dendl;
   /* return refs taken for each xio_msg */
   xmsg->put_msg_refs();
@@ -474,7 +477,8 @@ void XioConnection::msg_send_fail(XioMsg *xmsg, int code)
 
 void XioConnection::msg_release_fail(struct xio_msg *msg, int code)
 {
-  ldout(msgr->cct,4) << "xio_release_msg FAILED " << msg <<  "code=" << code <<
+  ldout(msgr->cct,2) << "xio_release_msg FAILED xcon: " << this <<
+    " xmsg: " << msg <<  "code=" << code <<
     " (" << xio_strerror(code) << ")" << dendl;
 } /* msg_release_fail */
 
diff --git a/src/msg/xio/XioMessenger.cc b/src/msg/xio/XioMessenger.cc
index 562e7e710c8f..a88f10c8b9c2 100644
--- a/src/msg/xio/XioMessenger.cc
+++ b/src/msg/xio/XioMessenger.cc
@@ -58,8 +58,8 @@ static const level_pair LEVELS[] = {
   make_pair("fatal", 0),
   make_pair("error", 0),
   make_pair("warn", 1),
-  make_pair("info", 5),
-  make_pair("debug", 10),
+  make_pair("info", 1),
+  make_pair("debug", 2),
   make_pair("trace", 20)
 };
 
@@ -399,7 +399,7 @@ int XioMessenger::session_event(struct xio_session *session,
   case XIO_SESSION_CONNECTION_ESTABLISHED_EVENT:
     xcon = static_cast<XioConnection*>(event_data->conn_user_context);
 
-    ldout(cct,4) << "connection established " << event_data->conn
+    ldout(cct,2) << "connection established " << event_data->conn
       << " session " << session << " xcon " << xcon << dendl;
 
     /* notify hook */
@@ -450,7 +450,7 @@ int XioMessenger::session_event(struct xio_session *session,
   }
   break;
   case XIO_SESSION_CONNECTION_ERROR_EVENT:
-    ldout(cct,4) << xio_session_event_types[event_data->event]
+    ldout(cct,2) << xio_session_event_types[event_data->event]
       << " user_context " << event_data->conn_user_context << dendl;
     /* informational (Eyal)*/
     break;
@@ -958,6 +958,9 @@ ConnectionRef XioMessenger::get_connection(const entity_inst_t& dest)
     /* XXXX pre-merge of session startup negotiation ONLY! */
     xcon->cstate.state_up_ready(XioConnection::CState::OP_FLAG_NONE);
 
+    ldout(cct,2) << "new connection xcon: " << xcon <<
+      " up_ready on session " << xcon->session << dendl;
+
     return xcon->get(); /* nref +1 */
   }
 } /* get_connection */