Merge pull request ceph#52157 from pkalever/log-improve

rbd-mirror: add some assorted logs

Reviewed-by: Ilya Dryomov <[email protected]>

Author: idryomov

src/tools/rbd_mirror/ClusterWatcher.cc

@@ -185,10 +185,10 @@ void ClusterWatcher::read_pool_peers(PoolPeers *pool_peers)
 }
 
 int ClusterWatcher::read_site_name(std::string* site_name) {
-  dout(10) << dendl;
-
   librbd::RBD rbd;
-  return rbd.mirror_site_name_get(*m_cluster, site_name);
+  int r = rbd.mirror_site_name_get(*m_cluster, site_name);
+  dout(10) << "site_name=" << *site_name << ", r=" << r << dendl;
+  return r;
 }
 
 int ClusterWatcher::resolve_peer_site_config_keys(int64_t pool_id,

src/tools/rbd_mirror/InstanceReplayer.cc

@@ -334,6 +334,8 @@ void InstanceReplayer<I>::start_image_replayer(
 
   std::string global_image_id = image_replayer->get_global_image_id();
   if (!image_replayer->is_stopped()) {
+    dout(10) << "image replayer is not stopped for global_image_id="
+             << global_image_id << dendl;
     return;
   } else if (image_replayer->is_blocklisted()) {
     derr << "global_image_id=" << global_image_id << ": blocklisted detected "
@@ -348,6 +350,8 @@ void InstanceReplayer<I>::start_image_replayer(
     image_replayer->destroy();
     return;
   } else if (m_manual_stop) {
+    dout(10) << "image replayer manually stopped for global_image_id="
+             << global_image_id << dendl;
     return;
   }
 

src/tools/rbd_mirror/Mirror.cc

@@ -502,6 +502,7 @@ Mirror::Mirror(CephContext *cct, const std::vector<const char*> &args) :
   m_cache_manager_handler(new CacheManagerHandler(cct)),
   m_pool_meta_cache(new PoolMetaCache(cct)),
   m_asok_hook(new MirrorAdminSocketHook(cct, this)) {
+  dout(10) << "args=" << args << dendl;
 }
 
 Mirror::~Mirror()

src/tools/rbd_mirror/ServiceDaemon.cc

@@ -261,6 +261,8 @@ void ServiceDaemon<I>::schedule_update_status() {
     return;
   }
 
+  dout(20) << dendl;
+
   m_timer_ctx = new LambdaContext([this](int) {
       m_timer_ctx = nullptr;
       update_status();
@@ -270,7 +272,6 @@ void ServiceDaemon<I>::schedule_update_status() {
 
 template <typename I>
 void ServiceDaemon<I>::update_status() {
-  dout(20) << dendl;
   ceph_assert(ceph_mutex_is_locked(m_threads->timer_lock));
 
   ceph::JSONFormatter f;
@@ -314,6 +315,8 @@ void ServiceDaemon<I>::update_status() {
   std::stringstream ss;
   f.flush(ss);
 
+  dout(20) << ss.str() << dendl;
+
   int r = m_rados->service_daemon_update_status({{"json", ss.str()}});
   if (r < 0) {
     derr << "failed to update service daemon status: " << cpp_strerror(r)