librbd/mirror: increase debug logging of snapshot state machines

Try to keep debug level 20 for IO state machines so that setting the
debug level to something lower should show the manipulation of
the mirror snapshots.

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

diff --git a/src/librbd/mirror/snapshot/CreateNonPrimaryRequest.cc b/src/librbd/mirror/snapshot/CreateNonPrimaryRequest.cc
index 6d5588d7f2c4667d93a650bc60bed203e5a40efb..50fc263339c813bc7d0923b53e9d6f08aaaf55e0 100644 (file)
--- a/src/librbd/mirror/snapshot/CreateNonPrimaryRequest.cc
+++ b/src/librbd/mirror/snapshot/CreateNonPrimaryRequest.cc
@@ -51,7 +51,7 @@ void CreateNonPrimaryRequest<I>::refresh_image() {
   }
 
   CephContext *cct = m_image_ctx->cct;
-  ldout(cct, 20) << dendl;
+  ldout(cct, 15) << dendl;
 
   auto ctx = create_context_callback<
     CreateNonPrimaryRequest<I>,
@@ -62,7 +62,7 @@ void CreateNonPrimaryRequest<I>::refresh_image() {
 template <typename I>
 void CreateNonPrimaryRequest<I>::handle_refresh_image(int r) {
   CephContext *cct = m_image_ctx->cct;
-  ldout(cct, 20) << "r=" << r << dendl;
+  ldout(cct, 15) << "r=" << r << dendl;
 
   if (r < 0) {
     lderr(cct) << "failed to refresh image: " << cpp_strerror(r) << dendl;
@@ -76,7 +76,7 @@ void CreateNonPrimaryRequest<I>::handle_refresh_image(int r) {
 template <typename I>
 void CreateNonPrimaryRequest<I>::get_mirror_image() {
   CephContext *cct = m_image_ctx->cct;
-  ldout(cct, 20) << dendl;
+  ldout(cct, 15) << dendl;
 
   librados::ObjectReadOperation op;
   cls_client::mirror_image_get_start(&op, m_image_ctx->id);
@@ -92,7 +92,7 @@ void CreateNonPrimaryRequest<I>::get_mirror_image() {
 template <typename I>
 void CreateNonPrimaryRequest<I>::handle_get_mirror_image(int r) {
   CephContext *cct = m_image_ctx->cct;
-  ldout(cct, 20) << "r=" << r << dendl;
+  ldout(cct, 15) << "r=" << r << dendl;
 
   cls::rbd::MirrorImage mirror_image;
   if (r == 0) {
@@ -134,7 +134,7 @@ void CreateNonPrimaryRequest<I>::get_mirror_peers() {
   }
 
   CephContext *cct = m_image_ctx->cct;
-  ldout(cct, 20) << dendl;
+  ldout(cct, 15) << dendl;
 
   librados::ObjectReadOperation op;
   cls_client::mirror_peer_list_start(&op);
@@ -151,7 +151,7 @@ void CreateNonPrimaryRequest<I>::get_mirror_peers() {
 template <typename I>
 void CreateNonPrimaryRequest<I>::handle_get_mirror_peers(int r) {
   CephContext *cct = m_image_ctx->cct;
-  ldout(cct, 20) << "r=" << r << dendl;
+  ldout(cct, 15) << "r=" << r << dendl;
 
   std::vector<cls::rbd::MirrorPeer> peers;
   if (r == 0) {
@@ -189,7 +189,7 @@ void CreateNonPrimaryRequest<I>::create_snapshot() {
   }
   ns.snap_seqs = m_snap_seqs;
   ns.complete = is_orphan();
-  ldout(cct, 20) << "ns=" << ns << dendl;
+  ldout(cct, 15) << "ns=" << ns << dendl;
 
   auto ctx = create_context_callback<
     CreateNonPrimaryRequest<I>,
@@ -200,7 +200,7 @@ void CreateNonPrimaryRequest<I>::create_snapshot() {
 template <typename I>
 void CreateNonPrimaryRequest<I>::handle_create_snapshot(int r) {
   CephContext *cct = m_image_ctx->cct;
-  ldout(cct, 20) << "r=" << r << dendl;
+  ldout(cct, 15) << "r=" << r << dendl;
 
   if (r < 0) {
     lderr(cct) << "failed to create mirror snapshot: " << cpp_strerror(r)
@@ -231,7 +231,7 @@ void CreateNonPrimaryRequest<I>::write_image_state() {
   }
 
   CephContext *cct = m_image_ctx->cct;
-  ldout(cct, 20) << dendl;
+  ldout(cct, 15) << dendl;
 
   auto ctx = create_context_callback<
     CreateNonPrimaryRequest<I>,
@@ -245,7 +245,7 @@ void CreateNonPrimaryRequest<I>::write_image_state() {
 template <typename I>
 void CreateNonPrimaryRequest<I>::handle_write_image_state(int r) {
   CephContext *cct = m_image_ctx->cct;
-  ldout(cct, 20) << "r=" << r << dendl;
+  ldout(cct, 15) << "r=" << r << dendl;
 
   if (r < 0) {
     lderr(cct) << "failed to write image state: " << cpp_strerror(r)
@@ -260,7 +260,7 @@ void CreateNonPrimaryRequest<I>::handle_write_image_state(int r) {
 template <typename I>
 void CreateNonPrimaryRequest<I>::finish(int r) {
   CephContext *cct = m_image_ctx->cct;
-  ldout(cct, 20) << "r=" << r << dendl;
+  ldout(cct, 15) << "r=" << r << dendl;
 
   m_on_finish->complete(r);
   delete this;

diff --git a/src/librbd/mirror/snapshot/CreatePrimaryRequest.cc b/src/librbd/mirror/snapshot/CreatePrimaryRequest.cc
index c9937e6a6548dd8a6a9911059c1404713cd1feea..a6ce53ff16150c6c4969d878f45d786e8760be1a 100644 (file)
--- a/src/librbd/mirror/snapshot/CreatePrimaryRequest.cc
+++ b/src/librbd/mirror/snapshot/CreatePrimaryRequest.cc
@@ -58,7 +58,7 @@ void CreatePrimaryRequest<I>::send() {
 template <typename I>
 void CreatePrimaryRequest<I>::get_mirror_peers() {
   CephContext *cct = m_image_ctx->cct;
-  ldout(cct, 20) << dendl;
+  ldout(cct, 15) << dendl;
 
   librados::ObjectReadOperation op;
   cls_client::mirror_peer_list_start(&op);
@@ -75,7 +75,7 @@ void CreatePrimaryRequest<I>::get_mirror_peers() {
 template <typename I>
 void CreatePrimaryRequest<I>::handle_get_mirror_peers(int r) {
   CephContext *cct = m_image_ctx->cct;
-  ldout(cct, 20) << "r=" << r << dendl;
+  ldout(cct, 15) << "r=" << r << dendl;
 
   std::vector<cls::rbd::MirrorPeer> peers;
   if (r == 0) {
@@ -116,7 +116,7 @@ void CreatePrimaryRequest<I>::create_snapshot() {
     m_mirror_peer_uuids, "", m_clean_since_snap_id};
 
   CephContext *cct = m_image_ctx->cct;
-  ldout(cct, 20) << "name=" << m_snap_name << ", "
+  ldout(cct, 15) << "name=" << m_snap_name << ", "
                  << "ns=" << ns << dendl;
   auto ctx = create_context_callback<
     CreatePrimaryRequest<I>,
@@ -127,7 +127,7 @@ void CreatePrimaryRequest<I>::create_snapshot() {
 template <typename I>
 void CreatePrimaryRequest<I>::handle_create_snapshot(int r) {
   CephContext *cct = m_image_ctx->cct;
-  ldout(cct, 20) << "r=" << r << dendl;
+  ldout(cct, 15) << "r=" << r << dendl;
 
   if (r < 0) {
     lderr(cct) << "failed to create mirror snapshot: " << cpp_strerror(r)
@@ -149,7 +149,7 @@ void CreatePrimaryRequest<I>::refresh_image() {
   }
 
   CephContext *cct = m_image_ctx->cct;
-  ldout(cct, 20) << dendl;
+  ldout(cct, 15) << dendl;
 
   auto ctx = create_context_callback<
     CreatePrimaryRequest<I>,
@@ -160,7 +160,7 @@ void CreatePrimaryRequest<I>::refresh_image() {
 template <typename I>
 void CreatePrimaryRequest<I>::handle_refresh_image(int r) {
   CephContext *cct = m_image_ctx->cct;
-  ldout(cct, 20) << "r=" << r << dendl;
+  ldout(cct, 15) << "r=" << r << dendl;
 
   if (r < 0) {
     lderr(cct) << "failed to refresh image: " << cpp_strerror(r) << dendl;
@@ -172,7 +172,7 @@ void CreatePrimaryRequest<I>::handle_refresh_image(int r) {
     std::shared_lock image_locker{m_image_ctx->image_lock};
     *m_snap_id = m_image_ctx->get_snap_id(
       cls::rbd::MirrorSnapshotNamespace{}, m_snap_name);
-    ldout(cct, 20) << "snap_id=" << *m_snap_id << dendl;
+    ldout(cct, 15) << "snap_id=" << *m_snap_id << dendl;
   }
 
   unlink_peer();
@@ -223,7 +223,7 @@ void CreatePrimaryRequest<I>::unlink_peer() {
   }
 
   CephContext *cct = m_image_ctx->cct;
-  ldout(cct, 20) << "peer=" << peer_uuid << ", snap_id=" << snap_id << dendl;
+  ldout(cct, 15) << "peer=" << peer_uuid << ", snap_id=" << snap_id << dendl;
 
   auto ctx = create_context_callback<
     CreatePrimaryRequest<I>,
@@ -235,7 +235,7 @@ void CreatePrimaryRequest<I>::unlink_peer() {
 template <typename I>
 void CreatePrimaryRequest<I>::handle_unlink_peer(int r) {
   CephContext *cct = m_image_ctx->cct;
-  ldout(cct, 20) << "r=" << r << dendl;
+  ldout(cct, 15) << "r=" << r << dendl;
 
   if (r < 0) {
     lderr(cct) << "failed to unlink peer: " << cpp_strerror(r) << dendl;
@@ -249,7 +249,7 @@ void CreatePrimaryRequest<I>::handle_unlink_peer(int r) {
 template <typename I>
 void CreatePrimaryRequest<I>::finish(int r) {
   CephContext *cct = m_image_ctx->cct;
-  ldout(cct, 20) << "r=" << r << dendl;
+  ldout(cct, 15) << "r=" << r << dendl;
 
   m_on_finish->complete(r);
   delete this;

diff --git a/src/librbd/mirror/snapshot/DemoteRequest.cc b/src/librbd/mirror/snapshot/DemoteRequest.cc
index 17d157d41e17e4ada8709e6b5ef85cf4acb30a71..f3ead6fcb0bdc47cc0d250823323d42ded5f9c32 100644 (file)
--- a/src/librbd/mirror/snapshot/DemoteRequest.cc
+++ b/src/librbd/mirror/snapshot/DemoteRequest.cc
@@ -66,7 +66,7 @@ void DemoteRequest<I>::handle_enable_non_primary_feature(int r) {
 template <typename I>
 void DemoteRequest<I>::create_snapshot() {
   CephContext *cct = m_image_ctx->cct;
-  ldout(cct, 20) << dendl;
+  ldout(cct, 15) << dendl;
 
   auto ctx = create_context_callback<
     DemoteRequest<I>, &DemoteRequest<I>::handle_create_snapshot>(this);
@@ -81,7 +81,7 @@ void DemoteRequest<I>::create_snapshot() {
 template <typename I>
 void DemoteRequest<I>::handle_create_snapshot(int r) {
   CephContext *cct = m_image_ctx->cct;
-  ldout(cct, 20) << "r=" << r << dendl;
+  ldout(cct, 15) << "r=" << r << dendl;
 
   if (r < 0) {
     lderr(cct) << "failed to create mirror snapshot: " << cpp_strerror(r)
@@ -96,7 +96,7 @@ void DemoteRequest<I>::handle_create_snapshot(int r) {
 template <typename I>
 void DemoteRequest<I>::finish(int r) {
   CephContext *cct = m_image_ctx->cct;
-  ldout(cct, 20) << "r=" << r << dendl;
+  ldout(cct, 15) << "r=" << r << dendl;
 
   m_on_finish->complete(r);
   delete this;

diff --git a/src/librbd/mirror/snapshot/GetImageStateRequest.cc b/src/librbd/mirror/snapshot/GetImageStateRequest.cc
index e7db57bfc598dcd020327951d59a77f63adb465e..4692f88cb80ee37a20f993c69fd395cd9bfb5327 100644 (file)
--- a/src/librbd/mirror/snapshot/GetImageStateRequest.cc
+++ b/src/librbd/mirror/snapshot/GetImageStateRequest.cc
@@ -33,7 +33,7 @@ void GetImageStateRequest<I>::read_object() {
 
   auto oid = util::image_state_object_name(m_image_ctx, m_snap_id,
                                            m_object_index);
-  ldout(cct, 20) << oid << dendl;
+  ldout(cct, 15) << oid << dendl;
 
   librados::ObjectReadOperation op;
   m_bl.clear();
@@ -50,7 +50,7 @@ void GetImageStateRequest<I>::read_object() {
 template <typename I>
 void GetImageStateRequest<I>::handle_read_object(int r) {
   CephContext *cct = m_image_ctx->cct;
-  ldout(cct, 20) << "r=" << r << dendl;
+  ldout(cct, 15) << "r=" << r << dendl;
 
   if (r < 0) {
     lderr(cct) << "failed to read image state object: " << cpp_strerror(r)
@@ -91,7 +91,7 @@ void GetImageStateRequest<I>::handle_read_object(int r) {
 template <typename I>
 void GetImageStateRequest<I>::finish(int r) {
   CephContext *cct = m_image_ctx->cct;
-  ldout(cct, 20) << "r=" << r << dendl;
+  ldout(cct, 15) << "r=" << r << dendl;
 
   if (r == 0) {
     try {

diff --git a/src/librbd/mirror/snapshot/PromoteRequest.cc b/src/librbd/mirror/snapshot/PromoteRequest.cc
index f9cf4b5b973dd67d66dcf228bb1df16a978581f2..16abbd6cfcf52fc5d081d976cc40b9f297dcb1c7 100644 (file)
--- a/src/librbd/mirror/snapshot/PromoteRequest.cc
+++ b/src/librbd/mirror/snapshot/PromoteRequest.cc
@@ -44,7 +44,7 @@ void PromoteRequest<I>::send() {
     return;
   }
 
-  ldout(cct, 20) << "requires_orphan=" << requires_orphan << ", "
+  ldout(cct, 15) << "requires_orphan=" << requires_orphan << ", "
                  << "rollback_snap_id=" << m_rollback_snap_id << dendl;
   create_orphan_snapshot();
 }
@@ -52,7 +52,7 @@ void PromoteRequest<I>::send() {
 template <typename I>
 void PromoteRequest<I>::create_orphan_snapshot() {
   CephContext *cct = m_image_ctx->cct;
-  ldout(cct, 20) << dendl;
+  ldout(cct, 15) << dendl;
 
   auto ctx = create_context_callback<
     PromoteRequest<I>,
@@ -66,7 +66,7 @@ void PromoteRequest<I>::create_orphan_snapshot() {
 template <typename I>
 void PromoteRequest<I>::handle_create_orphan_snapshot(int r) {
   CephContext *cct = m_image_ctx->cct;
-  ldout(cct, 20) << "r=" << r << dendl;
+  ldout(cct, 15) << "r=" << r << dendl;
 
   if (r < 0) {
     lderr(cct) << "failed to create orphan snapshot: " << cpp_strerror(r)
@@ -81,7 +81,7 @@ void PromoteRequest<I>::handle_create_orphan_snapshot(int r) {
 template <typename I>
 void PromoteRequest<I>::list_watchers() {
   CephContext *cct = m_image_ctx->cct;
-  ldout(cct, 20) << dendl;
+  ldout(cct, 15) << dendl;
 
   auto ctx = create_context_callback<
     PromoteRequest<I>,
@@ -98,7 +98,7 @@ void PromoteRequest<I>::list_watchers() {
 template <typename I>
 void PromoteRequest<I>::handle_list_watchers(int r) {
   CephContext *cct = m_image_ctx->cct;
-  ldout(cct, 20) << "r=" << r << dendl;
+  ldout(cct, 15) << "r=" << r << dendl;
 
   if (r < 0) {
     lderr(cct) << "failed to list watchers: " << cpp_strerror(r)
@@ -118,7 +118,7 @@ void PromoteRequest<I>::handle_list_watchers(int r) {
 template <typename I>
 void PromoteRequest<I>::wait_update_notify() {
   CephContext *cct = m_image_ctx->cct;
-  ldout(cct, 20) << dendl;
+  ldout(cct, 15) << dendl;
 
   ImageCtx::get_timer_instance(cct, &m_timer, &m_timer_lock);
 
@@ -141,7 +141,7 @@ void PromoteRequest<I>::wait_update_notify() {
 template <typename I>
 void PromoteRequest<I>::handle_update_notify() {
   CephContext *cct = m_image_ctx->cct;
-  ldout(cct, 20) << dendl;
+  ldout(cct, 15) << dendl;
 
   std::lock_guard timer_lock{*m_timer_lock};
   m_scheduler_ticks = 0;
@@ -152,7 +152,7 @@ void PromoteRequest<I>::scheduler_unregister_update_watcher() {
   ceph_assert(ceph_mutex_is_locked(*m_timer_lock));
 
   CephContext *cct = m_image_ctx->cct;
-  ldout(cct, 20) << "scheduler_ticks=" << m_scheduler_ticks << dendl;
+  ldout(cct, 15) << "scheduler_ticks=" << m_scheduler_ticks << dendl;
 
   if (m_scheduler_ticks > 0) {
     m_scheduler_ticks--;
@@ -170,7 +170,7 @@ void PromoteRequest<I>::scheduler_unregister_update_watcher() {
 template <typename I>
 void PromoteRequest<I>::unregister_update_watcher() {
   CephContext *cct = m_image_ctx->cct;
-  ldout(cct, 20) << dendl;
+  ldout(cct, 15) << dendl;
 
   auto ctx = create_context_callback<
     PromoteRequest<I>,
@@ -182,7 +182,7 @@ void PromoteRequest<I>::unregister_update_watcher() {
 template <typename I>
 void PromoteRequest<I>::handle_unregister_update_watcher(int r) {
   CephContext *cct = m_image_ctx->cct;
-  ldout(cct, 20) << "r=" << r << dendl;
+  ldout(cct, 15) << "r=" << r << dendl;
 
   if (r < 0) {
     lderr(cct) << "failed to unregister update watcher: " << cpp_strerror(r)
@@ -201,7 +201,7 @@ void PromoteRequest<I>::acquire_exclusive_lock() {
     if (m_image_ctx->exclusive_lock != nullptr &&
         !m_image_ctx->exclusive_lock->is_lock_owner()) {
       CephContext *cct = m_image_ctx->cct;
-      ldout(cct, 20) << dendl;
+      ldout(cct, 15) << dendl;
 
       m_lock_acquired = true;
       m_image_ctx->exclusive_lock->block_requests(0);
@@ -221,7 +221,7 @@ void PromoteRequest<I>::acquire_exclusive_lock() {
 template <typename I>
 void PromoteRequest<I>::handle_acquire_exclusive_lock(int r) {
   CephContext *cct = m_image_ctx->cct;
-  ldout(cct, 20) << "r=" << r << dendl;
+  ldout(cct, 15) << "r=" << r << dendl;
 
   if (r < 0) {
     lderr(cct) << "failed to acquire exclusive lock: " << cpp_strerror(r)
@@ -251,7 +251,7 @@ void PromoteRequest<I>::rollback() {
   }
 
   CephContext *cct = m_image_ctx->cct;
-  ldout(cct, 20) << dendl;
+  ldout(cct, 15) << dendl;
 
   std::shared_lock owner_locker{m_image_ctx->owner_lock};
   std::shared_lock image_locker{m_image_ctx->image_lock};
@@ -274,7 +274,7 @@ void PromoteRequest<I>::rollback() {
 template <typename I>
 void PromoteRequest<I>::handle_rollback(int r) {
   CephContext *cct = m_image_ctx->cct;
-  ldout(cct, 20) << "r=" << r << dendl;
+  ldout(cct, 15) << "r=" << r << dendl;
 
   if (r < 0) {
     lderr(cct) << "failed to rollback: " << cpp_strerror(r) << dendl;
@@ -288,7 +288,7 @@ void PromoteRequest<I>::handle_rollback(int r) {
 template <typename I>
 void PromoteRequest<I>::create_promote_snapshot() {
   CephContext *cct = m_image_ctx->cct;
-  ldout(cct, 20) << dendl;
+  ldout(cct, 15) << dendl;
 
   auto ctx = create_context_callback<
     PromoteRequest<I>,
@@ -304,7 +304,7 @@ void PromoteRequest<I>::create_promote_snapshot() {
 template <typename I>
 void PromoteRequest<I>::handle_create_promote_snapshot(int r) {
   CephContext *cct = m_image_ctx->cct;
-  ldout(cct, 20) << "r=" << r << dendl;
+  ldout(cct, 15) << "r=" << r << dendl;
 
   if (r < 0) {
     lderr(cct) << "failed to create promote snapshot: " << cpp_strerror(r)
@@ -356,7 +356,7 @@ void PromoteRequest<I>::release_exclusive_lock() {
     std::unique_lock locker{m_image_ctx->owner_lock};
     if (m_image_ctx->exclusive_lock != nullptr) {
       CephContext *cct = m_image_ctx->cct;
-      ldout(cct, 20) << dendl;
+      ldout(cct, 15) << dendl;
 
       m_image_ctx->exclusive_lock->unblock_requests();
 
@@ -375,7 +375,7 @@ void PromoteRequest<I>::release_exclusive_lock() {
 template <typename I>
 void PromoteRequest<I>::handle_release_exclusive_lock(int r) {
   CephContext *cct = m_image_ctx->cct;
-  ldout(cct, 20) << "r=" << r << dendl;
+  ldout(cct, 15) << "r=" << r << dendl;
 
   if (r < 0) {
     lderr(cct) << "failed to release exclusive lock: " << cpp_strerror(r)
@@ -390,7 +390,7 @@ void PromoteRequest<I>::handle_release_exclusive_lock(int r) {
 template <typename I>
 void PromoteRequest<I>::finish(int r) {
   CephContext *cct = m_image_ctx->cct;
-  ldout(cct, 20) << "r=" << r << dendl;
+  ldout(cct, 15) << "r=" << r << dendl;
 
   m_on_finish->complete(r);
   delete this;

diff --git a/src/librbd/mirror/snapshot/RemoveImageStateRequest.cc b/src/librbd/mirror/snapshot/RemoveImageStateRequest.cc
index 05920c26f51bd152f3912749ecaab457212a4415..204e0489adf82a7d60fd4b276220c514da65ae59 100644 (file)
--- a/src/librbd/mirror/snapshot/RemoveImageStateRequest.cc
+++ b/src/librbd/mirror/snapshot/RemoveImageStateRequest.cc
@@ -32,7 +32,7 @@ void RemoveImageStateRequest<I>::get_object_count() {
   CephContext *cct = m_image_ctx->cct;
 
   auto oid = util::image_state_object_name(m_image_ctx, m_snap_id, 0);
-  ldout(cct, 20) << oid << dendl;
+  ldout(cct, 15) << oid << dendl;
 
   librados::ObjectReadOperation op;
   op.read(0, 0, &m_bl, nullptr);
@@ -48,7 +48,7 @@ void RemoveImageStateRequest<I>::get_object_count() {
 template <typename I>
 void RemoveImageStateRequest<I>::handle_get_object_count(int r) {
   CephContext *cct = m_image_ctx->cct;
-  ldout(cct, 20) << "r=" << r << dendl;
+  ldout(cct, 15) << "r=" << r << dendl;
 
   if (r < 0) {
     lderr(cct) << "failed to read image state object: " << cpp_strerror(r)
@@ -82,7 +82,7 @@ void RemoveImageStateRequest<I>::remove_object() {
 
   auto oid = util::image_state_object_name(m_image_ctx, m_snap_id,
                                            m_object_count);
-  ldout(cct, 20) << oid << dendl;
+  ldout(cct, 15) << oid << dendl;
 
   librados::ObjectWriteOperation op;
   op.remove();
@@ -98,7 +98,7 @@ void RemoveImageStateRequest<I>::remove_object() {
 template <typename I>
 void RemoveImageStateRequest<I>::handle_remove_object(int r) {
   CephContext *cct = m_image_ctx->cct;
-  ldout(cct, 20) << "r=" << r << dendl;
+  ldout(cct, 15) << "r=" << r << dendl;
 
   if (r < 0 && r != -ENOENT) {
     lderr(cct) << "failed to remove image state object: " << cpp_strerror(r)
@@ -118,7 +118,7 @@ void RemoveImageStateRequest<I>::handle_remove_object(int r) {
 template <typename I>
 void RemoveImageStateRequest<I>::finish(int r) {
   CephContext *cct = m_image_ctx->cct;
-  ldout(cct, 20) << "r=" << r << dendl;
+  ldout(cct, 15) << "r=" << r << dendl;
 
   m_on_finish->complete(r);
   delete this;

diff --git a/src/librbd/mirror/snapshot/SetImageStateRequest.cc b/src/librbd/mirror/snapshot/SetImageStateRequest.cc
index d0caccdf58aeed902d18f5891bee689cc163c42f..f68bff8b92c99e280fdfeb686f719134ac0be102 100644 (file)
--- a/src/librbd/mirror/snapshot/SetImageStateRequest.cc
+++ b/src/librbd/mirror/snapshot/SetImageStateRequest.cc
@@ -33,7 +33,7 @@ void SetImageStateRequest<I>::send() {
 template <typename I>
 void SetImageStateRequest<I>::get_snap_limit() {
   CephContext *cct = m_image_ctx->cct;
-  ldout(cct, 20) << dendl;
+  ldout(cct, 15) << dendl;
 
   librados::ObjectReadOperation op;
   cls_client::snapshot_get_limit_start(&op);
@@ -51,7 +51,7 @@ void SetImageStateRequest<I>::get_snap_limit() {
 template <typename I>
 void SetImageStateRequest<I>::handle_get_snap_limit(int r) {
   CephContext *cct = m_image_ctx->cct;
-  ldout(cct, 20) << "r=" << r << dendl;
+  ldout(cct, 15) << "r=" << r << dendl;
 
   if (r == 0) {
     auto it = m_bl.cbegin();
@@ -65,7 +65,7 @@ void SetImageStateRequest<I>::handle_get_snap_limit(int r) {
     return;
   }
 
-  ldout(cct, 20) << "snap_limit=" << m_image_state.snap_limit << dendl;
+  ldout(cct, 15) << "snap_limit=" << m_image_state.snap_limit << dendl;
 
   get_metadata();
 }
@@ -73,7 +73,7 @@ void SetImageStateRequest<I>::handle_get_snap_limit(int r) {
 template <typename I>
 void SetImageStateRequest<I>::get_metadata() {
   CephContext *cct = m_image_ctx->cct;
-  ldout(cct, 20) << dendl;
+  ldout(cct, 15) << dendl;
 
   auto ctx = create_context_callback<
      SetImageStateRequest<I>,
@@ -87,7 +87,7 @@ void SetImageStateRequest<I>::get_metadata() {
 template <typename I>
 void SetImageStateRequest<I>::handle_get_metadata(int r) {
   CephContext *cct = m_image_ctx->cct;
-  ldout(cct, 20) << "r=" << r << dendl;
+  ldout(cct, 15) << "r=" << r << dendl;
 
   if (r < 0) {
     lderr(cct) << "failed to retrieve metadata: " << cpp_strerror(r)
@@ -122,7 +122,7 @@ void SetImageStateRequest<I>::handle_get_metadata(int r) {
 template <typename I>
 void SetImageStateRequest<I>::write_image_state() {
   CephContext *cct = m_image_ctx->cct;
-  ldout(cct, 20) << dendl;
+  ldout(cct, 15) << dendl;
 
   auto ctx = create_context_callback<
     SetImageStateRequest<I>,
@@ -136,7 +136,7 @@ void SetImageStateRequest<I>::write_image_state() {
 template <typename I>
 void SetImageStateRequest<I>::handle_write_image_state(int r) {
   CephContext *cct = m_image_ctx->cct;
-  ldout(cct, 20) << "r=" << r << dendl;
+  ldout(cct, 15) << "r=" << r << dendl;
 
   if (r < 0) {
     lderr(cct) << "failed to write image state: " << cpp_strerror(r)
@@ -151,7 +151,7 @@ void SetImageStateRequest<I>::handle_write_image_state(int r) {
 template <typename I>
 void SetImageStateRequest<I>::update_primary_snapshot() {
   CephContext *cct = m_image_ctx->cct;
-  ldout(cct, 20) << dendl;
+  ldout(cct, 15) << dendl;
 
   librados::ObjectWriteOperation op;
   librbd::cls_client::mirror_image_snapshot_set_copy_progress(
@@ -169,7 +169,7 @@ void SetImageStateRequest<I>::update_primary_snapshot() {
 template <typename I>
 void SetImageStateRequest<I>::handle_update_primary_snapshot(int r) {
   CephContext *cct = m_image_ctx->cct;
-  ldout(cct, 20) << "r=" << r << dendl;
+  ldout(cct, 15) << "r=" << r << dendl;
 
   if (r < 0) {
     lderr(cct) << "failed to update primary snapshot: " << cpp_strerror(r)
@@ -184,7 +184,7 @@ void SetImageStateRequest<I>::handle_update_primary_snapshot(int r) {
 template <typename I>
 void SetImageStateRequest<I>::finish(int r) {
   CephContext *cct = m_image_ctx->cct;
-  ldout(cct, 20) << "r=" << r << dendl;
+  ldout(cct, 15) << "r=" << r << dendl;
 
   m_on_finish->complete(r);
   delete this;

diff --git a/src/librbd/mirror/snapshot/UnlinkPeerRequest.cc b/src/librbd/mirror/snapshot/UnlinkPeerRequest.cc
index d82d42d5bad44ce0e81e5238eeee6ddfd63cd061..2c89d251392cd7cede329475efb0b76a595ed2d5 100644 (file)
--- a/src/librbd/mirror/snapshot/UnlinkPeerRequest.cc
+++ b/src/librbd/mirror/snapshot/UnlinkPeerRequest.cc
@@ -35,7 +35,7 @@ void UnlinkPeerRequest<I>::send() {
 template <typename I>
 void UnlinkPeerRequest<I>::refresh_image() {
   CephContext *cct = m_image_ctx->cct;
-  ldout(cct, 20) << dendl;
+  ldout(cct, 15) << dendl;
 
   auto ctx = create_context_callback<
     UnlinkPeerRequest<I>, &UnlinkPeerRequest<I>::handle_refresh_image>(this);
@@ -45,7 +45,7 @@ void UnlinkPeerRequest<I>::refresh_image() {
 template <typename I>
 void UnlinkPeerRequest<I>::handle_refresh_image(int r) {
   CephContext *cct = m_image_ctx->cct;
-  ldout(cct, 20) << "r=" << r << dendl;
+  ldout(cct, 15) << "r=" << r << dendl;
 
   if (r < 0) {
     lderr(cct) << "failed to refresh image: " << cpp_strerror(r) << dendl;
@@ -72,14 +72,14 @@ void UnlinkPeerRequest<I>::unlink_peer() {
         &snap_it->second.snap_namespace);
     } else if (boost::get<cls::rbd::MirrorSnapshotNamespace>(
                  &snap_it->second.snap_namespace) != nullptr) {
-      ldout(cct, 20) << "located newer mirror snapshot" << dendl;
+      ldout(cct, 15) << "located newer mirror snapshot" << dendl;
       m_newer_mirror_snapshots = true;
       break;
     }
   }
 
   if (r == -ENOENT) {
-    ldout(cct, 20) << "missing snapshot: snap_id=" << m_snap_id << dendl;
+    ldout(cct, 15) << "missing snapshot: snap_id=" << m_snap_id << dendl;
     m_image_ctx->image_lock.unlock_shared();
     finish(r);
     return;
@@ -102,7 +102,7 @@ void UnlinkPeerRequest<I>::unlink_peer() {
   }
   m_image_ctx->image_lock.unlock_shared();
 
-  ldout(cct, 20) << "snap_id=" << m_snap_id << ", "
+  ldout(cct, 15) << "snap_id=" << m_snap_id << ", "
                  << "mirror_peer_uuid=" << m_mirror_peer_uuid << dendl;
   librados::ObjectWriteOperation op;
   librbd::cls_client::mirror_image_snapshot_unlink_peer(&op, m_snap_id,
@@ -117,7 +117,7 @@ void UnlinkPeerRequest<I>::unlink_peer() {
 template <typename I>
 void UnlinkPeerRequest<I>::handle_unlink_peer(int r) {
   CephContext *cct = m_image_ctx->cct;
-  ldout(cct, 20) << "r=" << r << dendl;
+  ldout(cct, 15) << "r=" << r << dendl;
 
   if (r == -ERESTART || r == -ENOENT) {
     refresh_image();
@@ -136,7 +136,7 @@ void UnlinkPeerRequest<I>::handle_unlink_peer(int r) {
 template <typename I>
 void UnlinkPeerRequest<I>::notify_update() {
   CephContext *cct = m_image_ctx->cct;
-  ldout(cct, 20) << dendl;
+  ldout(cct, 15) << dendl;
 
   auto ctx = create_context_callback<
     UnlinkPeerRequest<I>, &UnlinkPeerRequest<I>::handle_notify_update>(this);
@@ -146,7 +146,7 @@ void UnlinkPeerRequest<I>::notify_update() {
 template <typename I>
 void UnlinkPeerRequest<I>::handle_notify_update(int r) {
   CephContext *cct = m_image_ctx->cct;
-  ldout(cct, 20) << "r=" << r << dendl;
+  ldout(cct, 15) << "r=" << r << dendl;
 
   if (r < 0 && r != -ENOENT) {
     lderr(cct) << "failed to notify update: " << cpp_strerror(r) << dendl;
@@ -160,7 +160,7 @@ void UnlinkPeerRequest<I>::handle_notify_update(int r) {
 template <typename I>
 void UnlinkPeerRequest<I>::remove_snapshot() {
   CephContext *cct = m_image_ctx->cct;
-  ldout(cct, 20) << dendl;
+  ldout(cct, 15) << dendl;
 
   cls::rbd::SnapshotNamespace snap_namespace;
   std::string snap_name;
@@ -178,7 +178,7 @@ void UnlinkPeerRequest<I>::remove_snapshot() {
   }
 
   if (r == -ENOENT) {
-    ldout(cct, 20) << "failed to locate snapshot " << m_snap_id << dendl;
+    ldout(cct, 15) << "failed to locate snapshot " << m_snap_id << dendl;
     finish(0);
     return;
   }
@@ -188,7 +188,7 @@ void UnlinkPeerRequest<I>::remove_snapshot() {
 
   info.mirror_peer_uuids.erase(m_mirror_peer_uuid);
   if (!info.mirror_peer_uuids.empty() || !m_newer_mirror_snapshots) {
-    ldout(cct, 20) << "skipping removal of snapshot: "
+    ldout(cct, 15) << "skipping removal of snapshot: "
                    << "snap_id=" << m_snap_id << ": "
                    << "mirror_peer_uuid=" << m_mirror_peer_uuid << ", "
                    << "mirror_peer_uuids=" << info.mirror_peer_uuids << dendl;
@@ -204,7 +204,7 @@ void UnlinkPeerRequest<I>::remove_snapshot() {
 template <typename I>
 void UnlinkPeerRequest<I>::handle_remove_snapshot(int r) {
   CephContext *cct = m_image_ctx->cct;
-  ldout(cct, 20) << "r=" << r << dendl;
+  ldout(cct, 15) << "r=" << r << dendl;
 
   if (r < 0 && r != -ENOENT) {
     lderr(cct) << "failed to remove snapshot: " << cpp_strerror(r) << dendl;
@@ -218,7 +218,7 @@ void UnlinkPeerRequest<I>::handle_remove_snapshot(int r) {
 template <typename I>
 void UnlinkPeerRequest<I>::finish(int r) {
   CephContext *cct = m_image_ctx->cct;
-  ldout(cct, 20) << "r=" << r << dendl;
+  ldout(cct, 15) << "r=" << r << dendl;
 
   auto on_finish = m_on_finish;
   delete this;

diff --git a/src/librbd/mirror/snapshot/WriteImageStateRequest.cc b/src/librbd/mirror/snapshot/WriteImageStateRequest.cc
index c179b9f021d3fe690f7d68ee067fea5912c06310..c79dd7e2ce6b86cedab0fc6cd8ca342374bf44b6 100644 (file)
--- a/src/librbd/mirror/snapshot/WriteImageStateRequest.cc
+++ b/src/librbd/mirror/snapshot/WriteImageStateRequest.cc
@@ -66,7 +66,7 @@ void WriteImageStateRequest<I>::write_object() {
 
   auto oid = util::image_state_object_name(m_image_ctx, m_snap_id,
                                            m_object_count);
-  ldout(cct, 20) << oid << dendl;
+  ldout(cct, 15) << oid << dendl;
 
   size_t off = m_object_count * m_object_size;
   size_t len = std::min(m_bl.length() - off, m_object_size);
@@ -87,7 +87,7 @@ void WriteImageStateRequest<I>::write_object() {
 template <typename I>
 void WriteImageStateRequest<I>::handle_write_object(int r) {
   CephContext *cct = m_image_ctx->cct;
-  ldout(cct, 20) << "r=" << r << dendl;
+  ldout(cct, 15) << "r=" << r << dendl;
 
   if (r < 0) {
     lderr(cct) << "failed to write object: " << cpp_strerror(r)
@@ -107,7 +107,7 @@ void WriteImageStateRequest<I>::handle_write_object(int r) {
 template <typename I>
 void WriteImageStateRequest<I>::finish(int r) {
   CephContext *cct = m_image_ctx->cct;
-  ldout(cct, 20) << "r=" << r << dendl;
+  ldout(cct, 15) << "r=" << r << dendl;
 
   m_on_finish->complete(r);
   delete this;