rbd-mirror: improve logging

Signed-off-by: Mykola Golub <mgolub@mirantis.com>

diff --git a/src/tools/rbd_mirror/ClusterWatcher.cc b/src/tools/rbd_mirror/ClusterWatcher.cc
index be3b6ad40498cc713e857c17a80db06cf63548d1..7a1e14ac317feeb45946fff289e470bca0d3ef3f 100644 (file)
--- a/src/tools/rbd_mirror/ClusterWatcher.cc
+++ b/src/tools/rbd_mirror/ClusterWatcher.cc
@@ -10,7 +10,7 @@
 
 #define dout_subsys ceph_subsys_rbd_mirror
 #undef dout_prefix
-#define dout_prefix *_dout << "rbd-mirror: "
+#define dout_prefix *_dout << "rbd-mirror: ClusterWatcher::" << __func__ << ": "
 
 using std::list;
 using std::map;
@@ -45,7 +45,7 @@ const std::set<std::string>& ClusterWatcher::get_pool_names() const
 
 void ClusterWatcher::refresh_pools()
 {
-  dout(20) << __func__ << dendl;
+  dout(20) << "enter" << dendl;
   map<peer_t, set<int64_t> > peer_configs;
   set<string> pool_names;
   read_configs(&peer_configs, &pool_names);

diff --git a/src/tools/rbd_mirror/Mirror.cc b/src/tools/rbd_mirror/Mirror.cc
index 67111b01207f5c0b61d14fa95d993299b3ec0c74..6bab7adeaf45c3522bb9ac36fda70607f5567a03 100644 (file)
--- a/src/tools/rbd_mirror/Mirror.cc
+++ b/src/tools/rbd_mirror/Mirror.cc
@@ -9,7 +9,7 @@
 
 #define dout_subsys ceph_subsys_rbd_mirror
 #undef dout_prefix
-#define dout_prefix *_dout << "rbd-mirror: "
+#define dout_prefix *_dout << "rbd-mirror: Mirror::" << __func__ << ": "
 
 using std::chrono::seconds;
 using std::list;
@@ -60,6 +60,7 @@ int Mirror::init()
 
 void Mirror::run()
 {
+  dout(20) << "enter" << dendl;
   while (!m_stopping.read()) {
     m_local_cluster_watcher->refresh_pools();
     Mutex::Locker l(m_lock);
@@ -67,15 +68,18 @@ void Mirror::run()
     // TODO: make interval configurable
     m_cond.WaitInterval(g_ceph_context, m_lock, seconds(30));
   }
+  dout(20) << "return" << dendl;
 }
 
 void Mirror::update_replayers(const map<peer_t, set<int64_t> > &peer_configs)
 {
+  dout(20) << "enter" << dendl;
   assert(m_lock.is_locked());
   set<peer_t> peers;
   for (auto &kv : peer_configs) {
     const peer_t &peer = kv.first;
     if (m_replayers.find(peer) == m_replayers.end()) {
+      dout(20) << "starting replayer for " << peer << dendl;
       unique_ptr<Replayer> replayer(new Replayer(m_local, peer));
       // TODO: make async, and retry connecting within replayer
       int r = replayer->init();
@@ -90,6 +94,7 @@ void Mirror::update_replayers(const map<peer_t, set<int64_t> > &peer_configs)
   for (auto it = m_replayers.begin(); it != m_replayers.end();) {
     peer_t peer = it->first;
     if (peers.find(peer) == peers.end()) {
+      dout(20) << "removing replayer for " << peer << dendl;
       m_replayers.erase(it++);
     } else {
       ++it;

diff --git a/src/tools/rbd_mirror/PoolWatcher.cc b/src/tools/rbd_mirror/PoolWatcher.cc
index f55eee5a1548abb56b59790cbd74afd3c6981cc4..a027f18dd782aed1d773a040750ee8f6c77bcff6 100644 (file)
--- a/src/tools/rbd_mirror/PoolWatcher.cc
+++ b/src/tools/rbd_mirror/PoolWatcher.cc
@@ -14,7 +14,7 @@
 
 #define dout_subsys ceph_subsys_rbd_mirror
 #undef dout_prefix
-#define dout_prefix *_dout << "rbd-mirror: "
+#define dout_prefix *_dout << "rbd-mirror: PoolWatcher::" << __func__ << ": "
 
 using std::list;
 using std::map;
@@ -57,7 +57,7 @@ const map<int64_t, set<string> >& PoolWatcher::get_images() const
 
 void PoolWatcher::refresh_images(bool reschedule)
 {
-  dout(20) << __func__ << dendl;
+  dout(20) << "enter" << dendl;
   map<int64_t, set<string> > images;
   list<pair<int64_t, string> > pools;
   int r = m_cluster->pool_list2(pools);

diff --git a/src/tools/rbd_mirror/Replayer.cc b/src/tools/rbd_mirror/Replayer.cc
index 0d8e3f329fe4a4a1a70aeadc282c5e2dd31c4711..c89944fd19e315a730b62862301ebd8e94ec77e3 100644 (file)
--- a/src/tools/rbd_mirror/Replayer.cc
+++ b/src/tools/rbd_mirror/Replayer.cc
@@ -10,7 +10,7 @@
 
 #define dout_subsys ceph_subsys_rbd_mirror
 #undef dout_prefix
-#define dout_prefix *_dout << "rbd-mirror: "
+#define dout_prefix *_dout << "rbd-mirror: Replayer::" << __func__ << ": "
 
 using std::chrono::seconds;
 using std::map;
@@ -42,7 +42,7 @@ Replayer::~Replayer()
 
 int Replayer::init()
 {
-  dout(20) << __func__ << "Replaying for " << m_peer << dendl;
+  dout(20) << "replaying for " << m_peer << dendl;
 
   int r = m_remote->init2(m_peer.client_name.c_str(),
                          m_peer.cluster_name.c_str(), 0);
@@ -66,7 +66,7 @@ int Replayer::init()
     return r;
   }
 
-  dout(20) << __func__ << "connected to " << m_peer << dendl;
+  dout(20) << "connected to " << m_peer << dendl;
 
   std::string uuid;
   r = m_local->cluster_fsid(&uuid);
@@ -86,6 +86,8 @@ int Replayer::init()
 
 void Replayer::run()
 {
+  dout(20) << "enter" << dendl;
+
   while (!m_stopping.read()) {
     Mutex::Locker l(m_lock);
     set_sources(m_pool_watcher->get_images());
@@ -95,6 +97,8 @@ void Replayer::run()
 
 void Replayer::set_sources(const map<int64_t, set<string> > &images)
 {
+  dout(20) << "enter" << dendl;
+
   assert(m_lock.is_locked());
   // TODO: make stopping and starting ImageReplayers async
   for (auto it = m_images.begin(); it != m_images.end();) {