From: Jason Dillaman <dillaman@redhat.com>
Date: Wed, 2 Dec 2020 03:34:00 +0000 (-0500)
Subject: librbd/migration: minor debug message tweaks
X-Git-Tag: v16.1.0~382^2~1
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=6a9ee90ae0ce70786e067567b2ade7e135c99ad3;p=ceph.git

librbd/migration: minor debug message tweaks

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
---

diff --git a/src/librbd/migration/RawFormat.cc b/src/librbd/migration/RawFormat.cc
index 8cd0ff2bc88..774762594f4 100644
--- a/src/librbd/migration/RawFormat.cc
+++ b/src/librbd/migration/RawFormat.cc
@@ -167,7 +167,8 @@ bool RawFormat<I>::read(
     io::ReadResult&& read_result, int op_flags, int read_flags,
     const ZTracer::Trace &parent_trace) {
   auto cct = m_image_ctx->cct;
-  ldout(cct, 20) << "image_extents=" << image_extents << dendl;
+  ldout(cct, 20) << "snap_id=" << snap_id << ", "
+                 << "image_extents=" << image_extents << dendl;
 
   auto snapshot_it = m_snapshots.find(snap_id);
   if (snapshot_it == m_snapshots.end()) {
diff --git a/src/librbd/migration/RawSnapshot.cc b/src/librbd/migration/RawSnapshot.cc
index 3ba7881d05c..4a83fd8ad97 100644
--- a/src/librbd/migration/RawSnapshot.cc
+++ b/src/librbd/migration/RawSnapshot.cc
@@ -71,7 +71,8 @@ struct RawSnapshot<I>::OpenRequest {
 
   void handle_get_image_size(int r) {
     auto cct = raw_snapshot->m_image_ctx->cct;
-    ldout(cct, 10) << "r=" << r << dendl;
+    ldout(cct, 10) << "r=" << r << ", "
+                   << "image_size=" << raw_snapshot->m_snap_info.size << dendl;
 
     if (r < 0) {
       lderr(cct) << "failed to open stream: " << cpp_strerror(r) << dendl;
@@ -130,7 +131,6 @@ template <typename I>
 void RawSnapshot<I>::open(SnapshotInterface* previous_snapshot,
                           Context* on_finish) {
   auto cct = m_image_ctx->cct;
-  ldout(cct, 10) << dendl;
 
   // special-case for treating the HEAD revision as a snapshot
   if (m_index != CEPH_NOSNAP) {
@@ -149,6 +149,8 @@ void RawSnapshot<I>::open(SnapshotInterface* previous_snapshot,
     }
   }
 
+  ldout(cct, 10) << "name=" << m_snap_info.name << dendl;
+
   int r = m_source_spec_builder->build_stream(m_json_object, &m_stream);
   if (r < 0) {
     lderr(cct) << "failed to build migration stream handler" << cpp_strerror(r)