From 64ea8090ea1914a1cf80a93ad9229bca14bfd730 Mon Sep 17 00:00:00 2001 From: Jason Dillaman Date: Fri, 21 Feb 2020 13:37:49 -0500 Subject: [PATCH] rbd-mirror: additional debugging messages for snapshot-based mirroring Signed-off-by: Jason Dillaman --- src/test/rbd_mirror/test_ImageReplayer.cc | 5 +++++ .../image_replayer/snapshot/ApplyImageStateRequest.cc | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/src/test/rbd_mirror/test_ImageReplayer.cc b/src/test/rbd_mirror/test_ImageReplayer.cc index fcd8db6da4e2f..83fd20f96ae9f 100644 --- a/src/test/rbd_mirror/test_ImageReplayer.cc +++ b/src/test/rbd_mirror/test_ImageReplayer.cc @@ -413,6 +413,8 @@ public: ASSERT_EQ(0, get_last_mirror_snapshot(m_remote_ioctx, m_remote_image_id, &remote_snap_id, &remote_mirror_ns)); + std::cout << "remote_snap_id=" << remote_snap_id << std::endl; + std::string local_image_id; ASSERT_EQ(0, librbd::cls_client::mirror_image_get_image_id( &m_local_ioctx, m_global_image_id, &local_image_id)); @@ -434,6 +436,9 @@ public: local_mirror_ns.primary_mirror_uuid == m_remote_mirror_uuid && local_mirror_ns.primary_snap_id == remote_snap_id && local_mirror_ns.complete) { + + std::cout << "local_snap_id=" << local_snap_id << ", " + << "local_snap_ns=" << local_mirror_ns << std::endl; return; } diff --git a/src/tools/rbd_mirror/image_replayer/snapshot/ApplyImageStateRequest.cc b/src/tools/rbd_mirror/image_replayer/snapshot/ApplyImageStateRequest.cc index 3d628efd71086..6bceded0c5071 100644 --- a/src/tools/rbd_mirror/image_replayer/snapshot/ApplyImageStateRequest.cc +++ b/src/tools/rbd_mirror/image_replayer/snapshot/ApplyImageStateRequest.cc @@ -553,7 +553,7 @@ void ApplyImageStateRequest::handle_rename_snapshot(int r) { template void ApplyImageStateRequest::set_snapshot_limit() { - dout(15) << dendl; + dout(15) << "snap_limit=" << m_image_state.snap_limit << dendl; // no need to even check the current limit -- just set it std::shared_lock owner_locker{m_local_image_ctx->owner_lock}; -- 2.39.5