librbd: additional logs for debugging

Added image and object information to the deep_copy class constructors
debugging easier.

Signed-off-by: N Balachandran <nibalach@redhat.com>

diff --git a/src/librbd/deep_copy/ImageCopyRequest.cc b/src/librbd/deep_copy/ImageCopyRequest.cc
index 08e959dd572325f74beda92c334167a29836e0ab..9cce590ec18348c85267f922e956f12a5a4bcb03 100644 (file)
--- a/src/librbd/deep_copy/ImageCopyRequest.cc
+++ b/src/librbd/deep_copy/ImageCopyRequest.cc
@@ -39,6 +39,13 @@ ImageCopyRequest<I>::ImageCopyRequest(I *src_image_ctx, I *dst_image_ctx,
     m_flatten(flatten), m_object_number(object_number), m_snap_seqs(snap_seqs),
     m_handler(handler), m_on_finish(on_finish), m_cct(dst_image_ctx->cct),
     m_lock(ceph::make_mutex(unique_lock_name("ImageCopyRequest::m_lock", this))) {
+
+    ldout(m_cct, 20) << "src_image_id=" << m_src_image_ctx->id
+                    << ", dst_image_id=" << m_dst_image_ctx->id
+                    << ", src_snap_id_start=" << m_src_snap_id_start
+                     << ", src_snap_id_end=" << m_src_snap_id_end
+                    << ", dst_snap_id_start=" << m_dst_snap_id_start
+                    << dendl;
 }
 
 template <typename I>

diff --git a/src/librbd/deep_copy/MetadataCopyRequest.cc b/src/librbd/deep_copy/MetadataCopyRequest.cc
index c584bea54b8094addfd371a466147b7fa8085ce4..d696ea5ccc8a5ed3d9a65992e7e3ec315e7264b4 100644 (file)
--- a/src/librbd/deep_copy/MetadataCopyRequest.cc
+++ b/src/librbd/deep_copy/MetadataCopyRequest.cc
@@ -30,6 +30,10 @@ MetadataCopyRequest<I>::MetadataCopyRequest(I *src_image_ctx, I *dst_image_ctx,
                                             Context *on_finish)
   : m_src_image_ctx(src_image_ctx), m_dst_image_ctx(dst_image_ctx),
     m_on_finish(on_finish), m_cct(dst_image_ctx->cct) {
+
+  ldout(m_cct, 20) << "src_image_id=" << m_src_image_ctx->id
+                   << ", dst_image_id=" << m_dst_image_ctx->id
+                  << dendl;
 }
 
 template <typename I>

diff --git a/src/librbd/deep_copy/ObjectCopyRequest.cc b/src/librbd/deep_copy/ObjectCopyRequest.cc
index 4c380c642c15264f5bcf3d5acef7c9fbb4a48b42..3c1b9460140a02ff94b6fa3c002a8d47e1f9d74e 100644 (file)
--- a/src/librbd/deep_copy/ObjectCopyRequest.cc
+++ b/src/librbd/deep_copy/ObjectCopyRequest.cc
@@ -58,10 +58,12 @@ ObjectCopyRequest<I>::ObjectCopyRequest(I *src_image_ctx,
 
   m_dst_oid = m_dst_image_ctx->get_object_name(dst_object_number);
 
-  ldout(m_cct, 20) << "dst_oid=" << m_dst_oid << ", "
-                   << "src_snap_id_start=" << m_src_snap_id_start << ", "
-                   << "dst_snap_id_start=" << m_dst_snap_id_start << ", "
-                   << "snap_map=" << m_snap_map << dendl;
+  ldout(m_cct, 20) << "src_image_id=" << m_src_image_ctx->id
+                  << ", dst_image_id=" << m_dst_image_ctx->id
+                  << ", dst_oid=" << m_dst_oid
+                  << ", src_snap_id_start=" << m_src_snap_id_start
+                  << ", dst_snap_id_start=" << m_dst_snap_id_start
+                   << ", snap_map=" << m_snap_map << dendl;
 }
 
 template <typename I>

diff --git a/src/librbd/deep_copy/SetHeadRequest.cc b/src/librbd/deep_copy/SetHeadRequest.cc
index 1e056b9580cb0313f2d98b14271911645cae4544..a82b93592dea95a15cb70cbf24b7c1358202db11 100644 (file)
--- a/src/librbd/deep_copy/SetHeadRequest.cc
+++ b/src/librbd/deep_copy/SetHeadRequest.cc
@@ -30,6 +30,12 @@ SetHeadRequest<I>::SetHeadRequest(I *image_ctx, uint64_t size,
     m_parent_overlap(parent_overlap), m_on_finish(on_finish),
     m_cct(image_ctx->cct) {
   ceph_assert(m_parent_overlap <= m_size);
+
+  ldout(m_cct, 20) << "image_id=" << m_image_ctx->id
+                   << ", size=" << m_size
+                   << ", parent_spec=" << m_parent_spec
+                   << ", parent_overlap=" << m_parent_overlap
+                   << dendl;
 }
 
 template <typename I>

diff --git a/src/librbd/deep_copy/SnapshotCopyRequest.cc b/src/librbd/deep_copy/SnapshotCopyRequest.cc
index 1aadd34db36c2e87079037e182ffc653219ef12c..5b7f3b7a83ef6850eb42cce1eedc6bbff8b125e7 100644 (file)
--- a/src/librbd/deep_copy/SnapshotCopyRequest.cc
+++ b/src/librbd/deep_copy/SnapshotCopyRequest.cc
@@ -76,6 +76,15 @@ SnapshotCopyRequest<I>::SnapshotCopyRequest(I *src_image_ctx,
     m_src_snap_ids.erase(m_src_snap_ids.upper_bound(m_src_snap_id_end),
                          m_src_snap_ids.end());
   }
+
+  ldout(m_cct, 20) << "src_image_id=" << m_src_image_ctx->id
+                   << ", dst_image_id=" << m_dst_image_ctx->id
+                   << ", src_snap_id_start=" << m_src_snap_id_start
+                   << ", src_snap_id_end=" << m_src_snap_id_end
+                   << ", dst_snap_id_start=" << m_dst_snap_id_start
+                   << ", src_snap_ids=" << m_src_snap_ids
+                   << ", dst_snap_ids=" << m_dst_snap_ids
+                  << dendl;
 }
 
 template <typename I>

diff --git a/src/librbd/deep_copy/SnapshotCreateRequest.cc b/src/librbd/deep_copy/SnapshotCreateRequest.cc
index d437bd3552fd890005b5d518ce6e07059354dcfd..394aee287251e23a8e468efe7ddb7e25b622e0af 100644 (file)
--- a/src/librbd/deep_copy/SnapshotCreateRequest.cc
+++ b/src/librbd/deep_copy/SnapshotCreateRequest.cc
@@ -33,6 +33,14 @@ SnapshotCreateRequest<I>::SnapshotCreateRequest(
     m_snap_namespace(snap_namespace), m_size(size),
     m_parent_spec(spec), m_parent_overlap(parent_overlap),
     m_on_finish(on_finish), m_cct(dst_image_ctx->cct) {
+
+  ldout(m_cct, 20) << "dst_image_id=" << m_dst_image_ctx->id
+                   << ", snap_name=" << m_snap_name
+                   << ", snap_namespace=" << m_snap_namespace
+                   << ", size=" << m_size
+                   << ", parent_spec=" << m_parent_spec
+                   << ", parent_overlap=" << m_parent_overlap
+                  << dendl;
 }
 
 template <typename I>