librbd: improve object map debug messages

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
(cherry picked from commit 2c657752a5067e11405dca59461ce9cbdf062602)

diff --git a/src/librbd/object_map/Request.cc b/src/librbd/object_map/Request.cc
index e95c22a2f08cf4c00fec8b3a2cfb9e33ff74ef24..48cd99faf540695acbe63ba6a398a0a217b677f2 100644 (file)
--- a/src/librbd/object_map/Request.cc
+++ b/src/librbd/object_map/Request.cc
@@ -20,7 +20,7 @@ namespace object_map {
 
 bool Request::should_complete(int r) {
   CephContext *cct = m_image_ctx.cct;
-  ldout(cct, 20) << &m_image_ctx << " should_complete: r=" << r << dendl;
+  ldout(cct, 20) << this << " should_complete: r=" << r << dendl;
 
   switch (m_state)
   {

diff --git a/src/librbd/object_map/ResizeRequest.cc b/src/librbd/object_map/ResizeRequest.cc
index fcc6ec66b3f81695565b6e4362baef4a3fad1734..e574a18472966f1b841f1de339ce26bde543c05b 100644 (file)
--- a/src/librbd/object_map/ResizeRequest.cc
+++ b/src/librbd/object_map/ResizeRequest.cc
@@ -31,7 +31,8 @@ void ResizeRequest::send() {
   m_num_objs = Striper::get_num_objects(m_image_ctx.layout, m_new_size);
 
   std::string oid(ObjectMap::object_map_name(m_image_ctx.id, m_snap_id));
-  ldout(cct, 5) << &m_image_ctx << " resizing on-disk object map: "
+  ldout(cct, 5) << this << " resizing on-disk object map: "
+                << "ictx=" << &m_image_ctx << ", "
                 << "oid=" << oid << ", num_objs=" << m_num_objs << dendl;
 
   librados::ObjectWriteOperation op;
@@ -49,7 +50,7 @@ void ResizeRequest::send() {
 void ResizeRequest::finish_request() {
   CephContext *cct = m_image_ctx.cct;
 
-  ldout(cct, 5) << &m_image_ctx << " resizing in-memory object map: "
+  ldout(cct, 5) << this << " resizing in-memory object map: "
                << m_num_objs << dendl;
   resize(m_object_map, m_num_objs, m_default_object_state);
 }

diff --git a/src/librbd/object_map/UpdateRequest.cc b/src/librbd/object_map/UpdateRequest.cc
index e8a5f4784d9ec3ec68d20fb1a57c3dc718710c8a..5dd1e53172b8428efcb5e54ae8cf7fd3f40106cf 100644 (file)
--- a/src/librbd/object_map/UpdateRequest.cc
+++ b/src/librbd/object_map/UpdateRequest.cc
@@ -26,8 +26,8 @@ void UpdateRequest::send() {
   // safe to update in-memory state first without handling rollback since any
   // failures will invalidate the object map
   std::string oid(ObjectMap::object_map_name(m_image_ctx.id, m_snap_id));
-  ldout(cct, 20) << &m_image_ctx << " updating object map"
-                 << ": oid=" << oid << ", ["
+  ldout(cct, 20) << this << " updating object map"
+                 << ": ictx=" << &m_image_ctx << ", oid=" << oid << ", ["
                 << m_start_object_no << "," << m_end_object_no << ") = "
                 << (m_current_state ?
                       stringify(static_cast<uint32_t>(*m_current_state)) : "")
@@ -62,7 +62,7 @@ void UpdateRequest::send() {
 }
 
 void UpdateRequest::finish_request() {
-  ldout(m_image_ctx.cct, 20) << &m_image_ctx << " on-disk object map updated"
+  ldout(m_image_ctx.cct, 20) << this << " on-disk object map updated"
                              << dendl;
 }