From 83ffaca69e531bfa0da1b1d34d2013bd6b053ed7 Mon Sep 17 00:00:00 2001 From: N Balachandran Date: Mon, 6 Nov 2023 14:27:59 +0530 Subject: [PATCH] librbd: additional logs for debugging Added image and object information to the deep_copy class constructors debugging easier. Signed-off-by: N Balachandran --- src/librbd/deep_copy/ImageCopyRequest.cc | 7 +++++++ src/librbd/deep_copy/MetadataCopyRequest.cc | 4 ++++ src/librbd/deep_copy/ObjectCopyRequest.cc | 10 ++++++---- src/librbd/deep_copy/SetHeadRequest.cc | 6 ++++++ src/librbd/deep_copy/SnapshotCopyRequest.cc | 9 +++++++++ src/librbd/deep_copy/SnapshotCreateRequest.cc | 8 ++++++++ 6 files changed, 40 insertions(+), 4 deletions(-) diff --git a/src/librbd/deep_copy/ImageCopyRequest.cc b/src/librbd/deep_copy/ImageCopyRequest.cc index 08e959dd57232..9cce590ec1834 100644 --- a/src/librbd/deep_copy/ImageCopyRequest.cc +++ b/src/librbd/deep_copy/ImageCopyRequest.cc @@ -39,6 +39,13 @@ ImageCopyRequest::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 diff --git a/src/librbd/deep_copy/MetadataCopyRequest.cc b/src/librbd/deep_copy/MetadataCopyRequest.cc index c584bea54b809..d696ea5ccc8a5 100644 --- a/src/librbd/deep_copy/MetadataCopyRequest.cc +++ b/src/librbd/deep_copy/MetadataCopyRequest.cc @@ -30,6 +30,10 @@ MetadataCopyRequest::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 diff --git a/src/librbd/deep_copy/ObjectCopyRequest.cc b/src/librbd/deep_copy/ObjectCopyRequest.cc index 4c380c642c152..3c1b9460140a0 100644 --- a/src/librbd/deep_copy/ObjectCopyRequest.cc +++ b/src/librbd/deep_copy/ObjectCopyRequest.cc @@ -58,10 +58,12 @@ ObjectCopyRequest::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 diff --git a/src/librbd/deep_copy/SetHeadRequest.cc b/src/librbd/deep_copy/SetHeadRequest.cc index 1e056b9580cb0..a82b93592dea9 100644 --- a/src/librbd/deep_copy/SetHeadRequest.cc +++ b/src/librbd/deep_copy/SetHeadRequest.cc @@ -30,6 +30,12 @@ SetHeadRequest::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 diff --git a/src/librbd/deep_copy/SnapshotCopyRequest.cc b/src/librbd/deep_copy/SnapshotCopyRequest.cc index 1aadd34db36c2..5b7f3b7a83ef6 100644 --- a/src/librbd/deep_copy/SnapshotCopyRequest.cc +++ b/src/librbd/deep_copy/SnapshotCopyRequest.cc @@ -76,6 +76,15 @@ SnapshotCopyRequest::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 diff --git a/src/librbd/deep_copy/SnapshotCreateRequest.cc b/src/librbd/deep_copy/SnapshotCreateRequest.cc index d437bd3552fd8..394aee287251e 100644 --- a/src/librbd/deep_copy/SnapshotCreateRequest.cc +++ b/src/librbd/deep_copy/SnapshotCreateRequest.cc @@ -33,6 +33,14 @@ SnapshotCreateRequest::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 -- 2.39.5